Skip to content

Commit 1b4c0eb

Browse files
julianocosta89julianocosta89
authored
[grafana] Fix dashboards (#1779)
* Fix dashboards * changelog
1 parent 85359b6 commit 1b4c0eb

File tree

5 files changed

+463
-474
lines changed

5 files changed

+463
-474
lines changed

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ the release.
1111
([#1764](https://github.com/open-telemetry/opentelemetry-demo/pull/1764))
1212
* [chore] Move build args to .env file
1313
([#1767](https://github.com/open-telemetry/opentelemetry-demo/pull/1767))
14+
* [grafana] Fix Dashboards
15+
([#1779](https://github.com/open-telemetry/opentelemetry-demo/pull/1779))
1416
* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
1517
to 1.9.0 ([#1780](https://github.com/open-telemetry/opentelemetry-demo/pull/1780))
1618

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

+29-21
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"graphTooltip": 0,
2727
"id": 2,
2828
"links": [],
29-
"liveNow": false,
3029
"panels": [
3130
{
3231
"collapsed": false,
@@ -59,6 +58,7 @@
5958
"axisLabel": "",
6059
"axisPlacement": "auto",
6160
"barAlignment": 0,
61+
"barWidthFactor": 0.6,
6262
"drawStyle": "line",
6363
"fillOpacity": 0,
6464
"gradientMode": "none",
@@ -122,6 +122,7 @@
122122
"sort": "none"
123123
}
124124
},
125+
"pluginVersion": "11.3.0",
125126
"targets": [
126127
{
127128
"datasource": {
@@ -130,7 +131,7 @@
130131
},
131132
"editorMode": "code",
132133
"exemplar": true,
133-
"expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
134+
"expr": "histogram_quantile(0.50, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
134135
"legendFormat": "quantile50",
135136
"range": true,
136137
"refId": "A"
@@ -142,7 +143,7 @@
142143
},
143144
"editorMode": "code",
144145
"exemplar": false,
145-
"expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
146+
"expr": "histogram_quantile(0.95, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
146147
"hide": false,
147148
"legendFormat": "quantile95",
148149
"range": true,
@@ -155,7 +156,7 @@
155156
},
156157
"editorMode": "code",
157158
"exemplar": false,
158-
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
159+
"expr": "histogram_quantile(0.99, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
159160
"hide": false,
160161
"legendFormat": "quantile99",
161162
"range": true,
@@ -168,7 +169,7 @@
168169
},
169170
"editorMode": "code",
170171
"exemplar": false,
171-
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
172+
"expr": "histogram_quantile(0.999, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
172173
"hide": false,
173174
"legendFormat": "quantile999",
174175
"range": true,
@@ -196,6 +197,7 @@
196197
"axisLabel": "",
197198
"axisPlacement": "auto",
198199
"barAlignment": 0,
200+
"barWidthFactor": 0.6,
199201
"drawStyle": "line",
200202
"fillOpacity": 0,
201203
"gradientMode": "none",
@@ -258,14 +260,15 @@
258260
"sort": "none"
259261
}
260262
},
263+
"pluginVersion": "11.3.0",
261264
"targets": [
262265
{
263266
"datasource": {
264267
"type": "prometheus",
265268
"uid": "webstore-metrics"
266269
},
267270
"editorMode": "code",
268-
"expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))",
271+
"expr": " sum by (span_name) (rate(traces_span_metrics_calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))",
269272
"interval": "",
270273
"legendFormat": "{{ span_name }}",
271274
"range": true,
@@ -292,6 +295,7 @@
292295
"axisLabel": "",
293296
"axisPlacement": "auto",
294297
"barAlignment": 0,
298+
"barWidthFactor": 0.6,
295299
"drawStyle": "line",
296300
"fillOpacity": 0,
297301
"gradientMode": "none",
@@ -355,14 +359,15 @@
355359
"sort": "none"
356360
}
357361
},
362+
"pluginVersion": "11.3.0",
358363
"targets": [
359364
{
360365
"datasource": {
361366
"type": "prometheus",
362367
"uid": "webstore-metrics"
363368
},
364369
"editorMode": "code",
365-
"expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))",
370+
"expr": "sum by (span_name) (rate(traces_span_metrics_duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))",
366371
"legendFormat": "{{ span_name }}",
367372
"range": true,
368373
"refId": "A"
@@ -438,7 +443,7 @@
438443
},
439444
"showHeader": true
440445
},
441-
"pluginVersion": "10.4.3",
446+
"pluginVersion": "11.3.0",
442447
"targets": [
443448
{
444449
"alias": "",
@@ -525,7 +530,7 @@
525530
},
526531
"showHeader": true
527532
},
528-
"pluginVersion": "10.4.3",
533+
"pluginVersion": "11.3.0",
529534
"targets": [
530535
{
531536
"alias": "",
@@ -590,6 +595,7 @@
590595
"axisLabel": "",
591596
"axisPlacement": "auto",
592597
"barAlignment": 0,
598+
"barWidthFactor": 0.6,
593599
"drawStyle": "line",
594600
"fillOpacity": 0,
595601
"gradientMode": "none",
@@ -652,6 +658,7 @@
652658
"sort": "none"
653659
}
654660
},
661+
"pluginVersion": "11.3.0",
655662
"targets": [
656663
{
657664
"datasource": {
@@ -709,6 +716,7 @@
709716
"axisLabel": "",
710717
"axisPlacement": "auto",
711718
"barAlignment": 0,
719+
"barWidthFactor": 0.6,
712720
"drawStyle": "line",
713721
"fillOpacity": 0,
714722
"gradientMode": "none",
@@ -771,6 +779,7 @@
771779
"sort": "none"
772780
}
773781
},
782+
"pluginVersion": "11.3.0",
774783
"targets": [
775784
{
776785
"datasource": {
@@ -813,6 +822,7 @@
813822
"axisLabel": "",
814823
"axisPlacement": "auto",
815824
"barAlignment": 0,
825+
"barWidthFactor": 0.6,
816826
"drawStyle": "bars",
817827
"fillOpacity": 0,
818828
"gradientMode": "none",
@@ -874,6 +884,7 @@
874884
"sort": "none"
875885
}
876886
},
887+
"pluginVersion": "11.3.0",
877888
"targets": [
878889
{
879890
"datasource": {
@@ -908,6 +919,7 @@
908919
"axisLabel": "",
909920
"axisPlacement": "auto",
910921
"barAlignment": 0,
922+
"barWidthFactor": 0.6,
911923
"drawStyle": "line",
912924
"fillOpacity": 0,
913925
"gradientMode": "none",
@@ -970,14 +982,15 @@
970982
"sort": "none"
971983
}
972984
},
985+
"pluginVersion": "11.3.0",
973986
"targets": [
974987
{
975988
"datasource": {
976989
"type": "prometheus",
977990
"uid": "webstore-metrics"
978991
},
979992
"editorMode": "code",
980-
"expr": "rate(otel_trace_span_processor_spans{job=\"quoteservice\"}[2m])*120",
993+
"expr": "rate(otel_trace_span_processor_spans{job=\"opentelemetry-demo/quoteservice\"}[2m])*120",
981994
"interval": "2m",
982995
"legendFormat": "{{state}}",
983996
"range": true,
@@ -988,36 +1001,31 @@
9881001
"type": "timeseries"
9891002
}
9901003
],
1004+
"preload": false,
9911005
"refresh": "",
992-
"revision": 1,
993-
"schemaVersion": 39,
1006+
"schemaVersion": 40,
9941007
"tags": [],
9951008
"templating": {
9961009
"list": [
9971010
{
998-
"allValue": "",
9991011
"current": {
1000-
"selected": true,
10011012
"text": "frontend",
10021013
"value": "frontend"
10031014
},
10041015
"datasource": {
10051016
"type": "prometheus",
10061017
"uid": "webstore-metrics"
10071018
},
1008-
"definition": "duration_milliseconds_bucket",
1009-
"hide": 0,
1019+
"definition": "traces_span_metrics_duration_milliseconds_bucket",
10101020
"includeAll": false,
1011-
"multi": false,
10121021
"name": "service",
10131022
"options": [],
10141023
"query": {
1015-
"query": "duration_milliseconds_bucket",
1024+
"query": "traces_span_metrics_duration_milliseconds_bucket",
10161025
"refId": "PrometheusVariableQueryEditor-VariableQuery"
10171026
},
10181027
"refresh": 1,
10191028
"regex": "/.*service_name=\\\"([^\\\"]+)\\\".*/",
1020-
"skipUrlSync": false,
10211029
"sort": 1,
10221030
"type": "query"
10231031
}
@@ -1031,6 +1039,6 @@
10311039
"timezone": "",
10321040
"title": "Demo Dashboard",
10331041
"uid": "W2gX2zHVk",
1034-
"version": 1,
1042+
"version": 2,
10351043
"weekStart": ""
1036-
}
1044+
}

0 commit comments

Comments
 (0)