From 4eb4894c3affcf484047d429e0630806c78404c1 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Tue, 17 May 2022 12:39:33 +0200 Subject: [PATCH] templates/dashboards: Reverse order in duration/latency graphs In these graphs p99 isn't very important. If 1% of jobs are slow that's fine. The p50 and p95 slices are the important ones, so reorder and recolor the duration graphs to reflect this. --- ...age-builder-composer-general.configmap.yml | 126 ++---- ...image-builder-worker-general.configmap.yml | 377 ++++++------------ 2 files changed, 146 insertions(+), 357 deletions(-) diff --git a/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml b/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml index b080cbed9..c65669f6e 100644 --- a/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml +++ b/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml @@ -755,81 +755,6 @@ data: "unit": "s" }, "overrides": [ - { - "matcher": { - "id": "byName", - "options": "99p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "red", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "95p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "90p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "yellow", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "50p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "p90" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "yellow", - "mode": "fixed" - } - } - ] - }, { "matcher": { "id": "byName", @@ -839,7 +764,22 @@ data: { "id": "color", "value": { - "fixedColor": "red", + "fixedColor": "blue", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "p95" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "yellow", "mode": "fixed" } } @@ -854,7 +794,7 @@ data: { "id": "color", "value": { - "fixedColor": "blue", + "fixedColor": "light-red", "mode": "fixed" } } @@ -881,21 +821,6 @@ data: } }, "targets": [ - { - "exemplar": true, - "expr": "histogram_quantile(0.5, sum(rate(image_builder_composer_http_duration_seconds_bucket[$interval])) by (le))", - "interval": "", - "legendFormat": "p50", - "refId": "A" - }, - { - "exemplar": true, - "expr": "histogram_quantile(0.9, sum(rate(image_builder_composer_http_duration_seconds_bucket[$interval])) by (le))", - "hide": false, - "interval": "", - "legendFormat": "p90", - "refId": "B" - }, { "exemplar": true, "expr": "histogram_quantile(0.99, sum(rate(image_builder_composer_http_duration_seconds_bucket[$interval])) by (le))", @@ -903,6 +828,23 @@ data: "interval": "", "legendFormat": "p99", "refId": "C" + }, + { + "editorMode": "code", + "exemplar": true, + "expr": "histogram_quantile(0.95, sum(rate(image_builder_composer_http_duration_seconds_bucket[$interval])) by (le))", + "hide": false, + "interval": "", + "legendFormat": "p95", + "range": true, + "refId": "B" + }, + { + "exemplar": true, + "expr": "histogram_quantile(0.5, sum(rate(image_builder_composer_http_duration_seconds_bucket[$interval])) by (le))", + "interval": "", + "legendFormat": "p50", + "refId": "A" } ], "title": "Compose Request Latency", diff --git a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml index 462369e1b..2c723870a 100644 --- a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml +++ b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml @@ -35,7 +35,7 @@ data: "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": 33, - "iteration": 1652780554054, + "iteration": 1652780554060, "links": [], "liveNow": false, "panels": [ @@ -552,7 +552,7 @@ data: "datasource": { "uid": "${datasource}" }, - "description": "The duration of 90% of osbuild jobs", + "description": "The duration of 95% of osbuild jobs", "fieldConfig": { "defaults": { "color": { @@ -701,13 +701,13 @@ data: { "matcher": { "id": "byName", - "options": "99p" + "options": "p50" }, "properties": [ { "id": "color", "value": { - "fixedColor": "red", + "fixedColor": "light-red", "mode": "fixed" } } @@ -716,52 +716,7 @@ data: { "matcher": { "id": "byName", - "options": "95p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "90p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "yellow", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "50p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "p90" + "options": "p95" }, "properties": [ { @@ -778,21 +733,6 @@ data: "id": "byName", "options": "p99" }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "red", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "p50" - }, "properties": [ { "id": "color", @@ -824,21 +764,6 @@ data: } }, "targets": [ - { - "exemplar": true, - "expr": "histogram_quantile(0.5, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=~\"osbuild:.*\"}[$interval])) by (le))", - "interval": "", - "legendFormat": "p50", - "refId": "A" - }, - { - "exemplar": true, - "expr": "histogram_quantile(0.9, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=~\"osbuild:.*\"}[$interval])) by (le))", - "hide": false, - "interval": "", - "legendFormat": "p90", - "refId": "B" - }, { "exemplar": true, "expr": "histogram_quantile(0.99, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=~\"osbuild:.*\"}[$interval])) by (le))", @@ -846,6 +771,23 @@ data: "interval": "", "legendFormat": "p99", "refId": "C" + }, + { + "editorMode": "code", + "exemplar": true, + "expr": "histogram_quantile(0.95, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=~\"osbuild:.*\"}[$interval])) by (le))", + "hide": false, + "interval": "", + "legendFormat": "p95", + "range": true, + "refId": "B" + }, + { + "exemplar": true, + "expr": "histogram_quantile(0.5, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=~\"osbuild:.*\"}[$interval])) by (le))", + "interval": "", + "legendFormat": "p50", + "refId": "A" } ], "title": "Build Job Duration", @@ -1177,7 +1119,8 @@ data: "mode": "absolute", "steps": [ { - "color": "red" + "color": "red", + "value": null }, { "color": "#EAB839", @@ -1226,7 +1169,7 @@ data: "text": {}, "textMode": "auto" }, - "pluginVersion": "8.1.5", + "pluginVersion": "8.5.2", "targets": [ { "exemplar": true, @@ -1282,7 +1225,8 @@ data: "mode": "absolute", "steps": [ { - "color": "red" + "color": "red", + "value": null } ] }, @@ -1320,7 +1264,8 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -1389,7 +1334,8 @@ data: "mode": "absolute", "steps": [ { - "color": "red" + "color": "red", + "value": null } ] }, @@ -1411,7 +1357,8 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -1467,7 +1414,8 @@ data: "mode": "absolute", "steps": [ { - "color": "red" + "color": "red", + "value": null }, { "color": "#EAB839", @@ -1509,7 +1457,7 @@ data: }, "textMode": "auto" }, - "pluginVersion": "8.1.5", + "pluginVersion": "8.5.2", "targets": [ { "exemplar": true, @@ -1572,7 +1520,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "#EAB839", @@ -1603,7 +1552,8 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "pluginVersion": "8.1.5", @@ -1641,7 +1591,7 @@ data: "datasource": { "uid": "${datasource}" }, - "description": "The duration of 90% of depsolve jobs", + "description": "The duration of 95% of depsolve jobs", "fieldConfig": { "defaults": { "color": { @@ -1664,7 +1614,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "#EAB839", @@ -1713,7 +1664,7 @@ data: "text": {}, "textMode": "auto" }, - "pluginVersion": "8.1.5", + "pluginVersion": "8.5.2", "targets": [ { "exemplar": true, @@ -1770,7 +1721,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "#EAB839", @@ -1788,13 +1740,13 @@ data: { "matcher": { "id": "byName", - "options": "99p" + "options": "p50" }, "properties": [ { "id": "color", "value": { - "fixedColor": "red", + "fixedColor": "light-red", "mode": "fixed" } } @@ -1803,52 +1755,7 @@ data: { "matcher": { "id": "byName", - "options": "95p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "90p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "yellow", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "50p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "p90" + "options": "p95" }, "properties": [ { @@ -1865,21 +1772,6 @@ data: "id": "byName", "options": "p99" }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "red", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "p50" - }, "properties": [ { "id": "color", @@ -1906,25 +1798,11 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "targets": [ - { - "exemplar": true, - "expr": "histogram_quantile(0.5, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=\"depsolve\"}[$interval])) by (le))", - "interval": "", - "legendFormat": "p50", - "refId": "A" - }, - { - "exemplar": true, - "expr": "histogram_quantile(0.9, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=\"depsolve\"}[$interval])) by (le))", - "hide": false, - "interval": "", - "legendFormat": "p90", - "refId": "B" - }, { "exemplar": true, "expr": "histogram_quantile(0.99, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=\"depsolve\"}[$interval])) by (le))", @@ -1932,6 +1810,23 @@ data: "interval": "", "legendFormat": "p99", "refId": "C" + }, + { + "editorMode": "code", + "exemplar": true, + "expr": "histogram_quantile(0.95, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=\"depsolve\"}[$interval])) by (le))", + "hide": false, + "interval": "", + "legendFormat": "p95", + "range": true, + "refId": "B" + }, + { + "exemplar": true, + "expr": "histogram_quantile(0.5, sum(rate(image_builder_worker_job_duration_seconds_bucket{type=\"depsolve\"}[$interval])) by (le))", + "interval": "", + "legendFormat": "p50", + "refId": "A" } ], "title": "Depsolve Job Duration", @@ -1981,7 +1876,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2007,7 +1903,8 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -2061,7 +1958,8 @@ data: "mode": "absolute", "steps": [ { - "color": "red" + "color": "red", + "value": null }, { "color": "#EAB839", @@ -2103,7 +2001,7 @@ data: }, "textMode": "auto" }, - "pluginVersion": "8.1.5", + "pluginVersion": "8.5.2", "targets": [ { "exemplar": true, @@ -2166,7 +2064,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "#EAB839", @@ -2197,7 +2096,8 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "pluginVersion": "8.1.5", @@ -2235,7 +2135,7 @@ data: "datasource": { "uid": "${datasource}" }, - "description": "The duration of 90% of jobs waiting for execution in the job queue", + "description": "The duration of 95% of jobs waiting for execution in the job queue", "fieldConfig": { "defaults": { "color": { @@ -2258,7 +2158,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "#EAB839", @@ -2307,7 +2208,7 @@ data: "text": {}, "textMode": "auto" }, - "pluginVersion": "8.1.5", + "pluginVersion": "8.5.2", "targets": [ { "exemplar": true, @@ -2364,7 +2265,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "#EAB839", @@ -2382,13 +2284,13 @@ data: { "matcher": { "id": "byName", - "options": "99p" + "options": "p50" }, "properties": [ { "id": "color", "value": { - "fixedColor": "red", + "fixedColor": "light-red", "mode": "fixed" } } @@ -2397,52 +2299,7 @@ data: { "matcher": { "id": "byName", - "options": "95p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "90p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "yellow", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "50p" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "blue", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "p90" + "options": "p95" }, "properties": [ { @@ -2459,21 +2316,6 @@ data: "id": "byName", "options": "p99" }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "red", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "p50" - }, "properties": [ { "id": "color", @@ -2500,25 +2342,11 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "targets": [ - { - "exemplar": true, - "expr": "histogram_quantile(0.5, sum(rate(image_builder_worker_job_wait_duration_seconds_bucket[$interval])) by (le))", - "interval": "", - "legendFormat": "p50", - "refId": "A" - }, - { - "exemplar": true, - "expr": "histogram_quantile(0.9, sum(rate(image_builder_worker_job_wait_duration_seconds_bucket[$interval])) by (le))", - "hide": false, - "interval": "", - "legendFormat": "p90", - "refId": "B" - }, { "exemplar": true, "expr": "histogram_quantile(0.99, sum(rate(image_builder_worker_job_wait_duration_seconds_bucket[$interval])) by (le))", @@ -2526,6 +2354,23 @@ data: "interval": "", "legendFormat": "p99", "refId": "C" + }, + { + "editorMode": "code", + "exemplar": true, + "expr": "histogram_quantile(0.95, sum(rate(image_builder_worker_job_wait_duration_seconds_bucket[$interval])) by (le))", + "hide": false, + "interval": "", + "legendFormat": "p95", + "range": true, + "refId": "B" + }, + { + "exemplar": true, + "expr": "histogram_quantile(0.5, sum(rate(image_builder_worker_job_wait_duration_seconds_bucket[$interval])) by (le))", + "interval": "", + "legendFormat": "p50", + "refId": "A" } ], "title": "Job Wait Duration", @@ -2576,7 +2421,8 @@ data: "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -2602,7 +2448,8 @@ data: "placement": "bottom" }, "tooltip": { - "mode": "single" + "mode": "single", + "sort": "none" } }, "targets": [ @@ -2626,7 +2473,7 @@ data: "list": [ { "current": { - "selected": false, + "selected": true, "text": "app-sre-prod-04-prometheus", "value": "app-sre-prod-04-prometheus" },