From cb4fd5494ba7065aa773241e9c7adb824947d47a Mon Sep 17 00:00:00 2001
From: Amnon Heiman <amnon@scylladb.com>
Date: Sun, 25 Jun 2023 09:04:49 +0300
Subject: [PATCH 1/2] scylla-overview: Do not rely on recording rules for
 picking the scheduling group

---
 grafana/scylla-overview.template.json | 33 ++-------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/grafana/scylla-overview.template.json b/grafana/scylla-overview.template.json
index a5c4abf948..3f8fc948e4 100644
--- a/grafana/scylla-overview.template.json
+++ b/grafana/scylla-overview.template.json
@@ -599,41 +599,12 @@
                     "sort": 0
                 },
                 {
-                    "class": "template_variable_single",
-                    "current": {
-                      "selected": true,
-                      "text": [
-                        "statement"
-                      ],
-                      "value": [
-                        "statement"
-                      ]
-                    },
-                    "label": "SG",
-                    "name": "sg",
-                    "includeAll":true,
-                    "multi":true,
-                    "dashversion":[">4.3"],
-                    "query": "label_values(rlatencyp99{cluster=~\"$cluster\", scheduling_group_name!~\"atexit|gossip|mem_compaction|memtable|streaming|background_reclaim|compaction|main|memtable_to_cache\"},scheduling_group_name)",
-                    "sort": 3
-                },
-                {
-                    "class": "template_variable_single",
-                    "dashversion":[">2019.1"],
-                    "current": {
-                      "selected": true,
-                      "text": [
-                        "sl:default"
-                      ],
-                      "value": [
-                        "sl:default"
-                      ]
-                    },
+                    "class": "template_variable_all",
                     "label": "SG",
                     "name": "sg",
                     "includeAll":true,
                     "multi":true,
-                    "query": "label_values(rlatencyp99{cluster=~\"$cluster\", scheduling_group_name!~\"atexit|gossip|mem_compaction|memtable|streaming|background_reclaim|compaction|main|memtable_to_cache\"},scheduling_group_name)",
+                    "query": "label_values(scylla_scheduler_runtime_ms{cluster=~\"$cluster\", group!~\"atexit|gossip|mem_compaction|memtable|streaming|background_reclaim|compaction|main|memtable_to_cache\"},group)",
                     "sort": 3
                 },
                 {

From f1d8d6f181907d07acae626077a129a361cd773c Mon Sep 17 00:00:00 2001
From: Amnon Heiman <amnon@scylladb.com>
Date: Tue, 21 Nov 2023 13:15:48 +0200
Subject: [PATCH 2/2] scylla-detailed: : Do not rely on recording rules for
 picking the scheduling group

---
 grafana/scylla-detailed.template.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grafana/scylla-detailed.template.json b/grafana/scylla-detailed.template.json
index 61b743cb0b..279e86df74 100644
--- a/grafana/scylla-detailed.template.json
+++ b/grafana/scylla-detailed.template.json
@@ -2002,7 +2002,7 @@
                       ]
                     },
                     "name": "scheduling_group",
-                    "query": "label_values(all_scheduling_group{cluster=~\"$cluster|$^\"}, scheduling_group_name)",
+                    "query": "label_values(scylla_scheduler_runtime_ms{cluster=~\"$cluster|$^\"}, group)",
                     "sort": 3
                 },
                 {
@@ -2020,7 +2020,7 @@
                       ]
                     },
                     "name": "scheduling_group",
-                    "query": "label_values(all_scheduling_group{cluster=~\"$cluster|$^\"}, scheduling_group_name)",
+                    "query": "label_values(scylla_scheduler_runtime_ms{cluster=~\"$cluster|$^\"}, group)",
                     "sort": 3
                 },
                 {