Lint capi/a aggreated error logs dashboards (#569)

giantswarm · Jun 5, 2024 · 2614f4a · 2614f4a
1 parent 7093760
commit 2614f4a
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Lint the capi and capa aggregated-error-logs dashboards to have proper datasource variables.
+
 ## [3.16.1] - 2024-06-04
 
 ### Changed

diff --git a/...d/private/capa-agregatred-error-logs.json → ...d/private/capa-aggregated-error-logs.json b/...d/private/capa-agregatred-error-logs.json → ...d/private/capa-aggregated-error-logs.json
@@ -57,7 +57,7 @@
           "refId": "A"
         }
       ],
-      "title": "Agregated error logs for all CAPA controllers - capa-controller-manager, capa-iam-operator,aws-resolver-rules-operator,irsa-operator",
+      "title": "Aggregated error logs for all CAPA controllers - capa-controller-manager, capa-iam-operator,aws-resolver-rules-operator,irsa-operator",
       "transparent": true,
       "type": "logs"
     }
@@ -72,34 +72,24 @@
     "list": [
       {
         "current": {
+          "text": "default",
+          "value": "default"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${datasource}"
-        },
-        "definition": "label_values(up{app=\"kubernetes\"},cluster_id)",
         "hide": 0,
-        "includeAll": false,
-        "label": "Cluster",
-        "multi": false,
-        "name": "cluster",
+        "label": "Prometheus data source",
+        "name": "prometheus_datasource",
         "options": [],
-        "query": {
-          "qryType": 1,
-          "query": "label_values(up{app=\"kubernetes\"},cluster_id)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
+        "query": "prometheus",
         "refresh": 1,
         "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
+        "type": "datasource"
       },
       {
         "current": {
         },
         "hide": 0,
         "includeAll": false,
+        "label": "Loki data source",
         "multi": false,
         "name": "loki_datasource",
         "options": [],
@@ -111,21 +101,28 @@
       },
       {
         "current": {
-          "selected": false,
-          "text": "Mimir",
-          "value": "mimir"
         },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prometheus_datasource}"
+        },
+        "definition": "label_values(up{app=\"kubernetes\"},cluster_id)",
         "hide": 0,
         "includeAll": false,
+        "label": "Cluster",
         "multi": false,
-        "name": "datasource",
+        "name": "cluster",
         "options": [],
-        "query": "prometheus",
-        "queryValue": "",
-        "refresh": 1,
+        "query": {
+          "qryType": 1,
+          "query": "label_values(up{app=\"kubernetes\"},cluster_id)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
-        "type": "datasource"
+        "sort": 0,
+        "type": "query"
       }
     ]
   },
@@ -135,7 +132,7 @@
   },
   "timepicker": {},
   "timezone": "browser",
-  "title": "CAPA - agregated error logs for capa controllers",
+  "title": "CAPA - aggregated error logs for capa controllers",
   "uid": "bdiako8tt1b7kc",
   "version": 2,
   "weekStart": ""

diff --git a/...ds/charts/private_dashboards_al/dashboards/shared/private/capi-aggregated-error-logs.json b/...ds/charts/private_dashboards_al/dashboards/shared/private/capi-aggregated-error-logs.json
@@ -57,7 +57,7 @@
           "refId": "A"
         }
       ],
-      "title": "Agregated error logs for all CAPI controllers",
+      "title": "Aggregated error logs for all CAPI controllers",
       "transparent": true,
       "type": "logs"
     }
@@ -72,34 +72,24 @@
     "list": [
       {
         "current": {
+          "text": "default",
+          "value": "default"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${datasource}"
-        },
-        "definition": "label_values(up{app=\"kubernetes\"},cluster_id)",
         "hide": 0,
-        "includeAll": false,
-        "label": "Cluster",
-        "multi": false,
-        "name": "cluster",
+        "label": "Prometheus data source",
+        "name": "prometheus_datasource",
         "options": [],
-        "query": {
-          "qryType": 1,
-          "query": "label_values(up{app=\"kubernetes\"},cluster_id)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
+        "query": "prometheus",
         "refresh": 1,
         "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
+        "type": "datasource"
       },
       {
         "current": {
         },
         "hide": 0,
         "includeAll": false,
+        "label": "Loki data source",
         "multi": false,
         "name": "loki_datasource",
         "options": [],
@@ -111,21 +101,28 @@
       },
       {
         "current": {
-          "selected": false,
-          "text": "Mimir",
-          "value": "mimir"
         },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${prometheus_datasource}"
+        },
+        "definition": "label_values(up{app=\"kubernetes\"},cluster_id)",
         "hide": 0,
         "includeAll": false,
+        "label": "Cluster",
         "multi": false,
-        "name": "datasource",
+        "name": "cluster",
         "options": [],
-        "query": "prometheus",
-        "queryValue": "",
-        "refresh": 1,
+        "query": {
+          "qryType": 1,
+          "query": "label_values(up{app=\"kubernetes\"},cluster_id)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
-        "type": "datasource"
+        "sort": 0,
+        "type": "query"
       }
     ]
   },
@@ -135,7 +132,7 @@
   },
   "timepicker": {},
   "timezone": "browser",
-  "title": "CAPI - agregated error logs for capi controllers",
+  "title": "CAPI - aggregated error logs for capi controllers",
   "uid": "bdi7iswg81czkcasd",
   "version": 9,
   "weekStart": ""