From 9eb71186b8e775b8cacd87f2161ff92d39deb9e3 Mon Sep 17 00:00:00 2001 From: Amnon Heiman Date: Mon, 12 Feb 2024 15:42:53 +0200 Subject: [PATCH] "Add the generated dashboard" --- .../build/manager_3.0/scylla-manager.3.0.json | 26 ++++++++++--------- .../build/manager_3.1/scylla-manager.3.1.json | 26 ++++++++++--------- .../build/manager_3.2/scylla-manager.3.2.json | 26 ++++++++++--------- .../build/ver_2021.1/alternator.2021.1.json | 12 ++++----- .../ver_2021.1/scylla-advanced.2021.1.json | 14 +++++----- .../build/ver_2021.1/scylla-cql.2021.1.json | 12 ++++----- .../ver_2021.1/scylla-detailed.2021.1.json | 12 ++++----- .../build/ver_2021.1/scylla-ks.2021.1.json | 12 ++++----- .../build/ver_2021.1/scylla-os.2021.1.json | 12 ++++----- .../ver_2021.1/scylla-overview.2021.1.json | 14 +++++----- .../build/ver_2022.1/alternator.2022.1.json | 12 ++++----- .../ver_2022.1/scylla-advanced.2022.1.json | 14 +++++----- .../build/ver_2022.1/scylla-cql.2022.1.json | 12 ++++----- .../ver_2022.1/scylla-detailed.2022.1.json | 12 ++++----- .../build/ver_2022.1/scylla-ks.2022.1.json | 12 ++++----- .../build/ver_2022.1/scylla-os.2022.1.json | 12 ++++----- .../ver_2022.1/scylla-overview.2022.1.json | 14 +++++----- .../build/ver_2022.2/alternator.2022.2.json | 12 ++++----- .../ver_2022.2/scylla-advanced.2022.2.json | 14 +++++----- .../build/ver_2022.2/scylla-cql.2022.2.json | 12 ++++----- .../ver_2022.2/scylla-detailed.2022.2.json | 12 ++++----- .../build/ver_2022.2/scylla-ks.2022.2.json | 12 ++++----- .../build/ver_2022.2/scylla-os.2022.2.json | 12 ++++----- .../ver_2022.2/scylla-overview.2022.2.json | 14 +++++----- .../build/ver_2023.1/alternator.2023.1.json | 12 ++++----- .../ver_2023.1/scylla-advanced.2023.1.json | 14 +++++----- .../build/ver_2023.1/scylla-cql.2023.1.json | 12 ++++----- .../ver_2023.1/scylla-detailed.2023.1.json | 12 ++++----- .../build/ver_2023.1/scylla-ks.2023.1.json | 12 ++++----- .../build/ver_2023.1/scylla-os.2023.1.json | 12 ++++----- .../ver_2023.1/scylla-overview.2023.1.json | 14 +++++----- .../build/ver_2024.1/alternator.2024.1.json | 12 ++++----- .../ver_2024.1/scylla-advanced.2024.1.json | 14 +++++----- .../build/ver_2024.1/scylla-cql.2024.1.json | 12 ++++----- .../ver_2024.1/scylla-detailed.2024.1.json | 12 ++++----- .../build/ver_2024.1/scylla-ks.2024.1.json | 12 ++++----- .../build/ver_2024.1/scylla-os.2024.1.json | 12 ++++----- .../ver_2024.1/scylla-overview.2024.1.json | 14 +++++----- grafana/build/ver_5.2/alternator.5.2.json | 12 ++++----- .../build/ver_5.2/scylla-advanced.5.2.json | 14 +++++----- grafana/build/ver_5.2/scylla-cql.5.2.json | 12 ++++----- .../build/ver_5.2/scylla-detailed.5.2.json | 12 ++++----- grafana/build/ver_5.2/scylla-ks.5.2.json | 12 ++++----- grafana/build/ver_5.2/scylla-os.5.2.json | 12 ++++----- .../build/ver_5.2/scylla-overview.5.2.json | 14 +++++----- grafana/build/ver_5.4/alternator.5.4.json | 12 ++++----- .../build/ver_5.4/scylla-advanced.5.4.json | 14 +++++----- grafana/build/ver_5.4/scylla-cql.5.4.json | 12 ++++----- .../build/ver_5.4/scylla-detailed.5.4.json | 12 ++++----- grafana/build/ver_5.4/scylla-ks.5.4.json | 12 ++++----- grafana/build/ver_5.4/scylla-os.5.4.json | 12 ++++----- .../build/ver_5.4/scylla-overview.5.4.json | 14 +++++----- .../build/ver_master/alternator.master.json | 12 ++++----- .../ver_master/scylla-advanced.master.json | 14 +++++----- .../build/ver_master/scylla-cql.master.json | 12 ++++----- .../ver_master/scylla-detailed.master.json | 12 ++++----- .../build/ver_master/scylla-ks.master.json | 12 ++++----- .../build/ver_master/scylla-os.master.json | 12 ++++----- .../ver_master/scylla-overview.master.json | 14 +++++----- 59 files changed, 394 insertions(+), 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 index bfb3205160..9ca0249bc0 100644 --- 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": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "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 index 93a0b2a78d..3ec67cfdc5 100755 --- 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": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "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 index 0740b38018..7803661761 100644 --- 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": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "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 index 5cd55c7fb7..6104c14089 100644 --- 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": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "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" }, diff --git a/grafana/build/ver_2021.1/scylla-advanced.2021.1.json b/grafana/build/ver_2021.1/scylla-advanced.2021.1.json index f53df3c6c0..7bca7cf27c 100644 --- a/grafana/build/ver_2021.1/scylla-advanced.2021.1.json +++ b/grafana/build/ver_2021.1/scylla-advanced.2021.1.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3769,7 +3769,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4090,8 +4090,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, @@ -4102,11 +4102,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/scylla-cql.2021.1.json b/grafana/build/ver_2021.1/scylla-cql.2021.1.json index b973ac6477..dafd8640ef 100644 --- a/grafana/build/ver_2021.1/scylla-cql.2021.1.json +++ b/grafana/build/ver_2021.1/scylla-cql.2021.1.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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/scylla-detailed.2021.1.json b/grafana/build/ver_2021.1/scylla-detailed.2021.1.json index 460222dd7e..5568ce3cc2 100644 --- a/grafana/build/ver_2021.1/scylla-detailed.2021.1.json +++ b/grafana/build/ver_2021.1/scylla-detailed.2021.1.json @@ -9453,7 +9453,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -9749,8 +9749,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, @@ -9761,11 +9761,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/scylla-ks.2021.1.json b/grafana/build/ver_2021.1/scylla-ks.2021.1.json index a088b8edc1..18dced399c 100644 --- a/grafana/build/ver_2021.1/scylla-ks.2021.1.json +++ b/grafana/build/ver_2021.1/scylla-ks.2021.1.json @@ -1392,7 +1392,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1713,8 +1713,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, @@ -1725,11 +1725,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/scylla-os.2021.1.json b/grafana/build/ver_2021.1/scylla-os.2021.1.json index 9d531f717d..64de66be89 100644 --- a/grafana/build/ver_2021.1/scylla-os.2021.1.json +++ b/grafana/build/ver_2021.1/scylla-os.2021.1.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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/scylla-overview.2021.1.json b/grafana/build/ver_2021.1/scylla-overview.2021.1.json index ad3156524a..b8f33e5db5 100644 --- a/grafana/build/ver_2021.1/scylla-overview.2021.1.json +++ b/grafana/build/ver_2021.1/scylla-overview.2021.1.json @@ -601,7 +601,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3577,7 +3577,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -3985,8 +3985,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, @@ -3997,11 +3997,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_2022.1/alternator.2022.1.json b/grafana/build/ver_2022.1/alternator.2022.1.json index ce8e3fa60c..0fe63394ad 100644 --- a/grafana/build/ver_2022.1/alternator.2022.1.json +++ b/grafana/build/ver_2022.1/alternator.2022.1.json @@ -4261,7 +4261,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "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" }, diff --git a/grafana/build/ver_2022.1/scylla-advanced.2022.1.json b/grafana/build/ver_2022.1/scylla-advanced.2022.1.json index 3b7fff9be0..d012b596b5 100644 --- a/grafana/build/ver_2022.1/scylla-advanced.2022.1.json +++ b/grafana/build/ver_2022.1/scylla-advanced.2022.1.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3769,7 +3769,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4090,8 +4090,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, @@ -4102,11 +4102,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_2022.1/scylla-cql.2022.1.json b/grafana/build/ver_2022.1/scylla-cql.2022.1.json index f544367e10..1553e9b3ec 100644 --- a/grafana/build/ver_2022.1/scylla-cql.2022.1.json +++ b/grafana/build/ver_2022.1/scylla-cql.2022.1.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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_2022.1/scylla-detailed.2022.1.json b/grafana/build/ver_2022.1/scylla-detailed.2022.1.json index 2da4a059e2..971c05e025 100644 --- a/grafana/build/ver_2022.1/scylla-detailed.2022.1.json +++ b/grafana/build/ver_2022.1/scylla-detailed.2022.1.json @@ -9963,7 +9963,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -10295,8 +10295,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, @@ -10307,11 +10307,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_2022.1/scylla-ks.2022.1.json b/grafana/build/ver_2022.1/scylla-ks.2022.1.json index d4a2bccded..abe671de45 100644 --- a/grafana/build/ver_2022.1/scylla-ks.2022.1.json +++ b/grafana/build/ver_2022.1/scylla-ks.2022.1.json @@ -1392,7 +1392,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1713,8 +1713,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, @@ -1725,11 +1725,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_2022.1/scylla-os.2022.1.json b/grafana/build/ver_2022.1/scylla-os.2022.1.json index f999a0f20b..a2914c80b0 100644 --- a/grafana/build/ver_2022.1/scylla-os.2022.1.json +++ b/grafana/build/ver_2022.1/scylla-os.2022.1.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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_2022.1/scylla-overview.2022.1.json b/grafana/build/ver_2022.1/scylla-overview.2022.1.json index 70da672fdc..a544619271 100644 --- a/grafana/build/ver_2022.1/scylla-overview.2022.1.json +++ b/grafana/build/ver_2022.1/scylla-overview.2022.1.json @@ -601,7 +601,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3577,7 +3577,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -3985,8 +3985,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, @@ -3997,11 +3997,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_2022.2/alternator.2022.2.json b/grafana/build/ver_2022.2/alternator.2022.2.json index 43351d97ee..bb8c93f788 100644 --- a/grafana/build/ver_2022.2/alternator.2022.2.json +++ b/grafana/build/ver_2022.2/alternator.2022.2.json @@ -4368,7 +4368,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4679,8 +4679,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, @@ -4691,11 +4691,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_2022.2/scylla-advanced.2022.2.json b/grafana/build/ver_2022.2/scylla-advanced.2022.2.json index 21b403bab2..a8b981c12e 100644 --- a/grafana/build/ver_2022.2/scylla-advanced.2022.2.json +++ b/grafana/build/ver_2022.2/scylla-advanced.2022.2.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3769,7 +3769,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4090,8 +4090,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, @@ -4102,11 +4102,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_2022.2/scylla-cql.2022.2.json b/grafana/build/ver_2022.2/scylla-cql.2022.2.json index fc114b585c..877875e9a0 100644 --- a/grafana/build/ver_2022.2/scylla-cql.2022.2.json +++ b/grafana/build/ver_2022.2/scylla-cql.2022.2.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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_2022.2/scylla-detailed.2022.2.json b/grafana/build/ver_2022.2/scylla-detailed.2022.2.json index 9cc054d4b3..6623fb2e6c 100644 --- a/grafana/build/ver_2022.2/scylla-detailed.2022.2.json +++ b/grafana/build/ver_2022.2/scylla-detailed.2022.2.json @@ -9963,7 +9963,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -10295,8 +10295,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, @@ -10307,11 +10307,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_2022.2/scylla-ks.2022.2.json b/grafana/build/ver_2022.2/scylla-ks.2022.2.json index 9196ba9aa6..e7abe7a9db 100644 --- a/grafana/build/ver_2022.2/scylla-ks.2022.2.json +++ b/grafana/build/ver_2022.2/scylla-ks.2022.2.json @@ -1392,7 +1392,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1713,8 +1713,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, @@ -1725,11 +1725,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_2022.2/scylla-os.2022.2.json b/grafana/build/ver_2022.2/scylla-os.2022.2.json index fe4b5b52bf..ac28713460 100644 --- a/grafana/build/ver_2022.2/scylla-os.2022.2.json +++ b/grafana/build/ver_2022.2/scylla-os.2022.2.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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_2022.2/scylla-overview.2022.2.json b/grafana/build/ver_2022.2/scylla-overview.2022.2.json index a9626d1bf7..9d1db0e253 100644 --- a/grafana/build/ver_2022.2/scylla-overview.2022.2.json +++ b/grafana/build/ver_2022.2/scylla-overview.2022.2.json @@ -601,7 +601,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3630,7 +3630,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4038,8 +4038,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, @@ -4050,11 +4050,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_2023.1/alternator.2023.1.json b/grafana/build/ver_2023.1/alternator.2023.1.json index e5c791e323..394b10ae86 100755 --- a/grafana/build/ver_2023.1/alternator.2023.1.json +++ b/grafana/build/ver_2023.1/alternator.2023.1.json @@ -4432,7 +4432,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4743,8 +4743,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, @@ -4755,11 +4755,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_2023.1/scylla-advanced.2023.1.json b/grafana/build/ver_2023.1/scylla-advanced.2023.1.json index 049d638120..a67d6e07c9 100755 --- a/grafana/build/ver_2023.1/scylla-advanced.2023.1.json +++ b/grafana/build/ver_2023.1/scylla-advanced.2023.1.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3856,7 +3856,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4177,8 +4177,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, @@ -4189,11 +4189,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_2023.1/scylla-cql.2023.1.json b/grafana/build/ver_2023.1/scylla-cql.2023.1.json index 96e2748197..4a9810d281 100755 --- a/grafana/build/ver_2023.1/scylla-cql.2023.1.json +++ b/grafana/build/ver_2023.1/scylla-cql.2023.1.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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_2023.1/scylla-detailed.2023.1.json b/grafana/build/ver_2023.1/scylla-detailed.2023.1.json index 0117e99201..1e42c8db04 100755 --- a/grafana/build/ver_2023.1/scylla-detailed.2023.1.json +++ b/grafana/build/ver_2023.1/scylla-detailed.2023.1.json @@ -9982,7 +9982,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -10314,8 +10314,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, @@ -10326,11 +10326,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_2023.1/scylla-ks.2023.1.json b/grafana/build/ver_2023.1/scylla-ks.2023.1.json index fde0dd0a5e..070238c787 100755 --- a/grafana/build/ver_2023.1/scylla-ks.2023.1.json +++ b/grafana/build/ver_2023.1/scylla-ks.2023.1.json @@ -1411,7 +1411,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1732,8 +1732,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, @@ -1744,11 +1744,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_2023.1/scylla-os.2023.1.json b/grafana/build/ver_2023.1/scylla-os.2023.1.json index 16a35eef65..aea3e33b73 100755 --- a/grafana/build/ver_2023.1/scylla-os.2023.1.json +++ b/grafana/build/ver_2023.1/scylla-os.2023.1.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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_2023.1/scylla-overview.2023.1.json b/grafana/build/ver_2023.1/scylla-overview.2023.1.json index 030d760064..46f9877aea 100755 --- a/grafana/build/ver_2023.1/scylla-overview.2023.1.json +++ b/grafana/build/ver_2023.1/scylla-overview.2023.1.json @@ -620,7 +620,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3713,7 +3713,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4121,8 +4121,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, @@ -4133,11 +4133,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_2024.1/alternator.2024.1.json b/grafana/build/ver_2024.1/alternator.2024.1.json index f02b933de7..c40f6d2c10 100644 --- a/grafana/build/ver_2024.1/alternator.2024.1.json +++ b/grafana/build/ver_2024.1/alternator.2024.1.json @@ -4432,7 +4432,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4743,8 +4743,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, @@ -4755,11 +4755,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_2024.1/scylla-advanced.2024.1.json b/grafana/build/ver_2024.1/scylla-advanced.2024.1.json index bbb8f89653..750eab4561 100644 --- a/grafana/build/ver_2024.1/scylla-advanced.2024.1.json +++ b/grafana/build/ver_2024.1/scylla-advanced.2024.1.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3857,7 +3857,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4214,8 +4214,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, @@ -4226,11 +4226,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_2024.1/scylla-cql.2024.1.json b/grafana/build/ver_2024.1/scylla-cql.2024.1.json index bd08f405ed..159f4d7f7a 100644 --- a/grafana/build/ver_2024.1/scylla-cql.2024.1.json +++ b/grafana/build/ver_2024.1/scylla-cql.2024.1.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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_2024.1/scylla-detailed.2024.1.json b/grafana/build/ver_2024.1/scylla-detailed.2024.1.json index f7ed82f333..0949c774e2 100644 --- a/grafana/build/ver_2024.1/scylla-detailed.2024.1.json +++ b/grafana/build/ver_2024.1/scylla-detailed.2024.1.json @@ -9982,7 +9982,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -10314,8 +10314,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, @@ -10326,11 +10326,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_2024.1/scylla-ks.2024.1.json b/grafana/build/ver_2024.1/scylla-ks.2024.1.json index 26bb532dd1..5508209115 100644 --- a/grafana/build/ver_2024.1/scylla-ks.2024.1.json +++ b/grafana/build/ver_2024.1/scylla-ks.2024.1.json @@ -1411,7 +1411,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1732,8 +1732,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, @@ -1744,11 +1744,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_2024.1/scylla-os.2024.1.json b/grafana/build/ver_2024.1/scylla-os.2024.1.json index b903bf1b5b..8946d31537 100644 --- a/grafana/build/ver_2024.1/scylla-os.2024.1.json +++ b/grafana/build/ver_2024.1/scylla-os.2024.1.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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_2024.1/scylla-overview.2024.1.json b/grafana/build/ver_2024.1/scylla-overview.2024.1.json index 581b411795..0db2d24b71 100644 --- a/grafana/build/ver_2024.1/scylla-overview.2024.1.json +++ b/grafana/build/ver_2024.1/scylla-overview.2024.1.json @@ -620,7 +620,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3713,7 +3713,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4121,8 +4121,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, @@ -4133,11 +4133,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_5.2/alternator.5.2.json b/grafana/build/ver_5.2/alternator.5.2.json index 3fda291edc..10cf317772 100644 --- a/grafana/build/ver_5.2/alternator.5.2.json +++ b/grafana/build/ver_5.2/alternator.5.2.json @@ -4432,7 +4432,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4743,8 +4743,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, @@ -4755,11 +4755,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_5.2/scylla-advanced.5.2.json b/grafana/build/ver_5.2/scylla-advanced.5.2.json index 5bba583c0b..a3ca73a538 100644 --- a/grafana/build/ver_5.2/scylla-advanced.5.2.json +++ b/grafana/build/ver_5.2/scylla-advanced.5.2.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3769,7 +3769,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4090,8 +4090,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, @@ -4102,11 +4102,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_5.2/scylla-cql.5.2.json b/grafana/build/ver_5.2/scylla-cql.5.2.json index 59f2badaf0..fb39d0b636 100644 --- a/grafana/build/ver_5.2/scylla-cql.5.2.json +++ b/grafana/build/ver_5.2/scylla-cql.5.2.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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_5.2/scylla-detailed.5.2.json b/grafana/build/ver_5.2/scylla-detailed.5.2.json index a21609aa34..33fd9f0ec0 100644 --- a/grafana/build/ver_5.2/scylla-detailed.5.2.json +++ b/grafana/build/ver_5.2/scylla-detailed.5.2.json @@ -9472,7 +9472,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -9768,8 +9768,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, @@ -9780,11 +9780,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_5.2/scylla-ks.5.2.json b/grafana/build/ver_5.2/scylla-ks.5.2.json index 581593e17d..3b059b52c7 100644 --- a/grafana/build/ver_5.2/scylla-ks.5.2.json +++ b/grafana/build/ver_5.2/scylla-ks.5.2.json @@ -1411,7 +1411,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1732,8 +1732,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, @@ -1744,11 +1744,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_5.2/scylla-os.5.2.json b/grafana/build/ver_5.2/scylla-os.5.2.json index 7a52c11fe5..fb3a96df68 100644 --- a/grafana/build/ver_5.2/scylla-os.5.2.json +++ b/grafana/build/ver_5.2/scylla-os.5.2.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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_5.2/scylla-overview.5.2.json b/grafana/build/ver_5.2/scylla-overview.5.2.json index 6b022b9c13..d2ec5c2e02 100644 --- a/grafana/build/ver_5.2/scylla-overview.5.2.json +++ b/grafana/build/ver_5.2/scylla-overview.5.2.json @@ -620,7 +620,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3715,7 +3715,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4123,8 +4123,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, @@ -4135,11 +4135,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_5.4/alternator.5.4.json b/grafana/build/ver_5.4/alternator.5.4.json index 47043db2ea..fe7f636e32 100755 --- a/grafana/build/ver_5.4/alternator.5.4.json +++ b/grafana/build/ver_5.4/alternator.5.4.json @@ -4432,7 +4432,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4743,8 +4743,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, @@ -4755,11 +4755,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_5.4/scylla-advanced.5.4.json b/grafana/build/ver_5.4/scylla-advanced.5.4.json index 364580edae..daa63c8d54 100755 --- a/grafana/build/ver_5.4/scylla-advanced.5.4.json +++ b/grafana/build/ver_5.4/scylla-advanced.5.4.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3857,7 +3857,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4214,8 +4214,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, @@ -4226,11 +4226,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_5.4/scylla-cql.5.4.json b/grafana/build/ver_5.4/scylla-cql.5.4.json index 6b0736a251..c72c4ab4f0 100755 --- a/grafana/build/ver_5.4/scylla-cql.5.4.json +++ b/grafana/build/ver_5.4/scylla-cql.5.4.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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_5.4/scylla-detailed.5.4.json b/grafana/build/ver_5.4/scylla-detailed.5.4.json index 174769305f..de9f8e2f81 100755 --- a/grafana/build/ver_5.4/scylla-detailed.5.4.json +++ b/grafana/build/ver_5.4/scylla-detailed.5.4.json @@ -9982,7 +9982,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -10314,8 +10314,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, @@ -10326,11 +10326,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_5.4/scylla-ks.5.4.json b/grafana/build/ver_5.4/scylla-ks.5.4.json index 4235514d9f..697a37c84c 100755 --- a/grafana/build/ver_5.4/scylla-ks.5.4.json +++ b/grafana/build/ver_5.4/scylla-ks.5.4.json @@ -1411,7 +1411,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1732,8 +1732,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, @@ -1744,11 +1744,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_5.4/scylla-os.5.4.json b/grafana/build/ver_5.4/scylla-os.5.4.json index ed52946135..8d73f30bb3 100755 --- a/grafana/build/ver_5.4/scylla-os.5.4.json +++ b/grafana/build/ver_5.4/scylla-os.5.4.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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_5.4/scylla-overview.5.4.json b/grafana/build/ver_5.4/scylla-overview.5.4.json index f52812ff3f..fe35bdeb8a 100755 --- a/grafana/build/ver_5.4/scylla-overview.5.4.json +++ b/grafana/build/ver_5.4/scylla-overview.5.4.json @@ -620,7 +620,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3715,7 +3715,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4123,8 +4123,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, @@ -4135,11 +4135,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_master/alternator.master.json b/grafana/build/ver_master/alternator.master.json index d4ddaf182c..5f581c4065 100644 --- a/grafana/build/ver_master/alternator.master.json +++ b/grafana/build/ver_master/alternator.master.json @@ -4432,7 +4432,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4743,8 +4743,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, @@ -4755,11 +4755,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_master/scylla-advanced.master.json b/grafana/build/ver_master/scylla-advanced.master.json index a5bab90edd..16cfff18a9 100644 --- a/grafana/build/ver_master/scylla-advanced.master.json +++ b/grafana/build/ver_master/scylla-advanced.master.json @@ -507,7 +507,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3857,7 +3857,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4214,8 +4214,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, @@ -4226,11 +4226,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_master/scylla-cql.master.json b/grafana/build/ver_master/scylla-cql.master.json index 4a9dfa04e6..a91b1c79e7 100644 --- a/grafana/build/ver_master/scylla-cql.master.json +++ b/grafana/build/ver_master/scylla-cql.master.json @@ -4412,7 +4412,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4647,8 +4647,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, @@ -4659,11 +4659,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_master/scylla-detailed.master.json b/grafana/build/ver_master/scylla-detailed.master.json index 717ef2493c..ae1347d388 100644 --- a/grafana/build/ver_master/scylla-detailed.master.json +++ b/grafana/build/ver_master/scylla-detailed.master.json @@ -9982,7 +9982,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -10314,8 +10314,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, @@ -10326,11 +10326,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_master/scylla-ks.master.json b/grafana/build/ver_master/scylla-ks.master.json index b67a288434..ed7f4cfbbb 100644 --- a/grafana/build/ver_master/scylla-ks.master.json +++ b/grafana/build/ver_master/scylla-ks.master.json @@ -1411,7 +1411,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -1732,8 +1732,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, @@ -1744,11 +1744,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_master/scylla-os.master.json b/grafana/build/ver_master/scylla-os.master.json index 851a9f03f6..be215430c6 100644 --- a/grafana/build/ver_master/scylla-os.master.json +++ b/grafana/build/ver_master/scylla-os.master.json @@ -1885,7 +1885,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -2140,8 +2140,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, @@ -2152,11 +2152,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_master/scylla-overview.master.json b/grafana/build/ver_master/scylla-overview.master.json index baed338f40..c62c7af667 100644 --- a/grafana/build/ver_master/scylla-overview.master.json +++ b/grafana/build/ver_master/scylla-overview.master.json @@ -620,7 +620,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", + "expr": "(sum(scylla_manager_repair_progress{cluster=~\"$cluster|$^\", job=\"scylla_manager\"}) or on() sum(avg(scylla_manager_repair_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"repair\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0)) + (sum(avg(scylla_manager_backup_percent_progress{cluster=~\"$cluster|$^\"}) by (task) * sum(scylla_manager_task_active_count{type=\"backup\",cluster=~\"$cluster|$^\"}) by (task)) or on () vector(0))", "instant": true, "interval": "", "legendFormat": "", @@ -3715,7 +3715,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - 4.6.1
\n    
", + "content": "
Scylla Monitoring version - 4.6.2
\n    
", "mode": "html" }, "span": 12, @@ -4123,8 +4123,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, @@ -4135,11 +4135,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" }