From 173f764d031da46665136a317caa8213e3677ad7 Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Mon, 24 Jun 2024 12:29:43 -0400 Subject: [PATCH] Fixes 4320: add dashboard for all completing tasks (#712) Fixes 4320: add dasboard for all completing tasks --- ...a-dashboard-content-sources.configmap.yaml | 301 ++++++++++++------ 1 file changed, 204 insertions(+), 97 deletions(-) diff --git a/deployments/dashboards/grafana-dashboard-content-sources.configmap.yaml b/deployments/dashboards/grafana-dashboard-content-sources.configmap.yaml index c6c6b047c..24e61925c 100644 --- a/deployments/dashboards/grafana-dashboard-content-sources.configmap.yaml +++ b/deployments/dashboards/grafana-dashboard-content-sources.configmap.yaml @@ -513,7 +513,7 @@ data: "type": "prometheus", "uid": "${datasource}" }, - "description": "", + "description": "Percentage of successful requests over time", "fieldConfig": { "defaults": { "color": { @@ -525,11 +525,9 @@ data: "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", - "axisSoftMax": 100, - "axisSoftMin": 0, "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 0, + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -543,7 +541,7 @@ data: "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -553,21 +551,24 @@ data: "mode": "line" } }, - "decimals": 2, + "displayName": "Percentage of successful requests", + "links": [], "mappings": [], + "max": 1, "thresholds": { "mode": "absolute", "steps": [ { - "color": "red", + "color": "green", "value": null }, { "color": "red", - "value": 95 + "value": 0.95 } ] - } + }, + "unit": "percentunit" }, "overrides": [] }, @@ -577,7 +578,7 @@ data: "x": 0, "y": 19 }, - "id": 41, + "id": 29, "options": { "legend": { "calcs": [], @@ -586,7 +587,7 @@ data: "showLegend": true }, "tooltip": { - "mode": "single", + "mode": "multi", "sort": "none" } }, @@ -597,22 +598,32 @@ data: "type": "prometheus", "uid": "${datasource}" }, - "editorMode": "code", - "expr": "sum(content_sources_message_result_total{state=\"success\"})/(sum(content_sources_message_result_total{state=\"success\"})+sum(content_sources_message_result_total{state=\"failed\"} or vector(0.0)))*100", - "legendFormat": "Success Rate", - "range": true, + "expr": "sum(rate(content_sources_http_status_histogram_count{status!=\"5xx\"}[$__range])) / sum(rate(content_sources_http_status_histogram_count[$__range]))", "refId": "A" } ], - "title": "Message processing Success Rate", + "title": "Availability", "type": "timeseries" }, + { + "collapsed": false, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 27 + }, + "id": 47, + "panels": [], + "title": "Tasking", + "type": "row" + }, { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "description": "Percentage of successful requests over time", + "description": "", "fieldConfig": { "defaults": { "color": { @@ -624,9 +635,11 @@ data: "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", + "axisSoftMax": 100, + "axisSoftMin": 0, "barAlignment": 0, "drawStyle": "line", - "fillOpacity": 10, + "fillOpacity": 0, "gradientMode": "none", "hideFrom": { "legend": false, @@ -640,7 +653,7 @@ data: "scaleDistribution": { "type": "linear" }, - "showPoints": "never", + "showPoints": "auto", "spanNulls": false, "stacking": { "group": "A", @@ -650,34 +663,26 @@ data: "mode": "line" } }, - "displayName": "Percentage of successful requests", - "links": [], "mappings": [], - "max": 1, "thresholds": { "mode": "absolute", "steps": [ - { - "color": "green", - "value": null - }, { "color": "red", - "value": 0.95 + "value": null } ] - }, - "unit": "percentunit" + } }, "overrides": [] }, "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 19 + "h": 9, + "w": 9, + "x": 0, + "y": 28 }, - "id": 29, + "id": 46, "options": { "legend": { "calcs": [], @@ -686,7 +691,7 @@ data: "showLegend": true }, "tooltip": { - "mode": "multi", + "mode": "single", "sort": "none" } }, @@ -697,11 +702,14 @@ data: "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(rate(content_sources_http_status_histogram_count{status!=\"5xx\"}[$__range])) / sum(rate(content_sources_http_status_histogram_count[$__range]))", + "editorMode": "code", + "expr": "sum(increase(content_sources_message_result_total{}[1m]))", + "legendFormat": "__auto", + "range": true, "refId": "A" } ], - "title": "Availability", + "title": "Total Tasks Finishing", "type": "timeseries" }, { @@ -759,43 +767,17 @@ data: "value": 80 } ] - }, - "unit": "s" - }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "avg(content_sources_task_stats{label=\"task_stats_average_wait\"})" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] } - ] + }, + "overrides": [] }, "gridPos": { "h": 8, "w": 9, - "x": 0, - "y": 27 + "x": 9, + "y": 28 }, - "id": 44, + "id": 45, "options": { "legend": { "calcs": [], @@ -815,28 +797,113 @@ data: "uid": "PDD8BE47D10408F45" }, "editorMode": "code", - "expr": "avg(content_sources_task_stats{label=\"task_stats_average_wait\"})", - "hide": false, + "expr": "avg(content_sources_task_stats{label=\"task_stats_pending_count\"})", "instant": false, "legendFormat": "__auto", "range": true, - "refId": "Average" + "refId": "A" + } + ], + "title": "Total Pending Tasks", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "axisSoftMax": 100, + "axisSoftMin": 0, + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "line" + } + }, + "decimals": 2, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "red", + "value": 95 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 9, + "x": 9, + "y": 36 + }, + "id": 41, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.0.3", + "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, "editorMode": "code", - "expr": "avg(content_sources_task_stats{label=\"task_stats_oldest_wait\"})", - "hide": false, - "instant": false, - "legendFormat": "__auto", + "expr": "sum(content_sources_message_result_total{state=\"success\"})/(sum(content_sources_message_result_total{state=\"success\"})+sum(content_sources_message_result_total{state=\"failed\"} or vector(0.0)))*100", + "legendFormat": "Success Rate", "range": true, "refId": "A" } ], - "title": "Average Pending Task Time", + "title": "Message processing Success Rate", "type": "timeseries" }, { @@ -894,17 +961,43 @@ data: "value": 80 } ] - } + }, + "unit": "s" }, - "overrides": [] + "overrides": [ + { + "__systemRef": "hideSeriesFrom", + "matcher": { + "id": "byNames", + "options": { + "mode": "exclude", + "names": [ + "avg(content_sources_task_stats{label=\"task_stats_average_wait\"})" + ], + "prefix": "All except:", + "readOnly": true + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": false, + "tooltip": false, + "viz": true + } + } + ] + } + ] }, "gridPos": { "h": 8, "w": 9, - "x": 9, - "y": 27 + "x": 0, + "y": 37 }, - "id": 45, + "id": 44, "options": { "legend": { "calcs": [], @@ -924,14 +1017,28 @@ data: "uid": "PDD8BE47D10408F45" }, "editorMode": "code", - "expr": "avg(content_sources_task_stats{label=\"task_stats_pending_count\"})", + "expr": "avg(content_sources_task_stats{label=\"task_stats_average_wait\"})", + "hide": false, + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "Average" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "avg(content_sources_task_stats{label=\"task_stats_oldest_wait\"})", + "hide": false, "instant": false, "legendFormat": "__auto", "range": true, "refId": "A" } ], - "title": "Total Pending Tasks", + "title": "Average Pending Task Time", "type": "timeseries" }, { @@ -944,7 +1051,7 @@ data: "h": 1, "w": 24, "x": 0, - "y": 35 + "y": 45 }, "id": 26, "panels": [], @@ -1024,7 +1131,7 @@ data: "h": 8, "w": 9, "x": 0, - "y": 36 + "y": 46 }, "id": 36, "options": { @@ -1120,7 +1227,7 @@ data: "h": 9, "w": 9, "x": 9, - "y": 36 + "y": 46 }, "id": 33, "options": { @@ -1219,7 +1326,7 @@ data: "h": 9, "w": 9, "x": 0, - "y": 44 + "y": 54 }, "id": 32, "options": { @@ -1264,7 +1371,7 @@ data: "h": 1, "w": 24, "x": 0, - "y": 53 + "y": 63 }, "id": 4, "panels": [ @@ -1277,7 +1384,7 @@ data: "h": 9, "w": 20, "x": 0, - "y": 45 + "y": 61 }, "id": 28, "links": [], @@ -1319,7 +1426,7 @@ data: "h": 7, "w": 5, "x": 0, - "y": 54 + "y": 70 }, "hiddenSeries": false, "id": 2, @@ -1428,7 +1535,7 @@ data: "h": 7, "w": 5, "x": 5, - "y": 54 + "y": 70 }, "id": 6, "links": [], @@ -1471,7 +1578,7 @@ data: "h": 7, "w": 5, "x": 10, - "y": 54 + "y": 70 }, "id": 8, "links": [], @@ -1526,7 +1633,7 @@ data: "h": 7, "w": 5, "x": 15, - "y": 54 + "y": 70 }, "id": 10, "links": [], @@ -1565,7 +1672,7 @@ data: "h": 7, "w": 5, "x": 0, - "y": 61 + "y": 77 }, "heatmap": {}, "hideZeroBuckets": false, @@ -1611,7 +1718,7 @@ data: "h": 7, "w": 5, "x": 5, - "y": 61 + "y": 77 }, "id": 14, "limit": 10, @@ -1658,7 +1765,7 @@ data: "h": 7, "w": 5, "x": 10, - "y": 61 + "y": 77 }, "id": 16, "links": [], @@ -1694,7 +1801,7 @@ data: "h": 7, "w": 5, "x": 15, - "y": 61 + "y": 77 }, "id": 20, "links": [],