From 6adbfd3c768a983c8c977db654a83f78fea9a2a0 Mon Sep 17 00:00:00 2001 From: Amnon Heiman Date: Thu, 18 Jun 2020 10:43:27 +0300 Subject: [PATCH] Add generated dashboards (cherry picked from commit 04e9a25ef493d065a1a7430ff7ff8de01efa9887) --- .../build/manager_2.1/scylla-manager.2.1.json | 218 +++++++----------- .../manager_master/scylla-manager.master.json | 218 +++++++----------- 2 files changed, 176 insertions(+), 260 deletions(-) diff --git a/grafana/build/manager_2.1/scylla-manager.2.1.json b/grafana/build/manager_2.1/scylla-manager.2.1.json index 2aaba82e2d..29deb67c9e 100644 --- a/grafana/build/manager_2.1/scylla-manager.2.1.json +++ b/grafana/build/manager_2.1/scylla-manager.2.1.json @@ -440,7 +440,7 @@ } ], "thresholds": "", - "title": "Active Repair Tasks", + "title": "Active Repair", "transparent": true, "type": "singlestat", "valueFontSize": "150%", @@ -527,7 +527,7 @@ } ], "thresholds": "", - "title": "Active Backup Tasks", + "title": "Active Backup", "transparent": true, "type": "singlestat", "valueFontSize": "150%", @@ -542,25 +542,8 @@ }, { "cacheTimeout": null, - "class": "single_stat_panel", - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + "class": "gauge_percent_panel", "datasource": "prometheus", - "editable": true, - "error": false, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": false - }, "gridPos": { "h": 6, "w": 2, @@ -568,43 +551,49 @@ "y": 4 }, "id": 7, - "interval": null, - "isNew": true, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "options": { + "fieldOptions": { + "calcs": [ + "lastNotNull" + ], + "defaults": { + "mappings": [ + { + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" + } + ], + "max": 100, + "min": 0, + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 0 + } + ] + }, + "unit": "percent" + }, + "overrides": [], + "values": false }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "span": 1, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": false }, - "tableColumn": "", + "pluginVersion": "6.7.3", + "span": 1, "targets": [ { "expr": "sum(avg(scylla_manager_repair_progress{cluster=~\"[[cluster]]\", instance=~\"$instance\", keyspace=~\"$keyspace\"}) by (task) * sum(scylla_manager_task_active_count{cluster=~\"[[cluster]]\", type=\"repair\"}) by (task))", @@ -613,41 +602,14 @@ "refId": "A" } ], - "thresholds": "0,0", - "title": "Repair progress", + "title": "Repair", "transparent": true, - "type": "singlestat", - "valueFontSize": "150%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "gauge" }, { "cacheTimeout": null, - "class": "single_stat_panel", - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + "class": "gauge_percent_panel", "datasource": "prometheus", - "editable": true, - "error": false, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": false - }, "gridPos": { "h": 6, "w": 2, @@ -655,43 +617,49 @@ "y": 4 }, "id": 8, - "interval": null, - "isNew": true, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "options": { + "fieldOptions": { + "calcs": [ + "lastNotNull" + ], + "defaults": { + "mappings": [ + { + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" + } + ], + "max": 100, + "min": 0, + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 0 + } + ] + }, + "unit": "percent" + }, + "overrides": [], + "values": false }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "span": 1, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": false }, - "tableColumn": "", + "pluginVersion": "6.7.3", + "span": 1, "targets": [ { "expr": "sum(avg(scylla_manager_backup_percent_progress{cluster=~\"[[cluster]]\", instance=~\"$instance\", keyspace=~\"$keyspace\"}) by (task) * sum(scylla_manager_task_active_count{cluster=~\"[[cluster]]\", type=\"backup\"}) by (task))", @@ -700,19 +668,9 @@ "refId": "A" } ], - "thresholds": "0,0", - "title": "Backup progress", + "title": "Backup", "transparent": true, - "type": "singlestat", - "valueFontSize": "150%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "gauge" }, { "class": "text_panel", diff --git a/grafana/build/manager_master/scylla-manager.master.json b/grafana/build/manager_master/scylla-manager.master.json index faaaae6680..504833073a 100644 --- a/grafana/build/manager_master/scylla-manager.master.json +++ b/grafana/build/manager_master/scylla-manager.master.json @@ -440,7 +440,7 @@ } ], "thresholds": "", - "title": "Active Repair Tasks", + "title": "Active Repair", "transparent": true, "type": "singlestat", "valueFontSize": "150%", @@ -527,7 +527,7 @@ } ], "thresholds": "", - "title": "Active Backup Tasks", + "title": "Active Backup", "transparent": true, "type": "singlestat", "valueFontSize": "150%", @@ -542,25 +542,8 @@ }, { "cacheTimeout": null, - "class": "single_stat_panel", - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + "class": "gauge_percent_panel", "datasource": "prometheus", - "editable": true, - "error": false, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": false - }, "gridPos": { "h": 6, "w": 2, @@ -568,43 +551,49 @@ "y": 4 }, "id": 7, - "interval": null, - "isNew": true, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "options": { + "fieldOptions": { + "calcs": [ + "lastNotNull" + ], + "defaults": { + "mappings": [ + { + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" + } + ], + "max": 100, + "min": 0, + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 0 + } + ] + }, + "unit": "percent" + }, + "overrides": [], + "values": false }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "span": 1, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": false }, - "tableColumn": "", + "pluginVersion": "6.7.3", + "span": 1, "targets": [ { "expr": "sum(avg(scylla_manager_repair_progress{cluster=~\"[[cluster]]\", instance=~\"$instance\", keyspace=~\"$keyspace\"}) by (task) * sum(scylla_manager_task_active_count{cluster=~\"[[cluster]]\", type=\"repair\"}) by (task))", @@ -613,41 +602,14 @@ "refId": "A" } ], - "thresholds": "0,0", - "title": "Repair progress", + "title": "Repair", "transparent": true, - "type": "singlestat", - "valueFontSize": "150%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "gauge" }, { "cacheTimeout": null, - "class": "single_stat_panel", - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + "class": "gauge_percent_panel", "datasource": "prometheus", - "editable": true, - "error": false, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": false - }, "gridPos": { "h": 6, "w": 2, @@ -655,43 +617,49 @@ "y": 4 }, "id": 8, - "interval": null, - "isNew": true, "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "options": { + "fieldOptions": { + "calcs": [ + "lastNotNull" + ], + "defaults": { + "mappings": [ + { + "id": 0, + "op": "=", + "text": "N/A", + "type": 1, + "value": "null" + } + ], + "max": 100, + "min": 0, + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 0 + } + ] + }, + "unit": "percent" + }, + "overrides": [], + "values": false }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "options": {}, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "span": 1, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": false }, - "tableColumn": "", + "pluginVersion": "6.7.3", + "span": 1, "targets": [ { "expr": "sum(avg(scylla_manager_backup_percent_progress{cluster=~\"[[cluster]]\", instance=~\"$instance\", keyspace=~\"$keyspace\"}) by (task) * sum(scylla_manager_task_active_count{cluster=~\"[[cluster]]\", type=\"backup\"}) by (task))", @@ -700,19 +668,9 @@ "refId": "A" } ], - "thresholds": "0,0", - "title": "Backup progress", + "title": "Backup", "transparent": true, - "type": "singlestat", - "valueFontSize": "150%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" + "type": "gauge" }, { "class": "text_panel",