make dashboards multi-replica tolerant and make each dashboard opt-in

Signed-off-by: clux <[email protected]>
clux · Sep 9, 2024 · 8db7403 · 8db7403
1 parent fac3f29
commit 8db7403
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 49 deletions.
diff --git a/charts/cx-dashboards/Chart.yaml b/charts/cx-dashboards/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cx-dashboards
 description: cx dashboard configmaps
 type: application
-version: 0.1.4
+version: 0.1.5
 dependencies: []
diff --git a/charts/cx-dashboards/templates/cxalertmanager.yaml b/charts/cx-dashboards/templates/cxalertmanager.yaml
@@ -178,7 +178,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(alertmanager_build_info, \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(alertmanager_build_info) by (repository, container, version), \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -193,7 +193,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -208,7 +208,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,

diff --git a/charts/cx-dashboards/templates/cxprometheus.yaml b/charts/cx-dashboards/templates/cxprometheus.yaml
@@ -198,7 +198,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(prometheus_build_info, \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(prometheus_build_info) by (repository, container, version), \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -213,7 +213,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -228,7 +228,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -2101,8 +2101,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   }
                 ]
               },
@@ -2225,8 +2224,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   }
                 ]
               },
@@ -2450,8 +2448,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "#EAB839",
@@ -2555,8 +2552,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",

diff --git a/charts/cx-dashboards/values.yaml b/charts/cx-dashboards/values.yaml
@@ -1,16 +1,15 @@
-
 urls:
   prometheus: http://prometheus.clux.dev
   alertmanager: http://alertmanager.clux.dev
 
 dashboards:
   home:
-    enabled: true
+    enabled: false
   machine:
-    enabled: true
+    enabled: false
   prometheus:
-    enabled: true
+    enabled: false
   alertmanager:
-    enabled: true
+    enabled: false
   flux:
-    enabled: true
+    enabled: false
diff --git a/dashboards/alertmanager.json b/dashboards/alertmanager.json
@@ -166,7 +166,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "label_replace(alertmanager_build_info, \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
+          "expr": "label_replace(avg(alertmanager_build_info) by (repository, container, version), \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -181,7 +181,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
+          "expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -196,7 +196,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
+          "expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
           "format": "table",
           "hide": false,
           "instant": true,

diff --git a/dashboards/prometheus.json b/dashboards/prometheus.json
@@ -186,7 +186,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "label_replace(prometheus_build_info, \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
+          "expr": "label_replace(avg(prometheus_build_info) by (repository, container, version), \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -201,7 +201,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
+          "expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -216,7 +216,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
+          "expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -2089,8 +2089,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -2213,8 +2212,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -2438,8 +2436,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "#EAB839",
@@ -2543,8 +2540,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",

diff --git a/deploy/dashboards/cxalertmanager.yaml b/deploy/dashboards/cxalertmanager.yaml
@@ -176,7 +176,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(alertmanager_build_info, \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(alertmanager_build_info) by (repository, container, version), \"repository\", \"prometheus/alertmanager\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -191,7 +191,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -206,7 +206,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,

diff --git a/deploy/dashboards/cxprometheus.yaml b/deploy/dashboards/cxprometheus.yaml
@@ -196,7 +196,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(prometheus_build_info, \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(prometheus_build_info) by (repository, container, version), \"repository\", \"$1/$1\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -211,7 +211,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(prometheus_operator_build_info, \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(prometheus_operator_build_info) by (repository, container, version), \"repository\", \"prometheus-operator/prometheus-operator\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -226,7 +226,7 @@ data:
               },
               "editorMode": "code",
               "exemplar": false,
-              "expr": "label_replace(grafana_build_info, \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
+              "expr": "label_replace(avg(grafana_build_info) by (repository, container, version), \"repository\", \"grafana/grafana\", \"container\", \"(.*)\")",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -2099,8 +2099,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   }
                 ]
               },
@@ -2223,8 +2222,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   }
                 ]
               },
@@ -2448,8 +2446,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "#EAB839",
@@ -2553,8 +2550,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",