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.

Sign up for GitHub

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

Jump to bottom

[grafana] Fix dashboards #1779

Merged
merged 3 commits into from
Nov 18, 2024
+463 −474
Merged

[grafana] Fix dashboards #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac6758a
Fix dashboards
julianocosta89 Nov 17, 2024
e4d2cce
changelog
julianocosta89 Nov 17, 2024
8a461db
Merge branch 'main' into grafana/fix-dashboards
julianocosta89 Nov 18, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ the release.
([#1764](https://github.com/open-telemetry/opentelemetry-demo/pull/1764))
* [chore] Move build args to .env file
([#1767](https://github.com/open-telemetry/opentelemetry-demo/pull/1767))
* [grafana] Fix Dashboards
([#1779](https://github.com/open-telemetry/opentelemetry-demo/pull/1779))
* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
to 1.9.0 ([#1780](https://github.com/open-telemetry/opentelemetry-demo/pull/1780))

Expand Down
50 changes: 29 additions & 21 deletions src/grafana/provisioning/dashboards/demo/demo-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"graphTooltip": 0,
"id": 2,
"links": [],
"liveNow": false,
"panels": [
{
"collapsed": false,
Expand Down Expand Up @@ -59,6 +58,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
Expand Down Expand Up @@ -122,6 +122,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand All @@ -130,7 +131,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(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"legendFormat": "quantile50",
"range": true,
"refId": "A"
Expand All @@ -142,7 +143,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(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile95",
"range": true,
Expand All @@ -155,7 +156,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(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile99",
"range": true,
Expand All @@ -168,7 +169,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(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "quantile999",
"range": true,
Expand Down Expand Up @@ -196,6 +197,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
Expand Down Expand Up @@ -258,14 +260,15 @@
"sort": "none"
}
},
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))",
"expr": " sum by (span_name) (rate(traces_span_metrics_calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))",
"interval": "",
"legendFormat": "{{ span_name }}",
"range": true,
Expand All @@ -292,6 +295,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
Expand Down Expand Up @@ -355,14 +359,15 @@
"sort": "none"
}
},
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"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(traces_span_metrics_duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
Expand Down Expand Up @@ -438,7 +443,7 @@
},
"showHeader": true
},
"pluginVersion": "10.4.3",
"pluginVersion": "11.3.0",
"targets": [
{
"alias": "",
Expand Down Expand Up @@ -525,7 +530,7 @@
},
"showHeader": true
},
"pluginVersion": "10.4.3",
"pluginVersion": "11.3.0",
"targets": [
{
"alias": "",
Expand Down Expand Up @@ -590,6 +595,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
Expand Down Expand Up @@ -652,6 +658,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -709,6 +716,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
Expand Down Expand Up @@ -771,6 +779,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -813,6 +822,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "bars",
"fillOpacity": 0,
"gradientMode": "none",
Expand Down Expand Up @@ -874,6 +884,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -908,6 +919,7 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
Expand Down Expand Up @@ -970,14 +982,15 @@
"sort": "none"
}
},
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(otel_trace_span_processor_spans{job=\"quoteservice\"}[2m])*120",
"expr": "rate(otel_trace_span_processor_spans{job=\"opentelemetry-demo/quoteservice\"}[2m])*120",
"interval": "2m",
"legendFormat": "{{state}}",
"range": true,
Expand All @@ -988,36 +1001,31 @@
"type": "timeseries"
}
],
"preload": false,
"refresh": "",
"revision": 1,
"schemaVersion": 39,
"schemaVersion": 40,
"tags": [],
"templating": {
"list": [
{
"allValue": "",
"current": {
"selected": true,
"text": "frontend",
"value": "frontend"
},
"datasource": {
"type": "prometheus",
"uid": "webstore-metrics"
},
"definition": "duration_milliseconds_bucket",
"hide": 0,
"definition": "traces_span_metrics_duration_milliseconds_bucket",
"includeAll": false,
"multi": false,
"name": "service",
"options": [],
"query": {
"query": "duration_milliseconds_bucket",
"query": "traces_span_metrics_duration_milliseconds_bucket",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "/.*service_name=\\\"([^\\\"]+)\\\".*/",
"skipUrlSync": false,
"sort": 1,
"type": "query"
}
Expand All @@ -1031,6 +1039,6 @@
"timezone": "",
"title": "Demo Dashboard",
"uid": "W2gX2zHVk",
"version": 1,
"version": 2,
"weekStart": ""
}
}
Loading
Loading