"Add the generated dashboard"

scylladb · Feb 12, 2024 · 9eb7118 · 9eb7118
1 parent b1dd97a
commit 9eb7118
Show file tree

Hide file tree

Showing 59 changed files with 394 additions and 388 deletions.
diff --git a/grafana/build/manager_3.0/scylla-manager.3.0.json b/grafana/build/manager_3.0/scylla-manager.3.0.json
@@ -316,7 +316,7 @@
                             }
                         ]
                     },
-                    "unit": "percentunit"
+                    "unit": "percent"
                 },
                 "overrides": []
             },
@@ -343,7 +343,7 @@
             "span": 2,
             "targets": [
                 {
-                    "expr": "manager:repair_progress{cluster=~\"[[cluster]]\"}",
+                    "expr": "sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() manager:repair_progress{cluster=~\"[[cluster]]\"}*100",
                     "format": "time_series",
                     "intervalFactor": 2,
                     "refId": "A"
@@ -638,7 +638,7 @@
             "type": "stat"
         },
         {
-            "class": "percentunit_panel",
+            "class": "percent_panel",
             "datasource": "prometheus",
             "editable": true,
             "error": false,
@@ -651,7 +651,6 @@
                     "custom": {
                         "axisLabel": "",
                         "axisPlacement": "auto",
-                        "axisSoftMax": 1,
                         "axisSoftMin": 0,
                         "barAlignment": 0,
                         "class": "fieldConfig_defaults_custom",
@@ -680,7 +679,7 @@
                         }
                     },
                     "mappings": [],
-                    "unit": "percentunit"
+                    "unit": "percent"
                 },
                 "overrides": []
             },
@@ -704,10 +703,13 @@
                     "sort": "desc"
                 }
             },
+            "seriesOverrides": [
+                {}
+            ],
             "span": 2,
             "targets": [
                 {
-                    "expr": "manager:repair_progress{cluster=~\"[[cluster]]\"}",
+                    "expr": "sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() manager:repair_progress{cluster=~\"[[cluster]]\"}*100",
                     "format": "time_series",
                     "intervalFactor": 2,
                     "refId": "A"
@@ -1318,7 +1320,7 @@
             "links": [],
             "mode": "html",
             "options": {
-                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.1</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
+                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.2</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
                 "mode": "html"
             },
             "span": 12,
@@ -1523,8 +1525,8 @@
                 "allValue": null,
                 "class": "monitor_version_var",
                 "current": {
-                    "text": "4.6.1",
-                    "value": "4.6.1"
+                    "text": "4.6.2",
+                    "value": "4.6.2"
                 },
                 "error": null,
                 "hide": 2,
@@ -1535,11 +1537,11 @@
                 "options": [
                     {
                         "selected": true,
-                        "text": "4.6.1",
-                        "value": "4.6.1"
+                        "text": "4.6.2",
+                        "value": "4.6.2"
                     }
                 ],
-                "query": "4.6.1",
+                "query": "4.6.2",
                 "skipUrlSync": false,
                 "type": "custom"
             }

diff --git a/grafana/build/manager_3.1/scylla-manager.3.1.json b/grafana/build/manager_3.1/scylla-manager.3.1.json
@@ -316,7 +316,7 @@
                             }
                         ]
                     },
-                    "unit": "percentunit"
+                    "unit": "percent"
                 },
                 "overrides": []
             },
@@ -343,7 +343,7 @@
             "span": 2,
             "targets": [
                 {
-                    "expr": "manager:repair_progress{cluster=~\"[[cluster]]\"}",
+                    "expr": "sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() manager:repair_progress{cluster=~\"[[cluster]]\"}*100",
                     "format": "time_series",
                     "intervalFactor": 2,
                     "refId": "A"
@@ -638,7 +638,7 @@
             "type": "stat"
         },
         {
-            "class": "percentunit_panel",
+            "class": "percent_panel",
             "datasource": "prometheus",
             "editable": true,
             "error": false,
@@ -651,7 +651,6 @@
                     "custom": {
                         "axisLabel": "",
                         "axisPlacement": "auto",
-                        "axisSoftMax": 1,
                         "axisSoftMin": 0,
                         "barAlignment": 0,
                         "class": "fieldConfig_defaults_custom",
@@ -680,7 +679,7 @@
                         }
                     },
                     "mappings": [],
-                    "unit": "percentunit"
+                    "unit": "percent"
                 },
                 "overrides": []
             },
@@ -704,10 +703,13 @@
                     "sort": "desc"
                 }
             },
+            "seriesOverrides": [
+                {}
+            ],
             "span": 2,
             "targets": [
                 {
-                    "expr": "manager:repair_progress{cluster=~\"[[cluster]]\"}",
+                    "expr": "sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() manager:repair_progress{cluster=~\"[[cluster]]\"}*100",
                     "format": "time_series",
                     "intervalFactor": 2,
                     "refId": "A"
@@ -1366,7 +1368,7 @@
             "links": [],
             "mode": "html",
             "options": {
-                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.1</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
+                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.2</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
                 "mode": "html"
             },
             "span": 12,
@@ -1571,8 +1573,8 @@
                 "allValue": null,
                 "class": "monitor_version_var",
                 "current": {
-                    "text": "4.6.1",
-                    "value": "4.6.1"
+                    "text": "4.6.2",
+                    "value": "4.6.2"
                 },
                 "error": null,
                 "hide": 2,
@@ -1583,11 +1585,11 @@
                 "options": [
                     {
                         "selected": true,
-                        "text": "4.6.1",
-                        "value": "4.6.1"
+                        "text": "4.6.2",
+                        "value": "4.6.2"
                     }
                 ],
-                "query": "4.6.1",
+                "query": "4.6.2",
                 "skipUrlSync": false,
                 "type": "custom"
             }

diff --git a/grafana/build/manager_3.2/scylla-manager.3.2.json b/grafana/build/manager_3.2/scylla-manager.3.2.json
@@ -316,7 +316,7 @@
                             }
                         ]
                     },
-                    "unit": "percentunit"
+                    "unit": "percent"
                 },
                 "overrides": []
             },
@@ -343,7 +343,7 @@
             "span": 2,
             "targets": [
                 {
-                    "expr": "manager:repair_progress{cluster=~\"[[cluster]]\"}",
+                    "expr": "sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() manager:repair_progress{cluster=~\"[[cluster]]\"}*100",
                     "format": "time_series",
                     "intervalFactor": 2,
                     "refId": "A"
@@ -638,7 +638,7 @@
             "type": "stat"
         },
         {
-            "class": "percentunit_panel",
+            "class": "percent_panel",
             "datasource": "prometheus",
             "editable": true,
             "error": false,
@@ -651,7 +651,6 @@
                     "custom": {
                         "axisLabel": "",
                         "axisPlacement": "auto",
-                        "axisSoftMax": 1,
                         "axisSoftMin": 0,
                         "barAlignment": 0,
                         "class": "fieldConfig_defaults_custom",
@@ -680,7 +679,7 @@
                         }
                     },
                     "mappings": [],
-                    "unit": "percentunit"
+                    "unit": "percent"
                 },
                 "overrides": []
             },
@@ -704,10 +703,13 @@
                     "sort": "desc"
                 }
             },
+            "seriesOverrides": [
+                {}
+            ],
             "span": 2,
             "targets": [
                 {
-                    "expr": "manager:repair_progress{cluster=~\"[[cluster]]\"}",
+                    "expr": "sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() manager:repair_progress{cluster=~\"[[cluster]]\"}*100",
                     "format": "time_series",
                     "intervalFactor": 2,
                     "refId": "A"
@@ -1449,7 +1451,7 @@
             "links": [],
             "mode": "html",
             "options": {
-                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.1</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
+                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.2</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
                 "mode": "html"
             },
             "span": 12,
@@ -1654,8 +1656,8 @@
                 "allValue": null,
                 "class": "monitor_version_var",
                 "current": {
-                    "text": "4.6.1",
-                    "value": "4.6.1"
+                    "text": "4.6.2",
+                    "value": "4.6.2"
                 },
                 "error": null,
                 "hide": 2,
@@ -1666,11 +1668,11 @@
                 "options": [
                     {
                         "selected": true,
-                        "text": "4.6.1",
-                        "value": "4.6.1"
+                        "text": "4.6.2",
+                        "value": "4.6.2"
                     }
                 ],
-                "query": "4.6.1",
+                "query": "4.6.2",
                 "skipUrlSync": false,
                 "type": "custom"
             }

diff --git a/grafana/build/ver_2021.1/alternator.2021.1.json b/grafana/build/ver_2021.1/alternator.2021.1.json
@@ -4261,7 +4261,7 @@
             "links": [],
             "mode": "html",
             "options": {
-                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.1</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
+                "content": "<div style=\"color:#5780C1; border-bottom: 0px solid #5780C1;\">Scylla Monitoring version - 4.6.2</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1600&height=-1\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
                 "mode": "html"
             },
             "span": 12,
@@ -4572,8 +4572,8 @@
                 "allValue": null,
                 "class": "monitor_version_var",
                 "current": {
-                    "text": "4.6.1",
-                    "value": "4.6.1"
+                    "text": "4.6.2",
+                    "value": "4.6.2"
                 },
                 "error": null,
                 "hide": 2,
@@ -4584,11 +4584,11 @@
                 "options": [
                     {
                         "selected": true,
-                        "text": "4.6.1",
-                        "value": "4.6.1"
+                        "text": "4.6.2",
+                        "value": "4.6.2"
                     }
                 ],
-                "query": "4.6.1",
+                "query": "4.6.2",
                 "skipUrlSync": false,
                 "type": "custom"
             },