Skip to content

Commit 9a1b07a

Browse files
authored
[grafana] fix demo dashboard to be compatible with spanmetrics connector (#874)
* [grafana] fix demo dashboard to be compatible with spanmetrics connector Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> * add changelog entry Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> * fix some naming Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> --------- Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
1 parent 93466a4 commit 9a1b07a

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ release.
1919
([#865](https://github.com/open-telemetry/opentelemetry-demo/pull/865))
2020
* [load generator] Bump loagen dependencies
2121
([#869](https://github.com/open-telemetry/opentelemetry-demo/pull/869))
22+
* [grafana] fix demo dashboard to be compatible with spanmetrics connector
23+
([#874](https://github.com/open-telemetry/opentelemetry-demo/pull/874))
2224

2325
## 1.4.0
2426

src/grafana/provisioning/dashboards/general/demo-dashboard.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -413,13 +413,13 @@
413413
"uid": "webstore-metrics"
414414
},
415415
"editorMode": "code",
416-
"expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])",
417-
"legendFormat": "__auto",
416+
"expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])",
417+
"legendFormat": "{{ span_name }}",
418418
"range": true,
419419
"refId": "A"
420420
}
421421
],
422-
"title": "Error Rate",
422+
"title": "Error Rate by Service",
423423
"type": "timeseries"
424424
},
425425
{
@@ -507,8 +507,8 @@
507507
},
508508
"editorMode": "code",
509509
"exemplar": true,
510-
"expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
511-
"legendFormat": "__auto",
510+
"expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
511+
"legendFormat": "quantile50",
512512
"range": true,
513513
"refId": "A"
514514
},
@@ -519,9 +519,9 @@
519519
},
520520
"editorMode": "code",
521521
"exemplar": false,
522-
"expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
522+
"expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
523523
"hide": false,
524-
"legendFormat": "__auto",
524+
"legendFormat": "quantile95",
525525
"range": true,
526526
"refId": "B"
527527
},
@@ -532,9 +532,9 @@
532532
},
533533
"editorMode": "code",
534534
"exemplar": false,
535-
"expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
535+
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
536536
"hide": false,
537-
"legendFormat": "__auto",
537+
"legendFormat": "quantile99",
538538
"range": true,
539539
"refId": "C"
540540
},
@@ -545,14 +545,14 @@
545545
},
546546
"editorMode": "code",
547547
"exemplar": false,
548-
"expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
548+
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
549549
"hide": false,
550-
"legendFormat": "__auto",
550+
"legendFormat": "quantile999",
551551
"range": true,
552552
"refId": "D"
553553
}
554554
],
555-
"title": "Service Latency (from SpanMetrics)",
555+
"title": "Service Latency by Service (from SpanMetrics)",
556556
"type": "timeseries"
557557
},
558558
{
@@ -639,8 +639,8 @@
639639
"uid": "webstore-metrics"
640640
},
641641
"editorMode": "code",
642-
"expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])",
643-
"legendFormat": "__auto",
642+
"expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])",
643+
"legendFormat": "{{ span_name }}",
644644
"range": true,
645645
"refId": "A"
646646
}
@@ -665,14 +665,14 @@
665665
"type": "prometheus",
666666
"uid": "webstore-metrics"
667667
},
668-
"definition": "latency_bucket",
668+
"definition": "duration_milliseconds_bucket",
669669
"hide": 0,
670670
"includeAll": false,
671671
"multi": false,
672672
"name": "service",
673673
"options": [],
674674
"query": {
675-
"query": "latency_bucket",
675+
"query": "duration_milliseconds_bucket",
676676
"refId": "StandardVariableQuery"
677677
},
678678
"refresh": 1,

0 commit comments

Comments
 (0)