From cfca3e798d8e929d0762bf491ee4cd08a1972745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Stru=C3=9F?= <31846129+applike-ss@users.noreply.github.com> Date: Sun, 24 Nov 2024 08:16:00 +0100 Subject: [PATCH] adjusted grafana dashboard to be more user friendly (#4165) --- .../provisioning/dashboards/dragonfly.json | 667 +++--------------- 1 file changed, 107 insertions(+), 560 deletions(-) diff --git a/tools/local/monitoring/grafana/provisioning/dashboards/dragonfly.json b/tools/local/monitoring/grafana/provisioning/dashboards/dragonfly.json index f7351a347..f8b24feca 100644 --- a/tools/local/monitoring/grafana/provisioning/dashboards/dragonfly.json +++ b/tools/local/monitoring/grafana/provisioning/dashboards/dragonfly.json @@ -21,10 +21,8 @@ } ] }, - "description": "", "editable": true, "fiscalYearStartMonth": 0, - "gnetId": 11692, "graphTooltip": 0, "links": [], "liveNow": false, @@ -89,13 +87,13 @@ "y": 1 }, "id": 9, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "none", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -103,7 +101,9 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, "pluginVersion": "10.1.10", "targets": [ @@ -112,14 +112,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": - "max(max_over_time(dragonfly_uptime_in_seconds{instance=~\"$instance\"}[$__interval]))", + "expr": "max(max_over_time(dragonfly_uptime_in_seconds{namespace=\"$namespace\",pod=~\"$pod_name\"}[$__interval]))", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "", "metric": "", + "range": true, "refId": "A", "step": 1800 } @@ -175,13 +176,13 @@ }, "hideTimeOverride": true, "id": 12, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "none", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -189,7 +190,9 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, "pluginVersion": "10.1.10", "targets": [ @@ -198,13 +201,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "dragonfly_connected_clients{instance=~\"$instance\"}", + "expr": "dragonfly_connected_clients{namespace=\"$namespace\",pod=~\"$pod_name\"}", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "", "metric": "", + "range": true, "refId": "A", "step": 2 } @@ -266,7 +271,6 @@ }, "hideTimeOverride": true, "id": 11, - "links": [], "maxDataPoints": 100, "options": { "minVizHeight": 75, @@ -280,7 +284,8 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, "pluginVersion": "10.1.10", "targets": [ @@ -289,14 +294,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": - "100 * (dragonfly_memory_used_bytes{instance=~\"$instance\"} / dragonfly_memory_max_bytes{instance=~\"$instance\"} )", + "expr": "100 * (dragonfly_memory_used_bytes{namespace=\"$namespace\",pod=~\"$pod_name\"} / dragonfly_memory_max_bytes{namespace=\"$namespace\",pod=~\"$pod_name\"} )", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "", "metric": "", + "range": true, "refId": "A", "step": 2 } @@ -306,16 +312,10 @@ "type": "gauge" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { "color": { @@ -370,30 +370,13 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 1 }, - "hiddenSeries": false, "id": 2, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", "options": { "alertThreshold": true, "legend": { @@ -407,77 +390,35 @@ "sort": "none" } }, - "percentage": false, - "pluginVersion": "9.3.6", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "rate(dragonfly_commands_processed_total{instance=~\"$instance\"}[1m])", + "expr": "rate(dragonfly_commands_processed_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[1m])", "format": "time_series", "interval": "", "intervalFactor": 2, - "legendFormat": "", + "legendFormat": "{{pod}}", "metric": "A", + "range": true, "refId": "A", "step": 240, "target": "" } ], - "thresholds": [], - "timeRegions": [], "title": "Commands Executed / sec", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "timeseries", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": { - "max": "#BF1B00" - }, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { "color": { @@ -532,32 +473,13 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 8 }, - "hiddenSeries": false, "id": 7, - "legend": { - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "null as zero", "options": { "alertThreshold": true, "legend": { @@ -571,28 +493,22 @@ "sort": "none" } }, - "percentage": false, - "pluginVersion": "9.3.6", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "dragonfly_memory_used_bytes{instance=~\"$instance\"} ", + "expr": "dragonfly_memory_used_bytes{namespace=\"$namespace\",pod=~\"$pod_name\"} ", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "used", "metric": "", + "range": true, "refId": "A", "step": 240, "target": "" @@ -602,13 +518,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "dragonfly_memory_max_bytes{instance=~\"$instance\"} ", + "expr": "dragonfly_memory_max_bytes{namespace=\"$namespace\",pod=~\"$pod_name\"} ", "format": "time_series", "hide": false, "interval": "", "intervalFactor": 2, "legendFormat": "max", + "range": true, "refId": "B", "step": 240 }, @@ -617,8 +535,9 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "dragonfly_used_memory_rss_bytes{instance=~\"$instance\"} ", + "expr": "dragonfly_used_memory_rss_bytes{namespace=\"$namespace\",pod=~\"$pod_name\"} ", "format": "time_series", "hide": false, "legendFormat": "RSS", @@ -626,49 +545,14 @@ "refId": "C" } ], - "thresholds": [], - "timeRegions": [], "title": "Total Memory Usage", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "timeseries", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "logBase": 1, - "min": 0, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { "color": { @@ -723,30 +607,13 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 8 }, - "hiddenSeries": false, "id": 10, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", "options": { "alertThreshold": true, "legend": { @@ -760,27 +627,21 @@ "sort": "none" } }, - "percentage": false, - "pluginVersion": "9.3.6", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "rate(dragonfly_net_input_bytes_total{instance=~\"$instance\"}[5m])", + "expr": "rate(dragonfly_net_input_bytes_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[5m])", "format": "time_series", "interval": "", "intervalFactor": 2, - "legendFormat": "{{ input }}", + "legendFormat": "{{ pod }} input", + "range": true, "refId": "A", "step": 240 }, @@ -789,58 +650,26 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "rate(dragonfly_net_output_bytes_total{instance=~\"$instance\"}[5m])", + "expr": "rate(dragonfly_net_output_bytes_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[5m])", "format": "time_series", "interval": "", "intervalFactor": 2, - "legendFormat": "{{ output }}", + "legendFormat": "{{ pod }} output", + "range": true, "refId": "B", "step": 240 } ], - "thresholds": [], - "timeRegions": [], "title": "Network I/O", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "timeseries", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { "color": { @@ -895,32 +724,13 @@ }, "overrides": [] }, - "fill": 7, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 15 }, - "hiddenSeries": false, "id": 5, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", "options": { "alertThreshold": true, "legend": { @@ -934,74 +744,34 @@ "sort": "none" } }, - "percentage": false, - "pluginVersion": "9.3.6", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "sum (dragonfly_db_keys{instance=~\"$instance\"}) by (db)", + "expr": "sum (dragonfly_db_keys{namespace=\"$namespace\",pod=~\"$pod_name\"}) by (db)", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "{{ db }} ", + "range": true, "refId": "A", "step": 240, "target": "" } ], - "thresholds": [], - "timeRegions": [], "title": "Total Items per DB", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "timeseries", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { "color": { @@ -1056,30 +826,13 @@ }, "overrides": [] }, - "fill": 7, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 15 }, - "hiddenSeries": false, "id": 13, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", "options": { "alertThreshold": true, "legend": { @@ -1093,28 +846,21 @@ "sort": "none" } }, - "percentage": false, - "pluginVersion": "9.3.6", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": - "sum (dragonfly_db_keys{instance=~\"$instance\"}) - sum (dragonfly_db_keys_expiring{instance=~\"$instance\"}) ", + "expr": "sum (dragonfly_db_keys{namespace=\"$namespace\",pod=~\"$pod_name\"}) - sum (dragonfly_db_keys_expiring{namespace=\"$namespace\",pod=~\"$pod_name\"}) ", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "not expiring", + "range": true, "refId": "A", "step": 240, "target": "" @@ -1124,74 +870,40 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "sum (dragonfly_db_keys_expiring{instance=~\"$instance\"})", + "expr": "sum (dragonfly_db_keys_expiring{namespace=\"$namespace\",pod=~\"$pod_name\"})", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "expiring", "metric": "", + "range": true, "refId": "B", "step": 240 } ], - "thresholds": [], - "timeRegions": [], "title": "Expiring vs Not-Expiring Keys", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "timeseries", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": { - "evicts": "#890F02", - "memcached_items_evicted_total{instance=\"172.17.0.1:9150\",job=\"prometheus\"}": "#890F02", - "reclaims": "#3F6833" - }, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "editable": true, - "error": false, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1223,8 +935,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1235,30 +946,13 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, - "grid": {}, "gridPos": { "h": 7, "w": 12, "x": 0, "y": 22 }, - "hiddenSeries": false, "id": 8, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", "options": { "alertThreshold": true, "legend": { @@ -1272,35 +966,23 @@ "sort": "none" } }, - "percentage": false, - "pluginVersion": "9.3.6", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "reclaims", - "yaxis": 2 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": - "sum(rate(dragonfly_expired_keys_total{instance=~\"$instance\"}[5m])) by (instance)", + "expr": "sum(rate(dragonfly_expired_keys_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[5m])) by (pod)", "format": "time_series", "hide": false, "interval": "", "intervalFactor": 2, "legendFormat": "expired", "metric": "", + "range": true, "refId": "A", "step": 240, "target": "" @@ -1310,53 +992,22 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": - "sum(rate(dragonfly_evicted_keys_total{instance=~\"$instance\"}[5m])) by (instance)", + "expr": "sum(rate(dragonfly_evicted_keys_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[5m])) by (pod)", "format": "time_series", "interval": "", "intervalFactor": 2, "legendFormat": "evicted", + "range": true, "refId": "B", "step": 240 } ], - "thresholds": [], - "timeRegions": [], "title": "Expired / Evicted", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "timeseries", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -1367,11 +1018,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1403,8 +1056,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1415,29 +1067,13 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 7, "w": 12, "x": 12, "y": 22 }, - "hiddenSeries": false, "id": 16, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", "options": { "alertThreshold": true, "legend": { @@ -1451,59 +1087,26 @@ "sort": "none" } }, - "percentage": false, - "pluginVersion": "9.3.6", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, - "expr": "dragonfly_connected_clients{instance=\"$instance\"}", + "expr": "dragonfly_connected_clients{namespace=\"$namespace\",pod=\"$pod_name\"}", "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "", + "legendFormat": "{{pod}}", + "range": true, "refId": "A" } ], - "thresholds": [], - "timeRegions": [], "title": "Dragonfly connected clients", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "timeseries", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "logBase": 1, - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": true - } - ], - "yaxis": { - "align": false - } + "type": "timeseries" }, { "collapsed": false, @@ -1529,11 +1132,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1564,8 +1169,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1596,6 +1200,7 @@ "sort": "none" } }, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { @@ -1604,8 +1209,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": - "rate(dragonfly_fiber_switch_delay_seconds_total[$__rate_interval])/rate(dragonfly_fiber_switch_total[$__rate_interval])", + "expr": "rate(dragonfly_fiber_switch_delay_seconds_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[$__rate_interval])/rate(dragonfly_fiber_switch_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[$__rate_interval])", "fullMetaSearch": false, "includeNullMetadata": false, "instant": false, @@ -1620,8 +1224,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": - "rate(dragonfly_fiber_longrun_seconds[$__rate_interval])/rate(dragonfly_fiber_longrun_total[$__rate_interval])", + "expr": "rate(dragonfly_fiber_longrun_seconds{namespace=\"$namespace\",pod=~\"$pod_name\"}[$__rate_interval])/rate(dragonfly_fiber_longrun_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[$__rate_interval])", "hide": false, "instant": false, "legendFormat": "longrun", @@ -1630,7 +1233,6 @@ } ], "title": "FiberSwitchDelay", - "transformations": [], "type": "timeseries" }, { @@ -1644,11 +1246,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1679,8 +1283,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1710,6 +1313,7 @@ "sort": "none" } }, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { @@ -1717,7 +1321,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "dragonfly_pipeline_queue_length/dragonfly_connected_clients", + "expr": "dragonfly_pipeline_queue_length{namespace=\"$namespace\",pod=~\"$pod_name\"}/dragonfly_connected_clients{namespace=\"$namespace\",pod=~\"$pod_name\"}", "instant": false, "legendFormat": "avr_pipeline_depth", "range": true, @@ -1738,11 +1342,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1773,8 +1379,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1804,6 +1409,7 @@ "sort": "none" } }, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { @@ -1811,7 +1417,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "dragonfly_replication_full_sync_bytes{instance=\"$instance\"}", + "expr": "dragonfly_replication_full_sync_bytes{namespace=\"$namespace\",pod=~\"$pod_name\"}", "instant": false, "legendFormat": "fullsync", "range": true, @@ -1823,7 +1429,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "dragonfly_replication_streaming_bytes{instance=\"$instance\"}", + "expr": "dragonfly_replication_streaming_bytes{namespace=\"$namespace\",pod=~\"$pod_name\"}", "hide": false, "instant": false, "legendFormat": "stable_sync", @@ -1845,11 +1451,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none", @@ -1880,8 +1488,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1912,6 +1519,7 @@ "sort": "none" } }, + "pluginVersion": "10.1.10", "targets": [ { "datasource": { @@ -1919,10 +1527,9 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": - "rate(dragonfly_pipeline_commands_duration_seconds[$__rate_interval])/rate(dragonfly_pipeline_commands_total[$__rate_interval])", + "expr": "rate(dragonfly_pipeline_commands_duration_seconds{namespace=\"$namespace\",pod=~\"$pod_name\"}[$__rate_interval])/rate(dragonfly_pipeline_commands_total{namespace=\"$namespace\",pod=~\"$pod_name\"}[$__rate_interval])", "instant": false, - "legendFormat": "__auto", + "legendFormat": "{{pod}}", "range": true, "refId": "A" } @@ -1931,7 +1538,7 @@ "type": "timeseries" } ], - "refresh": "1m", + "refresh": "10s", "schemaVersion": 38, "style": "dark", "tags": [ @@ -1983,10 +1590,7 @@ "regex": "", "skipUrlSync": false, "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" }, { "current": { @@ -2013,40 +1617,7 @@ "regex": "", "skipUrlSync": false, "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "current": { - "selected": false, - "text": "host.docker.internal:6379", - "value": "host.docker.internal:6379" - }, - "datasource": { - "uid": "$DS_PROMETHEUS" - }, - "definition": - "label_values(dragonfly_version{namespace=\"$namespace\", pod=\"$pod_name\"}, instance)", - "hide": 0, - "includeAll": false, - "multi": false, - "name": "instance", - "options": [], - "query": { - "query": - "label_values(dragonfly_version{namespace=\"$namespace\", pod=\"$pod_name\"}, instance)", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" } ] }, @@ -2054,34 +1625,10 @@ "from": "now-15m", "to": "now" }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, + "timepicker": {}, "timezone": "browser", "title": "Dragonfly Dashboard", "uid": "xDLNRKUWz", - "version": 4, + "version": 5, "weekStart": "" -} +} \ No newline at end of file