Update etcd-k8s-events-and-resources-count.json

giantswarm · Oct 26, 2023 · 3838bb0 · 3838bb0
1 parent 363cb84
commit 3838bb0
Showing 1 changed file with 11 additions and 24 deletions.
diff --git a/.../private_dashboards_al/dashboards/shared/private/etcd-k8s-events-and-resources-count.json b/.../private_dashboards_al/dashboards/shared/private/etcd-k8s-events-and-resources-count.json
@@ -217,10 +217,12 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum (etcd_kubernetes_resources_count{cluster_id=\"$cluster\", namespace=~\"$namespace\", kind=~\"$kind\"}) by (namespace)",
+          "expr": "sum (etcd_kubernetes_resources_count{cluster_id=\"$cluster\", namespace=~\"$namespace\"}) by (namespace)",
           "interval": "",
           "legendFormat": "{{namespace}}",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -311,7 +313,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster\", kind=\"events\",namespace=\"$namespace\"})",
+          "expr": "sum(etcd_kubernetes_resources_count{cluster_id=\"$cluster\", kind=\"events\",namespace=~\"$namespace\"})",
           "instant": true,
           "interval": "",
           "legendFormat": "",
@@ -404,22 +406,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(rate(etcd_kubernetes_events_count{cluster_id=\"$cluster\"}[1h]))",
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "Total",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "PBFA97CFB590B2093"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate(etcd_kubernetes_events_count{cluster_id=\"$cluster\"}[1h])) by (namespace)",
+          "expr": "sum(rate(etcd_kubernetes_events_count{cluster_id=\"$cluster\", namespace=~\"$namespace\"}[1h])) by (namespace)",
           "hide": false,
           "instant": false,
           "legendFormat": "{{namespace}}",
@@ -514,7 +501,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(etcd_kubernetes_events_count{cluster_id=\"$cluster\",namespace=\"$namespace\"}) by (kind)",
+          "expr": "sum(etcd_kubernetes_events_count{cluster_id=\"$cluster\",namespace=~\"$namespace\"}) by (kind)",
           "hide": false,
           "instant": false,
           "legendFormat": "{{kind}}",
@@ -610,7 +597,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(etcd_kubernetes_events_count{cluster_id=\"$cluster\",namespace=\"$namespace\"}) by (reason)",
+          "expr": "sum(etcd_kubernetes_events_count{cluster_id=\"$cluster\",namespace=~\"$namespace\"}) by (reason)",
           "hide": false,
           "instant": false,
           "legendFormat": "{{reason}}",
@@ -706,7 +693,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "editorMode": "code",
-          "expr": "sum(etcd_kubernetes_events_count{cluster_id=\"$cluster\",namespace=\"$namespace\"}) by (namespace)",
+          "expr": "sum(etcd_kubernetes_events_count{cluster_id=\"$cluster\",namespace=~\"$namespace\"}) by (namespace)",
           "hide": false,
           "instant": false,
           "legendFormat": "{{namespace}}",
@@ -729,7 +716,7 @@
     "list": [
       {
         "current": {
-          "selected": false,
+          "selected": true,
           "text": "gaia",
           "value": "gaia"
         },
@@ -759,10 +746,10 @@
         "current": {
           "selected": true,
           "text": [
-            "default"
+            "All"
           ],
           "value": [
-            "default"
+            "$__all"
           ]
         },
         "datasource": {