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

(grafana): update grafana dashboards #1150

Merged
merged 5 commits into from
Oct 3, 2023
Merged

(grafana): update grafana dashboards #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f01cc22
update grafana dashboards
puckpuck Sep 28, 2023
515eec8
update grafana dashboards
puckpuck Sep 28, 2023
e8feda6
Merge branch 'main' into grafana.dashboard-updates
puckpuck Sep 29, 2023
27602e1
Merge branch 'main' into grafana.dashboard-updates
puckpuck Sep 30, 2023
1429b81
Merge branch 'main' into grafana.dashboard-updates
austinlparker Oct 3, 2023
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 @@ -21,6 +21,8 @@ release.
([#1146](https://github.com/open-telemetry/opentelemetry-demo/pull/1146))
* [prometheus] Enabled support for the OTLP write receiver
([#1149](https://github.com/open-telemetry/opentelemetry-demo/pull/1149))
* [grafana] fix dashboard metric names and update settings
([#1150](https://github.com/open-telemetry/opentelemetry-demo/pull/1150))
* [otelcol] add httpcheck receiver for synthetic check of frontendproxy
([#1162](https://github.com/open-telemetry/opentelemetry-demo/pull/1162))

Expand Down
2 changes: 1 addition & 1 deletion ...fana/provisioning/dashboards/general.yaml → ...grafana/provisioning/dashboards/demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ providers:
disableDeletion: false
editable: true
options:
path: /etc/grafana/provisioning/dashboards/general
path: /etc/grafana/provisioning/dashboards/demo
95 changes: 64 additions & 31 deletions ...ng/dashboards/general/demo-dashboard.json → ...oning/dashboards/demo/demo-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -124,8 +125,10 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(process_runtime_cpython_cpu_time{type=~\"system\"}[$__interval])*100",
"legendFormat": "__auto",
"expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100",
"hide": false,
"interval": "2m",
"legendFormat": "{{job}} ({{type}})",
"range": true,
"refId": "A"
},
Expand All @@ -135,14 +138,24 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(process_runtime_cpython_cpu_time{type=~\"user\"}[$__interval])*100",
"expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100",
"hide": false,
"legendFormat": "__auto",
"interval": "2m",
"legendFormat": "{{job}} ({{type}})",
"range": true,
"refId": "B"
}
],
"title": "Recommendation Service (CPU%)",
"title": "Python services (CPU%)",
"transformations": [
{
"id": "renameByRegex",
"options": {
"regex": "opentelemetry-demo/(.*)",
"renamePattern": "$1"
}
}
],
"type": "timeseries"
},
{
Expand All @@ -169,6 +182,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -199,7 +213,7 @@
}
]
},
"unit": "decmbytes"
"unit": "bytes"
},
"overrides": []
},
Expand Down Expand Up @@ -229,13 +243,22 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(process_runtime_cpython_memory{type=~\"rss|vms\"}[$__interval])/1024/1024",
"legendFormat": "__auto",
"expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}",
"legendFormat": "{{job}}",
"range": true,
"refId": "A"
}
],
"title": "Recommendation Service (Memory)",
"title": "Python services (Memory)",
"transformations": [
{
"id": "renameByRegex",
"options": {
"regex": "opentelemetry-demo/(.*)",
"renamePattern": "$1"
}
}
],
"type": "timeseries"
},
{
Expand All @@ -262,6 +285,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -307,7 +331,7 @@
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
"showLegend": false
},
"tooltip": {
"mode": "single",
Expand All @@ -321,20 +345,22 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(app_recommendations_counter{recommendation_type=\"catalog\"}[$__interval])",
"legendFormat": "__auto",
"expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])",
"interval": "2m",
"legendFormat": "recommendations",
"range": true,
"refId": "A"
}
],
"title": "Recommendations Count",
"title": "Recommendations Rate",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "webstore-metrics"
},
"description": "",
"fieldConfig": {
"defaults": {
"color": {
Expand All @@ -354,6 +380,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -413,20 +440,22 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(calls{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__interval])",
"expr": " sum by (span_name) (rate(calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))",
"interval": "",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
}
],
"title": "Error Rate by Service",
"title": "Error Rate for ${service} by span name",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "webstore-metrics"
},
"description": "",
"fieldConfig": {
"defaults": {
"color": {
Expand All @@ -446,6 +475,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -507,7 +537,7 @@
},
"editorMode": "code",
"exemplar": true,
"expr": "histogram_quantile(0.50, sum(rate(duration_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le))",
"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,7 +549,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.95, sum(rate(duration_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": "quantile95",
"range": true,
Expand All @@ -532,7 +562,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.99, sum(rate(duration_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": "quantile99",
"range": true,
Expand All @@ -545,14 +575,14 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "histogram_quantile(0.999, sum(rate(duration_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": "quantile999",
"range": true,
"refId": "D"
}
],
"title": "Service Latency by Service (from SpanMetrics)",
"title": "Latency for ${service}",
"type": "timeseries"
},
{
Expand All @@ -579,6 +609,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -639,13 +670,13 @@
"uid": "webstore-metrics"
},
"editorMode": "code",
"expr": "rate(duration_count{service_name=\"${service}\"}[$__rate_interval])",
"expr": "sum by (span_name) (rate(duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))",
"legendFormat": "{{ span_name }}",
"range": true,
"refId": "A"
}
],
"title": "Endpoint Rate by Service",
"title": "Requests Rate for ${service} by span name",
"type": "timeseries"
},
{
Expand All @@ -672,6 +703,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -730,8 +762,9 @@
"type": "prometheus",
"uid": "webstore-metrics"
},
"editorMode": "builder",
"expr": "otel_trace_span_processor_spans{service_name=\"quoteservice\"}",
"editorMode": "code",
"expr": "rate(otel_trace_span_processor_spans{job=\"opentelemetry-demo/quoteservice\"}[2m])*120",
"interval": "2m",
"legendFormat": "{{state}}",
"range": true,
"refId": "A"
Expand All @@ -752,22 +785,22 @@
"allValue": "",
"current": {
"selected": false,
"text": "featureflagservice",
"value": "featureflagservice"
"text": "frontend",
"value": "frontend"
},
"datasource": {
"type": "prometheus",
"uid": "webstore-metrics"
},
"definition": "duration_bucket",
"definition": "duration_milliseconds_bucket",
"hide": 0,
"includeAll": false,
"multi": false,
"name": "service",
"options": [],
"query": {
"query": "duration_bucket",
"refId": "StandardVariableQuery"
"query": "duration_milliseconds_bucket",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "/.*service_name=\\\"([^\\\"]+)\\\".*/",
Expand All @@ -778,13 +811,13 @@
]
},
"time": {
"from": "now-15m",
"from": "now-3h",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "Demo Dashboard",
"uid": "W2gX2zHVk",
"version": 2,
"version": 1,
"weekStart": ""
}
0 ...al/opentelemetry-collector-data-flow.json → ...mo/opentelemetry-collector-data-flow.json
View file
Open in desktop
File renamed without changes.
Loading