Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump jinja2 from 3.1.2 to 3.1.4 in /src/loadgenerator #9

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ FLAGD_PORT=8013
KAFKA_SERVICE_PORT=9092
KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}

# Zilla
ZILLA_PORT=7114

# Redis
REDIS_PORT=6379
REDIS_ADDR=redis-cart:${REDIS_PORT}
Expand Down
33 changes: 33 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,39 @@ services:
retries: 10
logging: *logging

# Zilla
zillaproxy:
image: ghcr.io/aklivity/zilla:develop-SNAPSHOT
container_name: zilla-proxy
deploy:
resources:
limits:
memory: 500M
restart: unless-stopped
ports:
- "${ZILLA_PORT}:${ZILLA_PORT}"
environment:
- KAFKA_SERVICE_ADDR
- OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=zillaproxy
volumes:
- ./src/zillaproxy/zilla.yaml:/etc/zilla/zilla.yaml
command: start -v -e
healthcheck:
test: nc -z zilla ${ZILLA_PORT}
start_period: 10s
interval: 5s
timeout: 10s
retries: 10
depends_on:
otelcol:
condition: service_started
kafka:
condition: service_healthy
logging: *logging

# Redis used by Cart service
redis-cart:
image: ${REDIS_IMAGE}
Expand Down
30 changes: 15 additions & 15 deletions kubernetes/opentelemetry-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ data:
},
"editorMode": "code",
"exemplar": true,
"expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.50, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"legendFormat": "quantile50",
"range": true,
"refId": "A"
Expand All @@ -729,7 +729,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.95, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile95",
"range": true,
Expand All @@ -742,7 +742,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.99, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile99",
"range": true,
Expand All @@ -755,7 +755,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.999, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile999",
"range": true,
Expand Down Expand Up @@ -945,7 +945,7 @@ data:
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))",
"expr": "sum by (span_name) (rate({__name__=~\".*duration_milliseconds_count\", {service_name=\"${service}\"}[$__rate_interval]))",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -7320,7 +7320,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"expr": "topk(7,histogram_quantile(0.50, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"format": "time_series",
"hide": true,
"instant": false,
Expand All @@ -7336,7 +7336,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
"expr": "topk(7,histogram_quantile(0.95, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))",
"hide": false,
"instant": true,
"interval": "",
Expand All @@ -7351,7 +7351,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.99, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile99",
Expand All @@ -7365,7 +7365,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.999, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile999",
Expand Down Expand Up @@ -7903,7 +7903,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"expr": "topk(7,histogram_quantile(0.50, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))",
"format": "time_series",
"hide": true,
"instant": false,
Expand All @@ -7919,7 +7919,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7,histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
"expr": "topk(7,histogram_quantile(0.95, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))",
"hide": false,
"instant": true,
"interval": "",
Expand All @@ -7934,7 +7934,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.99, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile99",
Expand All @@ -7948,7 +7948,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"expr": "histogram_quantile(0.999, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))",
"hide": true,
"interval": "",
"legendFormat": "quantile999",
Expand Down Expand Up @@ -8019,7 +8019,7 @@ data:
},
"editorMode": "code",
"exemplar": false,
"expr": "topk(7, sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(duration_milliseconds_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))",
"expr": "topk(7, sum by (span_name,service_name)(increase({__name__=~\".*duration_milliseconds_sum\", service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase({__name__=~\".*duration_milliseconds_count\", {service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))",
"instant": true,
"interval": "",
"legendFormat": "{{span_name}} [{{service_name}}]",
Expand Down Expand Up @@ -8123,7 +8123,7 @@ data:
},
"editorMode": "code",
"exemplar": true,
"expr": "topk(7,sum by (span_name,service_name)(increase(duration_milliseconds_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(duration_milliseconds_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))",
"expr": "topk(7,sum by (span_name,service_name)(increase({__name__=~\".*duration_milliseconds_sum\", service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase({__name__=~\".*duration_milliseconds_count\", {service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))",
"instant": false,
"interval": "",
"legendFormat": "[{{service_name}}] {{span_name}}",
Expand Down
46 changes: 24 additions & 22 deletions src/grafana/provisioning/dashboards/demo/demo-dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -127,7 +128,7 @@
},
"editorMode": "code",
"exemplar": true,
"expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.50, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"legendFormat": "quantile50",
"range": true,
"refId": "A"
Expand All @@ -139,7 +140,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.95, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile95",
"range": true,
Expand All @@ -152,7 +153,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.99, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile99",
"range": true,
Expand All @@ -165,7 +166,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.999, sum(rate({__name__=~\".*duration_milliseconds_bucket\", service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile999",
"range": true,
Expand All @@ -187,6 +188,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -281,6 +283,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -355,7 +358,7 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))",
"expr": "sum by (span_name) (rate({__name__=~\"(.*duration_milliseconds_count)\", service_name=\"${service}\"}[$__rate_interval]))",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -431,7 +434,7 @@
},
"showHeader": true
},
"pluginVersion": "10.1.2",
"pluginVersion": "10.4.2",
"targets": [
{
"alias": "",
Expand Down Expand Up @@ -518,7 +521,7 @@
},
"showHeader": true
},
"pluginVersion": "10.1.2",
"pluginVersion": "10.4.2",
"targets": [
{
"alias": "",
Expand Down Expand Up @@ -577,6 +580,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -612,8 +616,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -695,6 +698,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -730,8 +734,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -798,6 +801,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -833,8 +837,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -892,6 +895,7 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
Expand Down Expand Up @@ -927,8 +931,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -978,17 +981,16 @@
],
"refresh": "",
"revision": 1,
"schemaVersion": 38,
"style": "dark",
"schemaVersion": 39,
"tags": [],
"templating": {
"list": [
{
"allValue": "",
"current": {
"selected": true,
"text": "adservice",
"value": "adservice"
"selected": false,
"text": "zillaproxy",
"value": "zillaproxy"
},
"datasource": {
"type": "prometheus",
Expand All @@ -1001,7 +1003,7 @@
"name": "service",
"options": [],
"query": {
"query": "duration_milliseconds_bucket",
"query": "{__name__=~\".*duration_milliseconds_bucket\"}",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
Expand All @@ -1013,7 +1015,7 @@
]
},
"time": {
"from": "now-3h",
"from": "now-15m",
"to": "now"
},
"timepicker": {},
Expand Down
Loading
Loading