diff --git a/cfg/3.6/metric_query_selection.json b/cfg/3.6/metric_query_selection.json index 5da4865..c5cda55 100644 --- a/cfg/3.6/metric_query_selection.json +++ b/cfg/3.6/metric_query_selection.json @@ -32,7 +32,9 @@ "bckRebuildReadBwc", "bckRebuildWriteBwc", "rebalanceReadBwc", - "rebalanceWriteBwc" + "rebalanceWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] }, { @@ -62,7 +64,9 @@ "properties": [ "numOfMappedVolumes", "userDataReadBwc", - "userDataWriteBwc" + "userDataWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] }, { @@ -75,8 +79,7 @@ "userDataReadBwc", "userDataWriteBwc", "userDataSdcReadLatency", - "userDataSdcWriteLatency", - "userDataSdcTrimLatency" + "userDataSdcWriteLatency" ] }, { @@ -112,7 +115,9 @@ "bckRebuildReadBwc", "bckRebuildWriteBwc", "rebalanceReadBwc", - "rebalanceWriteBwc" + "rebalanceWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] }, { @@ -149,7 +154,9 @@ "bckRebuildReadBwc", "bckRebuildWriteBwc", "rebalanceReadBwc", - "rebalanceWriteBwc" + "rebalanceWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] } ] diff --git a/cfg/metric_query_selection.json b/cfg/metric_query_selection.json index ad3177c..070ff34 100644 --- a/cfg/metric_query_selection.json +++ b/cfg/metric_query_selection.json @@ -32,7 +32,9 @@ "bckRebuildReadBwc", "bckRebuildWriteBwc", "rebalanceReadBwc", - "rebalanceWriteBwc" + "rebalanceWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] }, { @@ -62,7 +64,9 @@ "properties": [ "numOfMappedVolumes", "userDataReadBwc", - "userDataWriteBwc" + "userDataWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] }, { @@ -75,8 +79,7 @@ "userDataReadBwc", "userDataWriteBwc", "userDataSdcReadLatency", - "userDataSdcWriteLatency", - "userDataSdcTrimLatency" + "userDataSdcWriteLatency" ] }, { @@ -109,7 +112,9 @@ "bckRebuildReadBwc", "bckRebuildWriteBwc", "rebalanceReadBwc", - "rebalanceWriteBwc" + "rebalanceWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] }, { @@ -146,7 +151,9 @@ "bckRebuildReadBwc", "bckRebuildWriteBwc", "rebalanceReadBwc", - "rebalanceWriteBwc" + "rebalanceWriteBwc", + "userDataSdcReadLatency", + "userDataSdcWriteLatency" ] } ] diff --git a/grafana/0 - PowerFlex - Global.json b/grafana/0 - PowerFlex - Global.json index 3622d80..fdb6b29 100644 --- a/grafana/0 - PowerFlex - Global.json +++ b/grafana/0 - PowerFlex - Global.json @@ -9,13 +9,13 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "11.5.1" }, { "type": "datasource", @@ -34,7 +34,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -54,18 +57,25 @@ "graphTooltip": 1, "id": null, "links": [], - "liveNow": false, "panels": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -74,6 +84,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -115,18 +126,25 @@ "y": 0 }, "id": 7, - "links": [], "options": { "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" + "calcs": [ + "min", + "max", + "mean", + "last" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": true, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -144,12 +162,13 @@ "step": 120 } ], - "title": "System IOPS", + "title": "Total IOPS", "type": "timeseries" }, { - "alert": { - "enabled": false + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -157,9 +176,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -168,6 +191,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -209,18 +233,25 @@ "y": 0 }, "id": 8, - "links": [], "options": { "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom" + "calcs": [ + "min", + "max", + "mean", + "last" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": true, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -238,12 +269,13 @@ "step": 120 } ], - "title": "System Bandwidth", + "title": "Total Bandwidth", "type": "timeseries" }, { - "alert": { - "enabled": false + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -251,9 +283,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 10, "gradientMode": "none", @@ -262,6 +298,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -303,21 +340,23 @@ "y": 10 }, "id": 17, - "links": [], "options": { "legend": { "calcs": [ "mean", "max" ], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -339,15 +378,23 @@ "type": "timeseries" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 10, "gradientMode": "none", @@ -356,6 +403,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -397,21 +445,23 @@ "y": 10 }, "id": 18, - "links": [], "options": { "legend": { "calcs": [ "mean", "max" ], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -433,15 +483,23 @@ "type": "timeseries" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 10, "gradientMode": "none", @@ -450,6 +508,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -471,8 +530,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -491,21 +549,23 @@ "y": 24 }, "id": 20, - "links": [], "options": { "legend": { "calcs": [ "mean", "max" ], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -537,9 +597,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 10, "gradientMode": "none", @@ -548,6 +612,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -569,8 +634,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -589,23 +653,29 @@ "y": 24 }, "id": 16, - "links": [], "options": { "legend": { "calcs": [ "mean", "max" ], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "topk(15,max(volume_read_user_data_kb + volume_write_user_data_kb) by (clu_name,pdo_name,sto_name,vol_name))", "hide": false, "intervalFactor": 2, @@ -629,9 +699,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 10, "gradientMode": "none", @@ -640,6 +714,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -661,8 +736,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -681,23 +755,29 @@ "y": 38 }, "id": 15, - "links": [], "options": { "legend": { "calcs": [ "mean", "max" ], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "topk(15,max(device_read_latency_ms) by (clu_name,pdo_name,sto_name,dev_name))", "hide": false, "intervalFactor": 2, @@ -721,9 +801,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "points", "fillOpacity": 10, "gradientMode": "none", @@ -732,6 +816,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 3, @@ -753,8 +838,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -773,23 +857,29 @@ "y": 38 }, "id": 21, - "links": [], "options": { "legend": { "calcs": [ "mean", "max" ], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "topk(15,max(device_write_latency_ms) by (clu_name,pdo_name,sto_name,dev_name))", "hide": false, "intervalFactor": 2, @@ -803,9 +893,8 @@ "type": "timeseries" } ], - "refresh": false, - "schemaVersion": 34, - "style": "dark", + "refresh": "", + "schemaVersion": 40, "tags": [ "PowerFlex" ], @@ -816,34 +905,10 @@ "from": "now-24h", "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": "0 - PowerFlex - Global", "uid": "8_cTqGFnz", - "version": 3, + "version": 4, "weekStart": "" } \ No newline at end of file diff --git a/grafana/1 - PowerFlex - Cluster.json b/grafana/1 - PowerFlex - Cluster.json index e49f116..457248b 100644 --- a/grafana/1 - PowerFlex - Cluster.json +++ b/grafana/1 - PowerFlex - Cluster.json @@ -9,13 +9,13 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "11.5.1" }, { "type": "datasource", @@ -40,7 +40,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -59,11 +62,13 @@ "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": null, - "iteration": 1644015937410, "links": [], - "liveNow": false, "panels": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -93,13 +98,13 @@ "y": 0 }, "id": 2, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -107,10 +112,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -131,6 +138,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -158,13 +169,13 @@ "y": 0 }, "id": 3, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -172,10 +183,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -196,6 +209,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -228,6 +245,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -235,9 +253,11 @@ "fields": "", "values": false }, - "textMode": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -289,13 +309,13 @@ "y": 0 }, "id": 4, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -303,12 +323,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_read_total_kb{clu_name=\"$CLU\"}", "intervalFactor": 2, "refId": "A", @@ -320,6 +346,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -349,13 +379,13 @@ "y": 0 }, "id": 5, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -363,10 +393,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -387,8 +419,9 @@ "type": "stat" }, { - "alert": { - "enabled": false + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -396,9 +429,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -407,6 +444,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -448,31 +486,38 @@ "y": 7 }, "id": 7, - "links": [], "options": { "legend": { - "calcs": [], + "calcs": [ + "mean", + "max" + ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "system_read_total_iops{clu_name=\"$CLU\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Read Ops", + "legendFormat": "Read", "metric": "", + "range": true, "refId": "A", "step": 120 }, @@ -481,13 +526,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "system_write_total_iops{clu_name=\"$CLU\"} / 2", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Write Ops", + "legendFormat": "Write", "metric": "", + "range": true, "refId": "B", "step": 120 } @@ -496,8 +543,9 @@ "type": "timeseries" }, { - "alert": { - "enabled": false + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -505,9 +553,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -516,6 +568,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -557,31 +610,38 @@ "y": 7 }, "id": 8, - "links": [], "options": { "legend": { - "calcs": [], + "calcs": [ + "mean", + "max" + ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "system_read_total_kb{clu_name=\"$CLU\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Read bw", + "legendFormat": "Read", "metric": "", + "range": true, "refId": "A", "step": 120 }, @@ -590,13 +650,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "system_write_total_kb{clu_name=\"$CLU\"} / 2", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Write bw", + "legendFormat": "Write", "metric": "", + "range": true, "refId": "B", "step": 120 } @@ -605,9 +667,256 @@ "type": "timeseries" }, { - "alert": { - "enabled": false + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average latency reported by SDC", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "µs" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 14 + }, + "id": 20, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "system_sdc_read_latency_us{clu_name=\"$CLU\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "system_sdc_write_latency_us{clu_name=\"$CLU\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "User Latency", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average IO size", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "kbytes" + }, + "overrides": [] }, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 14 + }, + "id": 21, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "system_read_total_iosize_kb{clu_name=\"$CLU\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "system_write_total_iosize_kb{clu_name=\"$CLU\"} / 2", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "IO Size", + "type": "timeseries" + }, + { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -618,9 +927,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -629,6 +942,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -667,23 +981,29 @@ "h": 7, "w": 6, "x": 0, - "y": 14 + "y": 21 }, "id": 9, - "links": [], "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "exemplar": true, "expr": "topk(10, avg(sdc_read_user_data_iops{clu_name=\"$CLU\"}) BY (sdc_name))", "interval": "", @@ -707,9 +1027,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -718,6 +1042,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -756,23 +1081,29 @@ "h": 7, "w": 6, "x": 6, - "y": 14 + "y": 21 }, "id": 10, - "links": [], "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "exemplar": true, "expr": "topk(10, avg(sdc_write_user_data_iops{clu_name=\"$CLU\"}) BY (sdc_name))", "interval": "", @@ -796,9 +1127,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -807,6 +1142,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -845,23 +1181,29 @@ "h": 7, "w": 6, "x": 12, - "y": 14 + "y": 21 }, "id": 11, - "links": [], "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "exemplar": true, "expr": "topk(10, avg(sdc_read_user_data_kb{clu_name=\"$CLU\"}) BY (sdc_name))", "interval": "", @@ -885,9 +1227,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -896,6 +1242,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -934,23 +1281,29 @@ "h": 7, "w": 6, "x": 18, - "y": 14 + "y": 21 }, "id": 12, - "links": [], "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "exemplar": true, "expr": "topk(10, avg(sdc_write_user_data_kb{clu_name=\"$CLU\"}) BY (sdc_name))", "interval": "", @@ -964,9 +1317,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -977,9 +1327,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -988,6 +1342,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1026,10 +1381,9 @@ "h": 8, "w": 12, "x": 0, - "y": 21 + "y": 28 }, "id": 13, - "links": [], "options": { "legend": { "calcs": [ @@ -1039,15 +1393,22 @@ "min" ], "displayMode": "table", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "max(device_read_latency_ms{clu_name=\"$CLU\"}) by (sto_name,pdo_name)", "intervalFactor": 2, "legendFormat": "{{pdo_name}} / {{sto_name}}", @@ -1059,9 +1420,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -1072,9 +1430,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1083,6 +1445,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1121,10 +1484,9 @@ "h": 8, "w": 12, "x": 12, - "y": 21 + "y": 28 }, "id": 14, - "links": [], "options": { "legend": { "calcs": [ @@ -1134,15 +1496,22 @@ "min" ], "displayMode": "table", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "max(device_write_latency_ms{clu_name=\"$CLU\"}) by (sto_name,pdo_name)", "intervalFactor": 2, "legendFormat": "{{pdo_name}} / {{sto_name}}", @@ -1164,9 +1533,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1175,6 +1548,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1238,23 +1612,29 @@ "h": 7, "w": 8, "x": 0, - "y": 29 + "y": 36 }, "id": 15, - "links": [], "options": { "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_read_fwd_rebuild_iops{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Read ops", @@ -1262,6 +1642,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_write_fwd_rebuild_iops{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Write ops", @@ -1269,6 +1653,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_read_fwd_rebuild_kb{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Read bw", @@ -1276,6 +1664,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_write_fwd_rebuild_kb{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Write bw", @@ -1297,9 +1689,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1308,6 +1704,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1371,23 +1768,29 @@ "h": 7, "w": 8, "x": 8, - "y": 29 + "y": 36 }, "id": 16, - "links": [], "options": { "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_read_bck_rebuild_iops{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Read ops", @@ -1395,6 +1798,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_write_bck_rebuild_iops{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Write ops", @@ -1402,6 +1809,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_read_bck_rebuild_kb{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Read bw", @@ -1409,6 +1820,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_write_bck_rebuild_kb{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Write bw", @@ -1430,9 +1845,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1441,6 +1860,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1504,23 +1924,29 @@ "h": 7, "w": 8, "x": 16, - "y": 29 + "y": 36 }, "id": 17, - "links": [], "options": { "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_read_rebalance_iops{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Read ops", @@ -1528,6 +1954,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_write_rebalance_iops{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Write ops", @@ -1535,6 +1965,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_read_rebalance_kb{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Read bw", @@ -1542,6 +1976,10 @@ "step": 240 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "system_write_rebalance_kb{clu_name=\"$CLU\"}", "intervalFactor": 2, "legendFormat": "Write bw", @@ -1554,8 +1992,7 @@ } ], "refresh": "", - "schemaVersion": 34, - "style": "dark", + "schemaVersion": 40, "tags": [ "PowerFlex" ], @@ -1568,10 +2005,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Cluster", - "multi": false, "name": "CLU", "options": [], "query": { @@ -1580,7 +2015,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" } @@ -1590,34 +2024,10 @@ "from": "now-24h", "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": "1 - PowerFlex - Cluster", "uid": "Jetc3MK7k", - "version": 11, + "version": 12, "weekStart": "" } \ No newline at end of file diff --git a/grafana/2 - PowerFlex - SDS.json b/grafana/2 - PowerFlex - SDS.json index 54129f6..bb70731 100644 --- a/grafana/2 - PowerFlex - SDS.json +++ b/grafana/2 - PowerFlex - SDS.json @@ -9,13 +9,13 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "11.5.1" }, { "type": "datasource", @@ -40,7 +40,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -59,11 +62,13 @@ "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": null, - "iteration": 1644015979500, "links": [], - "liveNow": false, "panels": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -93,13 +98,13 @@ "y": 0 }, "id": 2, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -107,12 +112,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(sds_read_total_iops{sds_name=\"$SDS\"})", "intervalFactor": 2, "refId": "A", @@ -124,6 +135,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -153,13 +168,13 @@ "y": 0 }, "id": 3, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -167,12 +182,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(sds_write_total_iops{sds_name=\"$SDS\"})", "intervalFactor": 2, "refId": "A", @@ -184,6 +205,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -213,13 +238,13 @@ "y": 0 }, "id": 4, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -227,12 +252,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(sds_read_total_kb{sds_name=\"$SDS\"})", "intervalFactor": 2, "refId": "A", @@ -244,6 +275,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -273,13 +308,13 @@ "y": 0 }, "id": 5, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -287,12 +322,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sum(sds_write_total_kb{sds_name=\"$SDS\"})", "intervalFactor": 2, "refId": "A", @@ -314,9 +355,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -325,6 +370,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -366,38 +412,55 @@ "y": 7 }, "id": 7, - "links": [], "options": { "legend": { - "calcs": [], + "calcs": [ + "mean", + "max" + ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", "exemplar": true, "expr": "sds_read_total_iops{sds_name=\"$SDS\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Read ops", + "legendFormat": "Read", "metric": "", + "range": true, "refId": "A", "step": 120 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", "exemplar": true, "expr": "sds_write_total_iops{sds_name=\"$SDS\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Write ops", + "legendFormat": "Write", "metric": "", + "range": true, "refId": "B", "step": 120 } @@ -416,9 +479,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -427,6 +494,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -468,38 +536,55 @@ "y": 7 }, "id": 8, - "links": [], "options": { "legend": { - "calcs": [], + "calcs": [ + "mean", + "max" + ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", "exemplar": true, "expr": "sds_read_total_kb{sds_name=\"$SDS\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Read ops", + "legendFormat": "Read", "metric": "", + "range": true, "refId": "A", "step": 120 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", "exemplar": true, "expr": "sds_write_total_kb{sds_name=\"$SDS\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Write ops", + "legendFormat": "Write", "metric": "", + "range": true, "refId": "B", "step": 120 } @@ -518,9 +603,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -529,6 +618,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -570,7 +660,6 @@ "y": 14 }, "id": 13, - "links": [], "options": { "legend": { "calcs": [ @@ -580,15 +669,22 @@ "min" ], "displayMode": "table", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "max(device_read_latency_ms{sds_name=\"$SDS\"}) by (dev_name)", "intervalFactor": 2, "legendFormat": "{{dev_name}}", @@ -610,9 +706,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -621,6 +721,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -662,7 +763,6 @@ "y": 14 }, "id": 14, - "links": [], "options": { "legend": { "calcs": [ @@ -672,15 +772,22 @@ "min" ], "displayMode": "table", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "max(device_write_latency_ms{sds_name=\"$SDS\"}) by (dev_name)", "intervalFactor": 2, "legendFormat": "{{dev_name}}", @@ -692,9 +799,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -705,9 +809,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -716,6 +824,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -757,20 +866,26 @@ "y": 26 }, "id": 15, - "links": [], "options": { "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sds_capacity_use_kb{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sds_name=\"$SDS\"}", "intervalFactor": 2, "legendFormat": "{{sds_name}}", @@ -782,9 +897,8 @@ "type": "timeseries" } ], - "refresh": false, - "schemaVersion": 34, - "style": "dark", + "refresh": "", + "schemaVersion": 40, "tags": [ "PowerFlex" ], @@ -797,10 +911,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Cluster", - "multi": false, "name": "CLU", "options": [], "query": { @@ -809,7 +921,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -820,10 +931,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Protection Domain", - "multi": false, "name": "DOMAIN", "options": [], "query": { @@ -832,7 +941,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -843,10 +951,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Storage Pool", - "multi": false, "name": "POOL", "options": [], "query": { @@ -855,7 +961,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -868,7 +973,6 @@ "definition": "", "hide": 2, "includeAll": false, - "multi": false, "name": "POOL_ID", "options": [], "query": { @@ -877,8 +981,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { @@ -888,9 +990,7 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(device_read_size_bytes{clu_name=\"$CLU\", pdo_name=\"$DOMAIN\", sto_id=\"$POOL_ID\"}, sds_name)", - "hide": 0, "includeAll": false, - "multi": false, "name": "SDS", "options": [], "query": { @@ -899,7 +999,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" } @@ -909,34 +1008,10 @@ "from": "now-24h", "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": "2 - PowerFlex - SDS", "uid": "R_2yqGFnz", - "version": 5, + "version": 6, "weekStart": "" } \ No newline at end of file diff --git a/grafana/3 - PowerFlex - Storage Pools.json b/grafana/3 - PowerFlex - Storage Pools.json index 5ba3266..0b46e1f 100644 --- a/grafana/3 - PowerFlex - Storage Pools.json +++ b/grafana/3 - PowerFlex - Storage Pools.json @@ -15,7 +15,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "9.1.8" + "version": "11.5.1" }, { "type": "panel", @@ -69,7 +69,6 @@ "graphTooltip": 1, "id": null, "links": [], - "liveNow": false, "panels": [ { "datasource": { @@ -102,12 +101,13 @@ "id": 26, "options": { "displayLabels": [ - "value" + "percent" ], "legend": { "displayMode": "list", "placement": "bottom", - "showLegend": true + "showLegend": true, + "values": [] }, "pieType": "pie", "reduceOptions": { @@ -118,10 +118,12 @@ "values": false }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -151,9 +153,6 @@ "type": "piechart" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -164,11 +163,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -177,6 +178,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -187,7 +189,7 @@ "spanNulls": false, "stacking": { "group": "A", - "mode": "normal" + "mode": "none" }, "thresholdsStyle": { "mode": "off" @@ -207,7 +209,7 @@ } ] }, - "unit": "KiBs" + "unit": "kbytes" }, "overrides": [] }, @@ -220,17 +222,24 @@ "id": 18, "options": { "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true + "calcs": [ + "min", + "max", + "last" + ], + "displayMode": "table", + "placement": "right", + "showLegend": true, + "sortBy": "Last", + "sortDesc": true }, "tooltip": { - "mode": "single", - "sort": "none" + "hideZeros": true, + "mode": "multi", + "sort": "desc" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -360,13 +369,13 @@ "y": 9 }, "id": 2, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -374,10 +383,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.1.8", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -429,13 +440,13 @@ "y": 9 }, "id": 3, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -443,10 +454,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.1.8", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -500,13 +513,13 @@ "y": 9 }, "id": 4, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -514,10 +527,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.1.8", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -571,13 +586,13 @@ "y": 9 }, "id": 5, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -585,10 +600,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.1.8", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -619,11 +636,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -632,6 +651,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -673,33 +693,38 @@ "y": 16 }, "id": 7, - "links": [], "options": { "legend": { - "calcs": [], + "calcs": [ + "mean", + "max" + ], "displayMode": "list", "placement": "bottom", "showLegend": true }, "tooltip": { - "mode": "single", + "hideZeros": false, + "mode": "multi", "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "storagepool_read_total_iops{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Read ops", + "legendFormat": "Read", "metric": "", + "range": true, "refId": "A", "step": 120 }, @@ -708,13 +733,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "storagepool_write_total_iops{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"} / 2", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Write ops", + "legendFormat": "Write", "metric": "", + "range": true, "refId": "B", "step": 120 } @@ -733,11 +760,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -746,6 +775,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -787,33 +817,38 @@ "y": 16 }, "id": 8, - "links": [], "options": { "legend": { - "calcs": [], + "calcs": [ + "mean", + "max" + ], "displayMode": "list", "placement": "bottom", "showLegend": true }, "tooltip": { - "mode": "single", + "hideZeros": false, + "mode": "multi", "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "storagepool_read_total_kb{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"}", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Read bw", + "legendFormat": "Read", "metric": "", + "range": true, "refId": "A", "step": 120 }, @@ -822,13 +857,15 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "code", "exemplar": true, "expr": "storagepool_write_total_kb{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"} / 2", "hide": false, "interval": "", "intervalFactor": 2, - "legendFormat": "Write bw", + "legendFormat": "Write", "metric": "", + "range": true, "refId": "B", "step": 120 } @@ -837,22 +874,149 @@ "type": "timeseries" }, { - "alert": { - "enabled": false + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average latency reported by SDC", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "µs" + }, + "overrides": [] }, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 23 + }, + "id": 27, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "storagepool_sdc_read_latency_us{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "storagepool_sdc_write_latency_us{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "User Latency", + "type": "timeseries" + }, + { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "description": "Average IO size", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -861,6 +1025,131 @@ "tooltip": false, "viz": false }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "kbytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 23 + }, + "id": 28, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "storagepool_read_total_iosize_kb{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "storagepool_write_total_iosize_kb{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "IO Size", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -882,7 +1171,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -898,10 +1188,9 @@ "h": 7, "w": 6, "x": 0, - "y": 23 + "y": 30 }, "id": 9, - "links": [], "options": { "legend": { "calcs": [], @@ -910,10 +1199,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -931,9 +1222,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -944,9 +1232,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -955,6 +1247,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -976,7 +1269,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -992,10 +1286,9 @@ "h": 7, "w": 6, "x": 6, - "y": 23 + "y": 30 }, "id": 10, - "links": [], "options": { "legend": { "calcs": [], @@ -1004,10 +1297,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1025,9 +1320,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -1038,9 +1330,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1049,6 +1345,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1070,7 +1367,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1086,10 +1384,9 @@ "h": 7, "w": 6, "x": 12, - "y": 23 + "y": 30 }, "id": 11, - "links": [], "options": { "legend": { "calcs": [], @@ -1098,10 +1395,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1119,9 +1418,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -1132,9 +1428,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1143,6 +1443,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1164,7 +1465,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1180,10 +1482,9 @@ "h": 7, "w": 6, "x": 18, - "y": 23 + "y": 30 }, "id": 12, - "links": [], "options": { "legend": { "calcs": [], @@ -1192,10 +1493,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1223,9 +1526,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1234,6 +1541,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1255,7 +1563,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1271,10 +1580,9 @@ "h": 8, "w": 6, "x": 0, - "y": 30 + "y": 37 }, "id": 21, - "links": [], "options": { "legend": { "calcs": [], @@ -1283,10 +1591,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1304,9 +1614,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -1317,9 +1624,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1328,6 +1639,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1349,7 +1661,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1365,10 +1678,9 @@ "h": 8, "w": 6, "x": 6, - "y": 30 + "y": 37 }, "id": 22, - "links": [], "options": { "legend": { "calcs": [], @@ -1377,10 +1689,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1408,9 +1722,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1419,6 +1737,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1440,7 +1759,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1456,10 +1776,9 @@ "h": 8, "w": 6, "x": 12, - "y": 30 + "y": 37 }, "id": 23, - "links": [], "options": { "legend": { "calcs": [], @@ -1468,10 +1787,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1489,9 +1810,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -1502,9 +1820,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1513,6 +1835,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1534,7 +1857,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1550,10 +1874,9 @@ "h": 8, "w": 6, "x": 18, - "y": 30 + "y": 37 }, "id": 24, - "links": [], "options": { "legend": { "calcs": [], @@ -1562,10 +1885,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1593,9 +1918,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1604,6 +1933,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1625,7 +1955,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1641,10 +1972,9 @@ "h": 8, "w": 12, "x": 0, - "y": 38 + "y": 45 }, "id": 13, - "links": [], "options": { "legend": { "calcs": [ @@ -1658,19 +1988,23 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "editorMode": "builder", "expr": "max(device_read_latency_ms{clu_name=\"$CLU\",pdo_name=\"$DOMAIN\",sto_name=\"$POOL\"}) by (sds_name)", "intervalFactor": 2, "legendFormat": "{{sds_name}}", + "range": true, "refId": "A", "step": 120 } @@ -1679,9 +2013,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -1692,9 +2023,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -1703,6 +2038,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1724,7 +2060,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": null }, { "color": "red", @@ -1740,10 +2077,9 @@ "h": 8, "w": 12, "x": 12, - "y": 38 + "y": 45 }, "id": 14, - "links": [], "options": { "legend": { "calcs": [ @@ -1757,10 +2093,12 @@ "showLegend": false }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "single", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -1778,9 +2116,8 @@ "type": "timeseries" } ], - "refresh": false, - "schemaVersion": 37, - "style": "dark", + "refresh": "", + "schemaVersion": 40, "tags": [ "PowerFlex" ], @@ -1793,10 +2130,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Cluster", - "multi": false, "name": "CLU", "options": [], "query": { @@ -1805,7 +2140,6 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -1816,10 +2150,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Protection Domain", - "multi": false, "name": "DOMAIN", "options": [], "query": { @@ -1828,7 +2160,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -1839,10 +2170,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Storage Pool", - "multi": false, "name": "POOL", "options": [], "query": { @@ -1851,7 +2180,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" } @@ -1861,34 +2189,10 @@ "from": "now-24h", "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": "3 - PowerFlex - Storage Pools", "uid": "amZYqGKnz", - "version": 4, + "version": 5, "weekStart": "" -} +} \ No newline at end of file diff --git a/grafana/4 - PowerFlex - Volumes.json b/grafana/4 - PowerFlex - Volumes.json index fd2c061..12ad99a 100644 --- a/grafana/4 - PowerFlex - Volumes.json +++ b/grafana/4 - PowerFlex - Volumes.json @@ -9,13 +9,13 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "11.5.1" }, { "type": "datasource", @@ -40,7 +40,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -59,11 +62,13 @@ "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": null, - "iteration": 1644016052370, "links": [], - "liveNow": false, "panels": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -93,13 +98,13 @@ "y": 0 }, "id": 2, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -107,10 +112,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -132,6 +139,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -161,13 +172,13 @@ "y": 0 }, "id": 3, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -175,10 +186,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -199,6 +212,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -228,13 +245,13 @@ "y": 0 }, "id": 4, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -242,10 +259,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -266,6 +285,10 @@ "type": "stat" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { @@ -295,13 +318,13 @@ "y": 0 }, "id": 5, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -309,10 +332,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -333,8 +358,9 @@ "type": "stat" }, { - "alert": { - "enabled": false + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" }, "fieldConfig": { "defaults": { @@ -342,9 +368,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -353,6 +383,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -394,7 +425,6 @@ "y": 8 }, "id": 7, - "links": [], "options": { "legend": { "calcs": [ @@ -402,13 +432,16 @@ "max" ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -445,15 +478,23 @@ "type": "timeseries" }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -462,6 +503,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -503,7 +545,6 @@ "y": 8 }, "id": 8, - "links": [], "options": { "legend": { "calcs": [ @@ -511,13 +552,16 @@ "max" ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { "datasource": { @@ -552,11 +596,260 @@ ], "title": "Bandwidth", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average latency reported by SDC", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "µs" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 16 + }, + "id": 9, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "volume_sdc_read_latency_us{vol_name=\"$VOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "volume_sdc_write_latency_us{vol_name=\"$VOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "User Latency", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average IO size", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "kbytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 16 + }, + "id": 10, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "volume_read_user_data_iosize_kb{vol_name=\"$VOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "volume_write_user_data_iosize_kb{vol_name=\"$VOL\"}", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "IO Size", + "type": "timeseries" } ], - "refresh": false, - "schemaVersion": 34, - "style": "dark", + "refresh": "", + "schemaVersion": 40, "tags": [ "PowerFlex" ], @@ -569,10 +862,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Cluster", - "multi": false, "name": "CLU", "options": [], "query": { @@ -581,7 +872,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -592,10 +882,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Protection Domain", - "multi": false, "name": "DOMAIN", "options": [], "query": { @@ -604,7 +892,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -615,10 +902,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, "label": "Storage Pool", - "multi": false, "name": "POOL", "options": [], "query": { @@ -627,7 +912,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -638,10 +922,8 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "label_values(volume_read_user_data_iops{clu_name=\"$CLU\", pdo_name=\"$DOMAIN\", sto_id=\"$POOL_ID\"}, vol_name)", - "hide": 0, "includeAll": false, "label": "Volume", - "multi": false, "name": "VOL", "options": [], "query": { @@ -650,7 +932,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -663,7 +944,6 @@ "definition": "", "hide": 2, "includeAll": false, - "multi": false, "name": "VOL_ID", "options": [], "query": { @@ -672,8 +952,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" }, { @@ -685,7 +963,6 @@ "definition": "", "hide": 2, "includeAll": false, - "multi": false, "name": "POOL_ID", "options": [], "query": { @@ -694,8 +971,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" } ] @@ -704,34 +979,10 @@ "from": "now-24h", "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": "4 - PowerFlex - Volumes", "uid": "qKeUqMFnz", - "version": 4, + "version": 5, "weekStart": "" } \ No newline at end of file diff --git a/grafana/5 - PowerFlex - SDC.json b/grafana/5 - PowerFlex - SDC.json index daa434a..a6ecee9 100644 --- a/grafana/5 - PowerFlex - SDC.json +++ b/grafana/5 - PowerFlex - SDC.json @@ -9,13 +9,13 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "11.5.1" }, { "type": "datasource", @@ -40,7 +40,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -59,9 +62,7 @@ "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": null, - "iteration": 1644016082547, "links": [], - "liveNow": false, "panels": [ { "datasource": { @@ -97,13 +98,13 @@ "y": 0 }, "id": 2, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -111,12 +112,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_read_user_data_iops{sdc_id=\"$SDC_ID\"}", "intervalFactor": 2, "metric": "storagepool", @@ -162,13 +169,13 @@ "y": 0 }, "id": 3, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -176,12 +183,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_write_user_data_iops{sdc_id=\"$SDC_ID\"}", "intervalFactor": 2, "legendFormat": "", @@ -228,13 +241,13 @@ "y": 0 }, "id": 7, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "none", "graphMode": "none", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "max" @@ -242,12 +255,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_mapped_volumes{sdc_id=\"$SDC_ID\"}", "intervalFactor": 2, "refId": "A", @@ -291,13 +310,13 @@ "y": 0 }, "id": 4, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "lastNotNull" @@ -305,12 +324,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_read_user_data_kb{sdc_id=\"$SDC_ID\"}", "intervalFactor": 2, "refId": "A", @@ -355,13 +380,13 @@ "y": 0 }, "id": 5, - "links": [], "maxDataPoints": 100, "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -369,12 +394,18 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "8.3.4", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_write_user_data_kb{sdc_id=\"$SDC_ID\"}", "intervalFactor": 2, "refId": "A", @@ -396,9 +427,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -407,6 +442,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -448,7 +484,6 @@ "y": 8 }, "id": 10, - "links": [], "options": { "legend": { "calcs": [ @@ -456,15 +491,22 @@ "max" ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_read_user_data_iops{sdc_id=\"$SDC_ID\"}", "hide": false, "intervalFactor": 2, @@ -474,6 +516,10 @@ "step": 120 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_write_user_data_iops{sdc_id=\"$SDC_ID\"}", "hide": false, "intervalFactor": 2, @@ -487,9 +533,6 @@ "type": "timeseries" }, { - "alert": { - "enabled": false - }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -500,9 +543,13 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -511,6 +558,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -552,7 +600,6 @@ "y": 8 }, "id": 8, - "links": [], "options": { "legend": { "calcs": [ @@ -560,15 +607,22 @@ "max" ], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { - "mode": "single" + "hideZeros": false, + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.2.1", + "pluginVersion": "11.5.1", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_read_user_data_kb{sdc_id=\"$SDC_ID\"}", "hide": false, "intervalFactor": 2, @@ -578,6 +632,10 @@ "step": 120 }, { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, "expr": "sdc_write_user_data_kb{sdc_id=\"$SDC_ID\"}", "hide": false, "intervalFactor": 2, @@ -589,11 +647,252 @@ ], "title": "Bandwidth", "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average latency reported by SDC", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "µs" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 16 + }, + "id": 11, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sdc_sdc_read_latency_us{sdc_id=\"$SDC_ID\"}", + "hide": false, + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sdc_sdc_write_latency_us{sdc_id=\"$SDC_ID\"}", + "hide": false, + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "User Latency", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "description": "Average IO size", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "kbytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 16 + }, + "id": 12, + "options": { + "legend": { + "calcs": [ + "mean", + "max" + ], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "11.5.1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sdc_read_user_data_iosize_kb{sdc_id=\"$SDC_ID\"}", + "hide": false, + "intervalFactor": 2, + "legendFormat": "Read", + "metric": "", + "range": true, + "refId": "A", + "step": 120 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "expr": "sdc_write_user_data_iosize_kb{sdc_id=\"$SDC_ID\"}", + "hide": false, + "intervalFactor": 2, + "legendFormat": "Write", + "metric": "", + "range": true, + "refId": "B", + "step": 120 + } + ], + "title": "IO Size", + "type": "timeseries" } ], - "refresh": false, - "schemaVersion": 34, - "style": "dark", + "refresh": "", + "schemaVersion": 40, "tags": [ "PowerFlex" ], @@ -606,9 +905,7 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, - "multi": false, "name": "CLU", "options": [], "query": { @@ -617,7 +914,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -628,9 +924,7 @@ "uid": "${DS_PROMETHEUS}" }, "definition": "", - "hide": 0, "includeAll": false, - "multi": false, "name": "SDC", "options": [], "query": { @@ -639,7 +933,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, "sort": 1, "type": "query" }, @@ -652,7 +945,6 @@ "definition": "", "hide": 2, "includeAll": false, - "multi": false, "name": "SDC_ID", "options": [], "query": { @@ -661,8 +953,6 @@ }, "refresh": 1, "regex": "", - "skipUrlSync": false, - "sort": 0, "type": "query" } ] @@ -671,34 +961,10 @@ "from": "now-24h", "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": "5 - PowerFlex - SDC", "uid": "_CNP3MKnk", - "version": 4, + "version": 5, "weekStart": "" } \ No newline at end of file diff --git a/src/sio/metrics.rs b/src/sio/metrics.rs index 5acc636..5281e6e 100644 --- a/src/sio/metrics.rs +++ b/src/sio/metrics.rs @@ -495,23 +495,46 @@ fn convert_metrics(cfg_path: Option<&str>, stats: &Map().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); + let m_io_value: f64 = div_oper(v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); let metric_io: Metric = Metric::new(m_io_name, m_io_type, m_io_help, m_labels.clone(), m_io_value); metric_list.push(metric_io); let m_bw_name = format!("{}_{}_kb", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); let m_bw_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); let m_bw_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); - let m_bw_value: f64 = bw_calc(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); + let m_bw_value: f64 = div_oper(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); let metric_bw: Metric = Metric::new(m_bw_name, m_bw_type, m_bw_help, m_labels.clone(), m_bw_value); metric_list.push(metric_bw); + + let m_sz_name = format!("{}_{}_iosize_kb", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); + let m_sz_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); + let m_sz_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); + let m_sz_value: f64 = div_oper(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap()); + let metric_sz: Metric = Metric::new(m_sz_name, m_sz_type, m_sz_help, m_labels.clone(), m_sz_value); + metric_list.push(metric_sz); + + } else if m.ends_with("Latency") && v.is_object() { + let m_io_name = format!("{}_{}_iops", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); + let m_io_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); + let m_io_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); + let m_io_value: f64 = div_oper(v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); + let metric_io: Metric = Metric::new(m_io_name, m_io_type, m_io_help, m_labels.clone(), m_io_value); + metric_list.push(metric_io); + + let m_lat_name = format!("{}_{}_us", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); + let m_lat_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); + let m_lat_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); + let m_lat_value: f64 = div_oper(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap()); + let metric_lat: Metric = Metric::new(m_lat_name, m_lat_type, m_lat_help, m_labels.clone(), m_lat_value); + metric_list.push(metric_lat); + } else { let m_name = format!("{}_{}", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); let m_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); let m_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); if let Some(m_value) = v.as_f64() { - let metric_bw: Metric = Metric::new(m_name, m_type, m_help, m_labels.clone(), m_value); - metric_list.push(metric_bw); + let metric: Metric = Metric::new(m_name, m_type, m_help, m_labels.clone(), m_value); + metric_list.push(metric); } } } else { @@ -538,16 +561,39 @@ fn convert_metrics(cfg_path: Option<&str>, stats: &Map().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); + let m_io_value: f64 = div_oper(v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); let metric_io: Metric = Metric::new(m_io_name, m_io_type, m_io_help, m_labels.clone(), m_io_value); metric_list.push(metric_io); let m_bw_name = format!("{}_{}_kb", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); let m_bw_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); let m_bw_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); - let m_bw_value: f64 = bw_calc(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); + let m_bw_value: f64 = div_oper(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); let metric_bw: Metric = Metric::new(m_bw_name, m_bw_type, m_bw_help, m_labels.clone(), m_bw_value); metric_list.push(metric_bw); + + let m_sz_name = format!("{}_{}_iosize_kb", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); + let m_sz_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); + let m_sz_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); + let m_sz_value: f64 = div_oper(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap()); + let metric_sz: Metric = Metric::new(m_sz_name, m_sz_type, m_sz_help, m_labels.clone(), m_sz_value); + metric_list.push(metric_sz); + + } else if m.ends_with("Latency") && v.is_object() { + let m_io_name = format!("{}_{}_iops", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); + let m_io_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); + let m_io_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); + let m_io_value: f64 = div_oper(v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap(), v.as_object().unwrap()["numSeconds"].to_string().parse::().unwrap()); + let metric_io: Metric = Metric::new(m_io_name, m_io_type, m_io_help, m_labels.clone(), m_io_value); + metric_list.push(metric_io); + + let m_lat_name = format!("{}_{}_us", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); + let m_lat_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); + let m_lat_help = mdef[m].as_object().unwrap()["help"].to_string().replace('"', ""); + let m_lat_value: f64 = div_oper(v.as_object().unwrap()["totalWeightInKb"].to_string().parse::().unwrap(), v.as_object().unwrap()["numOccured"].to_string().parse::().unwrap()); + let metric_lat: Metric = Metric::new(m_lat_name, m_lat_type, m_lat_help, m_labels.clone(), m_lat_value); + metric_list.push(metric_lat); + } else { let m_name = format!("{}_{}", stype, mdef[m].as_object().unwrap()["name"]).replace('"', "").to_lowercase(); let m_type = mdef[m].as_object().unwrap()["type"].to_string().replace('"', "").to_lowercase(); @@ -573,21 +619,11 @@ fn convert_metrics(cfg_path: Option<&str>, stats: &Map f64 { - if occur == 0 { - 0.0_f64 - } else { - (occur / secs) as f64 - } -} - -/// Calculate Bandwidth Kb/s from the *Bwc metrics -fn bw_calc(occur: i32, secs: i32) -> f64 { - if occur == 0 { +/// Divide operation (to calculate IOPS, Bandwidth, IO size, latency... from the *Bwc or *Latency metrics) +fn div_oper(value: i32, divisor: i32) -> f64 { + if value == 0 || divisor == 0 { 0.0_f64 } else { - (occur / secs) as f64 + (value as f64 / divisor as f64) as f64 } }