Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ release.
([#848](https://github.com/open-telemetry/opentelemetry-demo/pull/848))
* [collector] update collector version to 0.76.1 and remove connectors feature gate.
([#857](https://github.com/open-telemetry/opentelemetry-demo/pull/857))
* [grafana] fix demo dashboard to be compatible with spanmetrics connector
([#874](https://github.com/open-telemetry/opentelemetry-demo/pull/874))

## 1.4.0

Expand Down
32 changes: 16 additions & 16 deletions src/grafana/provisioning/dashboards/general/demo-dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,13 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\"}[$__interval])",
"legendFormat": "__auto",
"expr": "rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
}
],
"title": "Error Rate",
"title": "Error Rate by Service",
"type": "timeseries"
},
{
Expand Down Expand Up @@ -507,8 +507,8 @@
},
"editorMode": "code",
"exemplar": true,
"expr": "histogram_quantile(0.50, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"legendFormat": "__auto",
"expr": "histogram_quantile(0.50, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"legendFormat": "quantile50",
"range": true,
"refId": "A"
},
Expand All @@ -519,9 +519,9 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.95, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.95, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "__auto",
"legendFormat": "quantile95",
"range": true,
"refId": "B"
},
Expand All @@ -532,9 +532,9 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.99, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "__auto",
"legendFormat": "quantile99",
"range": true,
"refId": "C"
},
Expand All @@ -545,14 +545,14 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(latency_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"expr": "histogram_quantile(0.999, sum(rate(duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"hide": false,
"legendFormat": "__auto",
"legendFormat": "quantile999",
"range": true,
"refId": "D"
}
],
"title": "Service Latency (from SpanMetrics)",
"title": "Service Latency by Service (from SpanMetrics)",
"type": "timeseries"
},
{
Expand Down Expand Up @@ -639,8 +639,8 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(latency_count{service_name=\"${service}\"}[$__rate_interval])",
"legendFormat": "__auto",
"expr": "rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval])",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
}
Expand All @@ -665,14 +665,14 @@
"type": "prometheus",
"uid": "webstore-metrics"
},
"definition": "latency_bucket",
"definition": "duration_milliseconds_bucket",
"hide": 0,
"includeAll": false,
"multi": false,
"name": "service",
"options": [],
"query": {
"query": "latency_bucket",
"query": "duration_milliseconds_bucket",
"refId": "StandardVariableQuery"
},
"refresh": 1,
Expand Down