teleport alerts cleanup

giantswarm · May 7, 2024 · ea404ad · ea404ad
1 parent 07bca56
commit ea404ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/helm/prometheus-rules/templates/alerting-rules/teleport.rules.yml b/helm/prometheus-rules/templates/alerting-rules/teleport.rules.yml
@@ -16,17 +16,11 @@ spec:
       expr: |
         count (
           kube_secret_created{secret=~".*-teleport-join-token"}
-        ) by (cluster_id, installation)
+        )
         !=
         sum (
-          label_replace(
-            capi_cluster_status_phase{phase="Provisioned"},
-            "cluster_id",
-            "$1",
-            "name",
-            "(.*)"
-          )
-        ) by (cluster_id, installation)
+            capi_cluster_status_phase{phase="Provisioned"}
+        )
       for: 120m
       labels:
         area: kaas
@@ -43,17 +37,11 @@ spec:
       expr: |
         count (
           kube_configmap_info{configmap=~".*-teleport-kube-agent-config"}
-        ) by (cluster_id, installation)
+        )
         !=
         sum (
-          label_replace(
-            capi_cluster_status_phase{phase="Provisioned"},
-            "cluster_id",
-            "$1",
-            "name",
-            "(.*)"
-          )
-        ) by (cluster_id, installation)
+            capi_cluster_status_phase{phase="Provisioned"}
+        )
       for: 120m
       labels:
         area: kaas

diff --git a/test/tests/providers/capi/capz/teleport.rules.test.yml b/test/tests/providers/capi/capz/teleport.rules.test.yml
@@ -25,8 +25,6 @@ tests:
               cancel_if_cluster_status_updating: "true"
               cancel_if_cluster_status_deleting: "true"
               cancel_if_outside_working_hours: "true"
-              cluster_id: my-cluster
-              installation: golem
               severity: notify
               team: bigmac
               topic: teleport
@@ -54,8 +52,6 @@ tests:
               cancel_if_cluster_status_updating: "true"
               cancel_if_cluster_status_deleting: "true"
               cancel_if_outside_working_hours: "true"
-              cluster_id: my-cluster
-              installation: grizzly
               severity: notify
               team: bigmac
               topic: teleport