From 44bf230a8758575e7e75d947ded5906db5ceb7dc Mon Sep 17 00:00:00 2001 From: Amnon Heiman Date: Mon, 8 Feb 2021 13:04:11 +0200 Subject: [PATCH] add the generated dashboard --- .../build/manager_2.2/scylla-manager.2.2.json | 12 +- .../ver_2019.1/scylla-advanced.2019.1.json | 34 ++- .../build/ver_2019.1/scylla-cql.2019.1.json | 12 +- .../ver_2019.1/scylla-detailed.2019.1.json | 12 +- .../build/ver_2019.1/scylla-os.2019.1.json | 12 +- .../ver_2019.1/scylla-overview.2019.1.json | 34 ++- .../build/ver_2020.1/alternator.2020.1.json | 12 +- .../ver_2020.1/scylla-advanced.2020.1.json | 34 ++- .../build/ver_2020.1/scylla-cql.2020.1.json | 12 +- .../ver_2020.1/scylla-detailed.2020.1.json | 12 +- .../build/ver_2020.1/scylla-os.2020.1.json | 12 +- .../ver_2020.1/scylla-overview.2020.1.json | 30 +-- grafana/build/ver_4.1/alternator.4.1.json | 12 +- .../build/ver_4.1/scylla-advanced.4.1.json | 34 ++- grafana/build/ver_4.1/scylla-cql.4.1.json | 12 +- .../build/ver_4.1/scylla-detailed.4.1.json | 12 +- grafana/build/ver_4.1/scylla-os.4.1.json | 12 +- .../build/ver_4.1/scylla-overview.4.1.json | 30 +-- grafana/build/ver_4.2/alternator.4.2.json | 12 +- .../build/ver_4.2/scylla-advanced.4.2.json | 34 ++- grafana/build/ver_4.2/scylla-cql.4.2.json | 12 +- .../build/ver_4.2/scylla-detailed.4.2.json | 12 +- grafana/build/ver_4.2/scylla-os.4.2.json | 12 +- .../build/ver_4.2/scylla-overview.4.2.json | 30 +-- grafana/build/ver_4.3/alternator.4.3.json | 12 +- .../build/ver_4.3/scylla-advanced.4.3.json | 34 ++- grafana/build/ver_4.3/scylla-cql.4.3.json | 12 +- .../build/ver_4.3/scylla-detailed.4.3.json | 12 +- grafana/build/ver_4.3/scylla-os.4.3.json | 12 +- .../build/ver_4.3/scylla-overview.4.3.json | 30 +-- grafana/build/ver_4.4/alternator.4.4.json | 12 +- .../build/ver_4.4/scylla-advanced.4.4.json | 150 +++++------- grafana/build/ver_4.4/scylla-cql.4.4.json | 12 +- .../build/ver_4.4/scylla-detailed.4.4.json | 12 +- grafana/build/ver_4.4/scylla-os.4.4.json | 12 +- .../build/ver_4.4/scylla-overview.4.4.json | 217 +++++------------- .../build/ver_master/alternator.master.json | 12 +- .../ver_master/scylla-advanced.master.json | 30 +-- .../build/ver_master/scylla-cql.master.json | 12 +- .../ver_master/scylla-detailed.master.json | 12 +- .../build/ver_master/scylla-os.master.json | 12 +- .../ver_master/scylla-overview.master.json | 30 +-- 42 files changed, 432 insertions(+), 655 deletions(-) diff --git a/grafana/build/manager_2.2/scylla-manager.2.2.json b/grafana/build/manager_2.2/scylla-manager.2.2.json index a5e54d599..dd0f25a2d 100644 --- a/grafana/build/manager_2.2/scylla-manager.2.2.json +++ b/grafana/build/manager_2.2/scylla-manager.2.2.json @@ -1374,7 +1374,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1582,8 +1582,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1594,11 +1594,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2019.1/scylla-advanced.2019.1.json b/grafana/build/ver_2019.1/scylla-advanced.2019.1.json index 6e24984a4..ada49d365 100644 --- a/grafana/build/ver_2019.1/scylla-advanced.2019.1.json +++ b/grafana/build/ver_2019.1/scylla-advanced.2019.1.json @@ -384,7 +384,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -392,7 +392,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -400,15 +400,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -421,7 +413,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -451,7 +443,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -575,7 +567,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -701,7 +693,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -2840,7 +2832,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3172,8 +3164,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3184,11 +3176,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2019.1/scylla-cql.2019.1.json b/grafana/build/ver_2019.1/scylla-cql.2019.1.json index 0cd5943a8..55184f189 100644 --- a/grafana/build/ver_2019.1/scylla-cql.2019.1.json +++ b/grafana/build/ver_2019.1/scylla-cql.2019.1.json @@ -2998,7 +2998,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3220,8 +3220,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3232,11 +3232,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2019.1/scylla-detailed.2019.1.json b/grafana/build/ver_2019.1/scylla-detailed.2019.1.json index 49c6da8a7..428fb76c6 100644 --- a/grafana/build/ver_2019.1/scylla-detailed.2019.1.json +++ b/grafana/build/ver_2019.1/scylla-detailed.2019.1.json @@ -6218,7 +6218,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -6489,8 +6489,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -6501,11 +6501,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2019.1/scylla-os.2019.1.json b/grafana/build/ver_2019.1/scylla-os.2019.1.json index d253fcfe7..1bd2b35f2 100644 --- a/grafana/build/ver_2019.1/scylla-os.2019.1.json +++ b/grafana/build/ver_2019.1/scylla-os.2019.1.json @@ -1541,7 +1541,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1794,8 +1794,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1806,11 +1806,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2019.1/scylla-overview.2019.1.json b/grafana/build/ver_2019.1/scylla-overview.2019.1.json index d44545847..0e80f99c0 100644 --- a/grafana/build/ver_2019.1/scylla-overview.2019.1.json +++ b/grafana/build/ver_2019.1/scylla-overview.2019.1.json @@ -415,7 +415,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -423,7 +423,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -431,15 +431,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -452,7 +444,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -482,7 +474,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -606,7 +598,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -732,7 +724,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -3076,7 +3068,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3398,8 +3390,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3410,11 +3402,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2020.1/alternator.2020.1.json b/grafana/build/ver_2020.1/alternator.2020.1.json index eac54f800..a0e90a1d8 100644 --- a/grafana/build/ver_2020.1/alternator.2020.1.json +++ b/grafana/build/ver_2020.1/alternator.2020.1.json @@ -3717,7 +3717,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4028,8 +4028,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4040,11 +4040,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" }, diff --git a/grafana/build/ver_2020.1/scylla-advanced.2020.1.json b/grafana/build/ver_2020.1/scylla-advanced.2020.1.json index 30089e045..45b029095 100644 --- a/grafana/build/ver_2020.1/scylla-advanced.2020.1.json +++ b/grafana/build/ver_2020.1/scylla-advanced.2020.1.json @@ -384,7 +384,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -392,7 +392,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -400,15 +400,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -421,7 +413,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -451,7 +443,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -575,7 +567,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -701,7 +693,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -2840,7 +2832,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3172,8 +3164,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3184,11 +3176,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2020.1/scylla-cql.2020.1.json b/grafana/build/ver_2020.1/scylla-cql.2020.1.json index 44df744d7..cefeae856 100644 --- a/grafana/build/ver_2020.1/scylla-cql.2020.1.json +++ b/grafana/build/ver_2020.1/scylla-cql.2020.1.json @@ -4076,7 +4076,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4322,8 +4322,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4334,11 +4334,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2020.1/scylla-detailed.2020.1.json b/grafana/build/ver_2020.1/scylla-detailed.2020.1.json index 90e4c213b..9f8b67b94 100644 --- a/grafana/build/ver_2020.1/scylla-detailed.2020.1.json +++ b/grafana/build/ver_2020.1/scylla-detailed.2020.1.json @@ -8455,7 +8455,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -8726,8 +8726,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -8738,11 +8738,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2020.1/scylla-os.2020.1.json b/grafana/build/ver_2020.1/scylla-os.2020.1.json index a30bfd6fe..25182f1e5 100644 --- a/grafana/build/ver_2020.1/scylla-os.2020.1.json +++ b/grafana/build/ver_2020.1/scylla-os.2020.1.json @@ -1525,7 +1525,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1778,8 +1778,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1790,11 +1790,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_2020.1/scylla-overview.2020.1.json b/grafana/build/ver_2020.1/scylla-overview.2020.1.json index e4da2e624..6353aaf93 100644 --- a/grafana/build/ver_2020.1/scylla-overview.2020.1.json +++ b/grafana/build/ver_2020.1/scylla-overview.2020.1.json @@ -415,7 +415,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -423,7 +423,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -431,15 +431,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -452,7 +444,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -482,7 +474,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -3918,7 +3910,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4240,8 +4232,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4252,11 +4244,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.1/alternator.4.1.json b/grafana/build/ver_4.1/alternator.4.1.json index dc6cc6c4a..6fec28cb6 100644 --- a/grafana/build/ver_4.1/alternator.4.1.json +++ b/grafana/build/ver_4.1/alternator.4.1.json @@ -4962,7 +4962,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -5273,8 +5273,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -5285,11 +5285,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" }, diff --git a/grafana/build/ver_4.1/scylla-advanced.4.1.json b/grafana/build/ver_4.1/scylla-advanced.4.1.json index b7d33b80b..491d1f977 100644 --- a/grafana/build/ver_4.1/scylla-advanced.4.1.json +++ b/grafana/build/ver_4.1/scylla-advanced.4.1.json @@ -384,7 +384,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -392,7 +392,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -400,15 +400,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -421,7 +413,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -451,7 +443,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -575,7 +567,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -701,7 +693,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -2840,7 +2832,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3172,8 +3164,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3184,11 +3176,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.1/scylla-cql.4.1.json b/grafana/build/ver_4.1/scylla-cql.4.1.json index 7e0bd34bd..1a4aac69b 100644 --- a/grafana/build/ver_4.1/scylla-cql.4.1.json +++ b/grafana/build/ver_4.1/scylla-cql.4.1.json @@ -4076,7 +4076,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4322,8 +4322,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4334,11 +4334,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.1/scylla-detailed.4.1.json b/grafana/build/ver_4.1/scylla-detailed.4.1.json index 545df4301..97f93ddb9 100644 --- a/grafana/build/ver_4.1/scylla-detailed.4.1.json +++ b/grafana/build/ver_4.1/scylla-detailed.4.1.json @@ -8439,7 +8439,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -8710,8 +8710,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -8722,11 +8722,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.1/scylla-os.4.1.json b/grafana/build/ver_4.1/scylla-os.4.1.json index 226cb3315..5debd4554 100644 --- a/grafana/build/ver_4.1/scylla-os.4.1.json +++ b/grafana/build/ver_4.1/scylla-os.4.1.json @@ -1525,7 +1525,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1778,8 +1778,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1790,11 +1790,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.1/scylla-overview.4.1.json b/grafana/build/ver_4.1/scylla-overview.4.1.json index e75876cbe..3fca7b02c 100644 --- a/grafana/build/ver_4.1/scylla-overview.4.1.json +++ b/grafana/build/ver_4.1/scylla-overview.4.1.json @@ -399,7 +399,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -407,7 +407,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -415,15 +415,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -436,7 +428,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -466,7 +458,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -3902,7 +3894,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4224,8 +4216,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4236,11 +4228,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.2/alternator.4.2.json b/grafana/build/ver_4.2/alternator.4.2.json index 15ce0ff44..5d3a0c405 100644 --- a/grafana/build/ver_4.2/alternator.4.2.json +++ b/grafana/build/ver_4.2/alternator.4.2.json @@ -3717,7 +3717,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4028,8 +4028,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4040,11 +4040,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" }, diff --git a/grafana/build/ver_4.2/scylla-advanced.4.2.json b/grafana/build/ver_4.2/scylla-advanced.4.2.json index 66df63ebc..66acd145a 100644 --- a/grafana/build/ver_4.2/scylla-advanced.4.2.json +++ b/grafana/build/ver_4.2/scylla-advanced.4.2.json @@ -384,7 +384,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -392,7 +392,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -400,15 +400,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -421,7 +413,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -451,7 +443,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -575,7 +567,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -701,7 +693,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -2840,7 +2832,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3172,8 +3164,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3184,11 +3176,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.2/scylla-cql.4.2.json b/grafana/build/ver_4.2/scylla-cql.4.2.json index 3fbbeab52..e3f91fc9d 100644 --- a/grafana/build/ver_4.2/scylla-cql.4.2.json +++ b/grafana/build/ver_4.2/scylla-cql.4.2.json @@ -4076,7 +4076,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4322,8 +4322,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4334,11 +4334,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.2/scylla-detailed.4.2.json b/grafana/build/ver_4.2/scylla-detailed.4.2.json index 5ee43bf2f..d7b10fd19 100644 --- a/grafana/build/ver_4.2/scylla-detailed.4.2.json +++ b/grafana/build/ver_4.2/scylla-detailed.4.2.json @@ -8795,7 +8795,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -9066,8 +9066,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -9078,11 +9078,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.2/scylla-os.4.2.json b/grafana/build/ver_4.2/scylla-os.4.2.json index 4c1810346..3569e10b6 100644 --- a/grafana/build/ver_4.2/scylla-os.4.2.json +++ b/grafana/build/ver_4.2/scylla-os.4.2.json @@ -1525,7 +1525,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1778,8 +1778,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1790,11 +1790,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.2/scylla-overview.4.2.json b/grafana/build/ver_4.2/scylla-overview.4.2.json index a8ff7ce9a..c034d78cd 100644 --- a/grafana/build/ver_4.2/scylla-overview.4.2.json +++ b/grafana/build/ver_4.2/scylla-overview.4.2.json @@ -415,7 +415,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -423,7 +423,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -431,15 +431,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -452,7 +444,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -482,7 +474,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -3918,7 +3910,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4240,8 +4232,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4252,11 +4244,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.3/alternator.4.3.json b/grafana/build/ver_4.3/alternator.4.3.json index 32f995bd6..8ca9c2f40 100644 --- a/grafana/build/ver_4.3/alternator.4.3.json +++ b/grafana/build/ver_4.3/alternator.4.3.json @@ -4640,7 +4640,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4951,8 +4951,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4963,11 +4963,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" }, diff --git a/grafana/build/ver_4.3/scylla-advanced.4.3.json b/grafana/build/ver_4.3/scylla-advanced.4.3.json index ea2bb6991..68bae0f8e 100644 --- a/grafana/build/ver_4.3/scylla-advanced.4.3.json +++ b/grafana/build/ver_4.3/scylla-advanced.4.3.json @@ -384,7 +384,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -392,7 +392,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -400,15 +400,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -421,7 +413,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -451,7 +443,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -575,7 +567,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_write_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -701,7 +693,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\"}[60s])) by (le))", + "expr": "histogram_quantile(0.99, sum(rate(scylla_storage_proxy_coordinator_read_latency_bucket{instance=~\"[[node]]\",cluster=~\"$cluster|$^\", dc=~\"$dc\", shard=~\"[[shard]]|$^\",scheduling_group_name=~\"statement|$\"}[60s])) by (le))", "instant": true, "intervalFactor": 1, "legendFormat": "", @@ -2840,7 +2832,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3172,8 +3164,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3184,11 +3176,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.3/scylla-cql.4.3.json b/grafana/build/ver_4.3/scylla-cql.4.3.json index f555443fe..114712514 100644 --- a/grafana/build/ver_4.3/scylla-cql.4.3.json +++ b/grafana/build/ver_4.3/scylla-cql.4.3.json @@ -4352,7 +4352,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4598,8 +4598,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4610,11 +4610,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.3/scylla-detailed.4.3.json b/grafana/build/ver_4.3/scylla-detailed.4.3.json index daab2887f..4f345356d 100644 --- a/grafana/build/ver_4.3/scylla-detailed.4.3.json +++ b/grafana/build/ver_4.3/scylla-detailed.4.3.json @@ -8795,7 +8795,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -9066,8 +9066,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -9078,11 +9078,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.3/scylla-os.4.3.json b/grafana/build/ver_4.3/scylla-os.4.3.json index 6c484afbf..9d5e7fb60 100644 --- a/grafana/build/ver_4.3/scylla-os.4.3.json +++ b/grafana/build/ver_4.3/scylla-os.4.3.json @@ -1525,7 +1525,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1778,8 +1778,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1790,11 +1790,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.3/scylla-overview.4.3.json b/grafana/build/ver_4.3/scylla-overview.4.3.json index c3415453c..6889498b8 100644 --- a/grafana/build/ver_4.3/scylla-overview.4.3.json +++ b/grafana/build/ver_4.3/scylla-overview.4.3.json @@ -415,7 +415,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -423,7 +423,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -431,15 +431,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -452,7 +444,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -482,7 +474,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -3918,7 +3910,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4240,8 +4232,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4252,11 +4244,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.4/alternator.4.4.json b/grafana/build/ver_4.4/alternator.4.4.json index 91b517672..4c3989730 100644 --- a/grafana/build/ver_4.4/alternator.4.4.json +++ b/grafana/build/ver_4.4/alternator.4.4.json @@ -4640,7 +4640,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4951,8 +4951,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4963,11 +4963,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" }, diff --git a/grafana/build/ver_4.4/scylla-advanced.4.4.json b/grafana/build/ver_4.4/scylla-advanced.4.4.json index 393a9f026..989bf8c8e 100644 --- a/grafana/build/ver_4.4/scylla-advanced.4.4.json +++ b/grafana/build/ver_4.4/scylla-advanced.4.4.json @@ -88,7 +88,7 @@ }, "gridPos": { "h": 1, - "w": 9, + "w": 8, "x": 0, "y": 0 }, @@ -118,7 +118,7 @@ "gridPos": { "h": 1, "w": 4, - "x": 9, + "x": 8, "y": 0 }, "id": 2, @@ -147,7 +147,7 @@ "gridPos": { "h": 1, "w": 4, - "x": 13, + "x": 12, "y": 0 }, "id": 3, @@ -176,7 +176,7 @@ "gridPos": { "h": 1, "w": 7, - "x": 17, + "x": 16, "y": 0 }, "id": 4, @@ -384,7 +384,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -392,7 +392,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -400,15 +400,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -421,7 +413,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -451,7 +443,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -462,61 +454,6 @@ "title": "Manager", "type": "stat" }, - { - "class": "vertical_lcd", - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "custom": {}, - "decimals": 0, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "unit": "percent" - }, - "overrides": [] - }, - "gridPos": { - "h": 4, - "w": 1, - "x": 8, - "y": 1 - }, - "id": 9, - "options": { - "displayMode": "lcd", - "orientation": "vertical", - "reduceOptions": { - "calcs": [ - "last" - ], - "fields": "", - "values": false - }, - "showUnfilled": true - }, - "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))", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "", - "type": "bargauge" - }, { "class": "small_stat", "datasource": "prometheus", @@ -546,10 +483,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 9, + "x": 8, "y": 1 }, - "id": 10, + "id": 9, "options": { "colorMode": "value", "graphMode": "none", @@ -609,10 +546,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 11, + "x": 10, "y": 1 }, - "id": 11, + "id": 10, "options": { "colorMode": "value", "graphMode": "none", @@ -672,10 +609,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 13, + "x": 12, "y": 1 }, - "id": 12, + "id": 11, "options": { "colorMode": "value", "graphMode": "none", @@ -735,10 +672,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 15, + "x": 14, "y": 1 }, - "id": 13, + "id": 12, "options": { "colorMode": "value", "graphMode": "none", @@ -793,10 +730,10 @@ "gridPos": { "h": 4, "w": 3, - "x": 17, + "x": 16, "y": 1 }, - "id": 14, + "id": 13, "options": { "colorMode": "value", "graphMode": "none", @@ -855,10 +792,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 20, + "x": 19, "y": 1 }, - "id": 15, + "id": 14, "options": { "colorMode": "value", "graphMode": "none", @@ -915,10 +852,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 22, + "x": 21, "y": 1 }, - "id": 16, + "id": 15, "options": { "colorMode": "value", "graphMode": "none", @@ -948,6 +885,35 @@ "title": "Timeouts", "type": "stat" }, + { + "class": "text_panel", + "datasource": null, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 1, + "x": 23, + "y": 1 + }, + "id": 16, + "isNew": true, + "links": [], + "mode": "html", + "options": { + "content": "# " + }, + "span": 12, + "title": "", + "transparent": true, + "type": "text" + }, { "class": "collapsible_row_panel", "collapsed": false, @@ -2866,7 +2832,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3198,8 +3164,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3210,11 +3176,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.4/scylla-cql.4.4.json b/grafana/build/ver_4.4/scylla-cql.4.4.json index 3a769e7fc..752d0f9c8 100644 --- a/grafana/build/ver_4.4/scylla-cql.4.4.json +++ b/grafana/build/ver_4.4/scylla-cql.4.4.json @@ -4365,7 +4365,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4611,8 +4611,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4623,11 +4623,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.4/scylla-detailed.4.4.json b/grafana/build/ver_4.4/scylla-detailed.4.4.json index 4d39249b7..7ef4a38ed 100644 --- a/grafana/build/ver_4.4/scylla-detailed.4.4.json +++ b/grafana/build/ver_4.4/scylla-detailed.4.4.json @@ -8795,7 +8795,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -9066,8 +9066,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -9078,11 +9078,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.4/scylla-os.4.4.json b/grafana/build/ver_4.4/scylla-os.4.4.json index ca8baf8c3..bc201958b 100644 --- a/grafana/build/ver_4.4/scylla-os.4.4.json +++ b/grafana/build/ver_4.4/scylla-os.4.4.json @@ -1525,7 +1525,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1778,8 +1778,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1790,11 +1790,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_4.4/scylla-overview.4.4.json b/grafana/build/ver_4.4/scylla-overview.4.4.json index e92cd9575..5d933aae0 100644 --- a/grafana/build/ver_4.4/scylla-overview.4.4.json +++ b/grafana/build/ver_4.4/scylla-overview.4.4.json @@ -119,7 +119,7 @@ }, "gridPos": { "h": 1, - "w": 9, + "w": 8, "x": 0, "y": 1 }, @@ -149,7 +149,7 @@ "gridPos": { "h": 1, "w": 4, - "x": 9, + "x": 8, "y": 1 }, "id": 3, @@ -178,7 +178,7 @@ "gridPos": { "h": 1, "w": 4, - "x": 13, + "x": 12, "y": 1 }, "id": 4, @@ -207,7 +207,7 @@ "gridPos": { "h": 1, "w": 7, - "x": 17, + "x": 16, "y": 1 }, "id": 5, @@ -415,7 +415,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -423,7 +423,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -431,15 +431,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -452,7 +444,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -482,7 +474,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -493,61 +485,6 @@ "title": "Manager", "type": "stat" }, - { - "class": "vertical_lcd", - "datasource": "prometheus", - "fieldConfig": { - "defaults": { - "custom": {}, - "decimals": 0, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "unit": "percent" - }, - "overrides": [] - }, - "gridPos": { - "h": 4, - "w": 1, - "x": 8, - "y": 2 - }, - "id": 10, - "options": { - "displayMode": "lcd", - "orientation": "vertical", - "reduceOptions": { - "calcs": [ - "last" - ], - "fields": "", - "values": false - }, - "showUnfilled": true - }, - "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))", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "", - "type": "bargauge" - }, { "class": "small_stat", "datasource": "prometheus", @@ -577,10 +514,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 9, + "x": 8, "y": 2 }, - "id": 11, + "id": 10, "options": { "colorMode": "value", "graphMode": "none", @@ -640,10 +577,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 11, + "x": 10, "y": 2 }, - "id": 12, + "id": 11, "options": { "colorMode": "value", "graphMode": "none", @@ -703,10 +640,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 13, + "x": 12, "y": 2 }, - "id": 13, + "id": 12, "options": { "colorMode": "value", "graphMode": "none", @@ -766,10 +703,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 15, + "x": 14, "y": 2 }, - "id": 14, + "id": 13, "options": { "colorMode": "value", "graphMode": "none", @@ -824,10 +761,10 @@ "gridPos": { "h": 4, "w": 3, - "x": 17, + "x": 16, "y": 2 }, - "id": 15, + "id": 14, "options": { "colorMode": "value", "graphMode": "none", @@ -886,10 +823,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 20, + "x": 19, "y": 2 }, - "id": 16, + "id": 15, "options": { "colorMode": "value", "graphMode": "none", @@ -946,10 +883,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 22, + "x": 21, "y": 2 }, - "id": 17, + "id": 16, "options": { "colorMode": "value", "graphMode": "none", @@ -979,6 +916,35 @@ "title": "Timeouts", "type": "stat" }, + { + "class": "text_panel", + "datasource": null, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 1, + "x": 23, + "y": 2 + }, + "id": 17, + "isNew": true, + "links": [], + "mode": "html", + "options": { + "content": "# " + }, + "span": 12, + "title": "", + "transparent": true, + "type": "text" + }, { "class": "alert_table", "columns": [], @@ -3240,7 +3206,7 @@ { "matcher": { "id": "byName", - "options": "Value #C" + "options": "OS" }, "properties": [ { @@ -3258,7 +3224,7 @@ }, { "id": "custom.filterable", - "value": true + "value": false }, { "id": "mappings", @@ -3269,45 +3235,9 @@ "text": "OS Dashboard", "to": "", "type": 1, - "value": "0" - }, - { - "from": "0", - "id": 2, - "text": "OS Errors", - "to": "100000", - "type": 2, - "value": "0" + "value": "os" } ] - }, - { - "id": "thresholds", - "value": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(0, 0, 0,0)", - "value": null - }, - { - "color": "dark-orange", - "value": 0.001 - } - ] - } - }, - { - "id": "custom.displayMode", - "value": "color-background" - }, - { - "id": "custom.align", - "value": "left" - }, - { - "id": "displayName", - "value": "OS" } ] }, @@ -3363,14 +3293,6 @@ "interval": "", "legendFormat": "", "refId": "B" - }, - { - "expr": "sum(rate(scylla_reactor_aio_errors{cluster=~\"$cluster\", dc=~\"$dc\"}[1m])) by (instance)", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "C" } ], "title": "Nodes", @@ -3385,7 +3307,7 @@ "Value #A", "Value #B", "CQL", - "Value #C" + "OS" ] } } @@ -3395,21 +3317,6 @@ "options": { "byField": "instance" } - }, - { - "id": "organize", - "options": { - "excludeByName": {}, - "indexByName": { - "CQL": 1, - "Value #A": 4, - "Value #B": 5, - "Value #C": 2, - "instance": 0, - "svr": 3 - }, - "renameByName": {} - } } ], "type": "table" @@ -4003,7 +3910,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4325,8 +4232,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4337,11 +4244,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" } diff --git a/grafana/build/ver_master/alternator.master.json b/grafana/build/ver_master/alternator.master.json index 103a24885..9dfdac3b0 100644 --- a/grafana/build/ver_master/alternator.master.json +++ b/grafana/build/ver_master/alternator.master.json @@ -4640,7 +4640,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4951,8 +4951,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4963,11 +4963,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "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 726635c04..3e342fb2e 100644 --- a/grafana/build/ver_master/scylla-advanced.master.json +++ b/grafana/build/ver_master/scylla-advanced.master.json @@ -384,7 +384,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -392,7 +392,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -400,15 +400,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -421,7 +413,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -451,7 +443,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -2840,7 +2832,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -3172,8 +3164,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -3184,11 +3176,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "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 ceb3b7eb8..5ca0d468f 100644 --- a/grafana/build/ver_master/scylla-cql.master.json +++ b/grafana/build/ver_master/scylla-cql.master.json @@ -4365,7 +4365,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4611,8 +4611,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4623,11 +4623,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "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 a3ccaf802..49bc9fa7b 100644 --- a/grafana/build/ver_master/scylla-detailed.master.json +++ b/grafana/build/ver_master/scylla-detailed.master.json @@ -8795,7 +8795,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -9066,8 +9066,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -9078,11 +9078,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "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 87c24d1b5..b23535001 100644 --- a/grafana/build/ver_master/scylla-os.master.json +++ b/grafana/build/ver_master/scylla-os.master.json @@ -1525,7 +1525,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -1778,8 +1778,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -1790,11 +1790,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "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 80a480633..51d1f8c98 100644 --- a/grafana/build/ver_master/scylla-overview.master.json +++ b/grafana/build/ver_master/scylla-overview.master.json @@ -415,7 +415,7 @@ "text": "Backup", "to": "", "type": 1, - "value": "2" + "value": "3" }, { "from": "", @@ -423,7 +423,7 @@ "text": "Repair", "to": "", "type": 1, - "value": "1" + "value": "2" }, { "from": "", @@ -431,15 +431,7 @@ "text": "Online", "to": "", "type": 1, - "value": "0" - }, - { - "from": "", - "id": 2, - "text": "Offline", - "to": "", - "type": 1, - "value": "-1" + "value": "1" } ], "noValue": " Offline", @@ -452,7 +444,7 @@ }, { "color": "green", - "value": 0 + "value": 1 } ] } @@ -482,7 +474,7 @@ "pluginVersion": "7.1.3", "targets": [ { - "expr": "(sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) or on() vector(0)) + (sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"})*2 or on() vector(0)) + (sum(scylla_manager_server_current_version{}) or on() vector(-1))", + "expr": "(1+sum(scylla_manager_task_active_count{type=~\"repair\",cluster=~\"$cluster|$^\"}) + sum(scylla_manager_task_active_count{type=~\"backup\",cluster=~\"$cluster|$^\"}) * 2) or (1+scylla_manager_server_current_version)", "intervalFactor": 1, "refId": "A", "step": 40 @@ -3918,7 +3910,7 @@ "links": [], "mode": "html", "options": { - "content": "
Scylla Monitoring version - master
\n    
", + "content": "
Scylla Monitoring version - 3.6.1
\n    
", "mode": "html" }, "span": 12, @@ -4240,8 +4232,8 @@ "allValue": null, "class": "monitor_version_var", "current": { - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" }, "error": null, "hide": 2, @@ -4252,11 +4244,11 @@ "options": [ { "selected": true, - "text": "master", - "value": "master" + "text": "3.6.1", + "value": "3.6.1" } ], - "query": "master", + "query": "3.6.1", "skipUrlSync": false, "type": "custom" }