From ef6a12e335fea199a4ddaf1a720059a29c14b919 Mon Sep 17 00:00:00 2001
From: Jose Armesto <github@armesto.net>
Date: Wed, 3 Jul 2024 11:04:38 +0200
Subject: [PATCH] Use regex because job has namespace in it

---
 .../shared/private/capa-aggregated-error-logs.json          | 6 +++---
 .../shared/private/capi-aggregated-error-logs.json          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capa-aggregated-error-logs.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capa-aggregated-error-logs.json
index 97d16213..518713c8 100644
--- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capa-aggregated-error-logs.json
+++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capa-aggregated-error-logs.json
@@ -52,7 +52,7 @@
             "uid": "${loki_datasource}"
           },
           "editorMode": "builder",
-          "expr": "{job=~\"cluster-api-provider-aws|capa-iam-operator|aws-resolver-rules-operator|irsa-operator\"} |~ `(?i)error` |= `$cluster` | logfmt",
+          "expr": "{job=~\".*cluster-api-provider-aws|.*capa-iam-operator|.*aws-resolver-rules-operator|.*irsa-operator\"} |~ `(?i)error` |= `$cluster` | logfmt",
           "queryType": "range",
           "refId": "A"
         }
@@ -106,7 +106,7 @@
           "type": "prometheus",
           "uid": "${prometheus_datasource}"
         },
-        "definition": "label_values(up{job=\"kubernetes\"},cluster_id)",
+        "definition": "label_values(up{service=\"kubernetes\"},cluster_id)",
         "hide": 0,
         "includeAll": false,
         "label": "Cluster",
@@ -115,7 +115,7 @@
         "options": [],
         "query": {
           "qryType": 1,
-          "query": "label_values(up{job=\"kubernetes\"},cluster_id)",
+          "query": "label_values(up{service=\"kubernetes\"},cluster_id)",
           "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 2,
diff --git a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capi-aggregated-error-logs.json b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capi-aggregated-error-logs.json
index 35cea1b5..ea2025c9 100644
--- a/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capi-aggregated-error-logs.json
+++ b/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/capi-aggregated-error-logs.json
@@ -52,7 +52,7 @@
             "uid": "${loki_datasource}"
           },
           "editorMode": "builder",
-          "expr": "{job=~\"cluster-api\"} |~ `(?i)error` |= `$cluster` | logfmt",
+          "expr": "{job=~\".*cluster-api\"} |~ `(?i)error` |= `$cluster` | logfmt",
           "queryType": "range",
           "refId": "A"
         }
@@ -106,7 +106,7 @@
           "type": "prometheus",
           "uid": "${prometheus_datasource}"
         },
-        "definition": "label_values(up{job=\"kubernetes\"},cluster_id)",
+        "definition": "label_values(up{service=\"kubernetes\"},cluster_id)",
         "hide": 0,
         "includeAll": false,
         "label": "Cluster",
@@ -115,7 +115,7 @@
         "options": [],
         "query": {
           "qryType": 1,
-          "query": "label_values(up{job=\"kubernetes\"},cluster_id)",
+          "query": "label_values(up{service=\"kubernetes\"},cluster_id)",
           "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 2,