dashboard: fix cluster overview for Grafana 11

DifferentialOrange · DifferentialOrange · commit f9a04bc9517c · 2024-10-04T10:06:15.000+03:00
grafonnet doesn't fill up empty thresholds for hidden fields. After table code rework introduced in Grafana 11, empty thresholds result in panel crush. Thanks to @0x501D for exploring the issue. Closes #234
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+- Prometheus cluster overview panel not works for Grafana 11+ (#234)
+
+
 ## [3.1.0] - 2024-07-09
 Grafana revisions:
 - Tarantool 3:
diff --git a/dashboard/panels/cluster.libsonnet b/dashboard/panels/cluster.libsonnet
@@ -64,13 +64,31 @@ local prometheus = grafana.prometheus;
         type: 'number',
         unit: 's',
       },
+      {
+        alias: 'job',
+        pattern: 'job',
+        thresholds: [],
+        type: 'hidden',
+      },
+      {
+        alias: 'Time',
+        pattern: 'Time',
+        thresholds: [],
+        type: 'hidden',
+      },
+      {
+        alias: '__name__',
+        pattern: '__name__',
+        thresholds: [],
+        type: 'hidden',
+      },
     ],
     sort={
       col: 2,
       desc: false,
     },
     transform='table',
-  ).hideColumn('job').hideColumn('/.*/').addTarget(
+  ).addTarget(
     if cfg.type == variable.datasource_type.prometheus then
       prometheus.target(
         expr=if std.objectHas(cfg.filters, 'job') then
diff --git a/tests/Prometheus/dashboard_cartridge_compiled.json b/tests/Prometheus/dashboard_cartridge_compiled.json
@@ -118,11 +118,19 @@
                   {
                      "alias": "job",
                      "pattern": "job",
+                     "thresholds": [ ],
+                     "type": "hidden"
+                  },
+                  {
+                     "alias": "Time",
+                     "pattern": "Time",
+                     "thresholds": [ ],
                      "type": "hidden"
                   },
                   {
-                     "alias": "/.*/",
-                     "pattern": "/.*/",
+                     "alias": "__name__",
+                     "pattern": "__name__",
+                     "thresholds": [ ],
                      "type": "hidden"
                   }
                ],
diff --git a/tests/Prometheus/dashboard_custom_compiled.json b/tests/Prometheus/dashboard_custom_compiled.json
@@ -118,11 +118,19 @@
                   {
                      "alias": "job",
                      "pattern": "job",
+                     "thresholds": [ ],
+                     "type": "hidden"
+                  },
+                  {
+                     "alias": "Time",
+                     "pattern": "Time",
+                     "thresholds": [ ],
                      "type": "hidden"
                   },
                   {
-                     "alias": "/.*/",
-                     "pattern": "/.*/",
+                     "alias": "__name__",
+                     "pattern": "__name__",
+                     "thresholds": [ ],
                      "type": "hidden"
                   }
                ],
diff --git a/tests/Prometheus/dashboard_tarantool3_compiled.json b/tests/Prometheus/dashboard_tarantool3_compiled.json
@@ -118,11 +118,19 @@
                   {
                      "alias": "job",
                      "pattern": "job",
+                     "thresholds": [ ],
+                     "type": "hidden"
+                  },
+                  {
+                     "alias": "Time",
+                     "pattern": "Time",
+                     "thresholds": [ ],
                      "type": "hidden"
                   },
                   {
-                     "alias": "/.*/",
-                     "pattern": "/.*/",
+                     "alias": "__name__",
+                     "pattern": "__name__",
+                     "thresholds": [ ],
                      "type": "hidden"
                   }
                ],
diff --git a/tests/Prometheus/dashboard_tdg_compiled.json b/tests/Prometheus/dashboard_tdg_compiled.json
@@ -118,11 +118,19 @@
                   {
                      "alias": "job",
                      "pattern": "job",
+                     "thresholds": [ ],
+                     "type": "hidden"
+                  },
+                  {
+                     "alias": "Time",
+                     "pattern": "Time",
+                     "thresholds": [ ],
                      "type": "hidden"
                   },
                   {
-                     "alias": "/.*/",
-                     "pattern": "/.*/",
+                     "alias": "__name__",
+                     "pattern": "__name__",
+                     "thresholds": [ ],
                      "type": "hidden"
                   }
                ],
diff --git a/tests/Prometheus/dashboard_with_custom_panels_compiled.json b/tests/Prometheus/dashboard_with_custom_panels_compiled.json
@@ -118,11 +118,19 @@
                   {
                      "alias": "job",
                      "pattern": "job",
+                     "thresholds": [ ],
+                     "type": "hidden"
+                  },
+                  {
+                     "alias": "Time",
+                     "pattern": "Time",
+                     "thresholds": [ ],
                      "type": "hidden"
                   },
                   {
-                     "alias": "/.*/",
-                     "pattern": "/.*/",
+                     "alias": "__name__",
+                     "pattern": "__name__",
+                     "thresholds": [ ],
                      "type": "hidden"
                   }
                ],
