Filter dashboard drill-down variables by job

timebertt · Aug 22, 2023 · e66c84a · e66c84a
1 parent d8533fe
commit e66c84a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/webhosting-operator/config/monitoring/default/dashboards/client-go.json b/webhosting-operator/config/monitoring/default/dashboards/client-go.json
@@ -1104,14 +1104,14 @@
           "type": "prometheus",
           "uid": "${datasource}"
         },
-        "definition": "label_values(controller_runtime_reconcile_total, pod)",
+        "definition": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, pod)",
         "hide": 0,
         "includeAll": true,
         "multi": true,
         "name": "pod",
         "options": [],
         "query": {
-          "query": "label_values(controller_runtime_reconcile_total, pod)",
+          "query": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, pod)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -1136,14 +1136,14 @@
           "type": "prometheus",
           "uid": "${datasource}"
         },
-        "definition": "label_values(rest_client_requests_total, method)",
+        "definition": "label_values(rest_client_requests_total{job=\"$job\"}, method)",
         "hide": 0,
         "includeAll": true,
         "multi": true,
         "name": "verb",
         "options": [],
         "query": {
-          "query": "label_values(rest_client_requests_total, method)",
+          "query": "label_values(rest_client_requests_total{job=\"$job\"}, method)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -1168,14 +1168,14 @@
           "type": "prometheus",
           "uid": "${datasource}"
         },
-        "definition": "label_values(rest_client_requests_total, code)",
+        "definition": "label_values(rest_client_requests_total{job=\"$job\"}, code)",
         "hide": 0,
         "includeAll": true,
         "multi": true,
         "name": "code",
         "options": [],
         "query": {
-          "query": "label_values(rest_client_requests_total, code)",
+          "query": "label_values(rest_client_requests_total{job=\"$job\"}, code)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,

diff --git a/webhosting-operator/config/monitoring/default/dashboards/controller-details.json b/webhosting-operator/config/monitoring/default/dashboards/controller-details.json
@@ -1558,14 +1558,14 @@
           "type": "prometheus",
           "uid": "${datasource}"
         },
-        "definition": "label_values(controller_runtime_reconcile_total, controller)",
+        "definition": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, controller)",
         "hide": 0,
         "includeAll": false,
         "multi": false,
         "name": "controller",
         "options": [],
         "query": {
-          "query": "label_values(controller_runtime_reconcile_total, controller)",
+          "query": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, controller)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
@@ -1590,14 +1590,14 @@
           "type": "prometheus",
           "uid": "${datasource}"
         },
-        "definition": "label_values(controller_runtime_reconcile_total, pod)",
+        "definition": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, pod)",
         "hide": 0,
         "includeAll": true,
         "multi": true,
         "name": "pod",
         "options": [],
         "query": {
-          "query": "label_values(controller_runtime_reconcile_total, pod)",
+          "query": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, pod)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,

diff --git a/webhosting-operator/config/monitoring/default/dashboards/controller-runtime.json b/webhosting-operator/config/monitoring/default/dashboards/controller-runtime.json
@@ -793,6 +793,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -825,7 +827,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           },
@@ -892,7 +895,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -956,7 +960,7 @@
         "showHeader": true,
         "sortBy": []
       },
-      "pluginVersion": "8.5.5",
+      "pluginVersion": "9.3.2",
       "targets": [
         {
           "datasource": {
@@ -1000,6 +1004,8 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1033,7 +1039,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               },
               {
                 "color": "red",
@@ -1096,6 +1103,8 @@
             "mode": "continuous-GrYlRd"
           },
           "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
             "barAlignment": 0,
@@ -1129,7 +1138,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": null
               }
             ]
           },
@@ -1723,14 +1733,14 @@
           "type": "prometheus",
           "uid": "${datasource}"
         },
-        "definition": "label_values(controller_runtime_reconcile_total, controller)",
+        "definition": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, controller)",
         "hide": 0,
         "includeAll": true,
         "multi": true,
         "name": "controller",
         "options": [],
         "query": {
-          "query": "label_values(controller_runtime_reconcile_total, controller)",
+          "query": "label_values(controller_runtime_reconcile_total{job=\"$job\"}, controller)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,