replace removed app labels for external-dns and ingress-nginx (#1371)

* replace removed app labels for external-dns and ingress-nginx * Update external-dns.rules.yml
giantswarm · Sep 23, 2024 · 671c69f · 671c69f
1 parent 3c25fd2
commit 671c69f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Dashboard links in alertmanager and mimir rules
+- Remove deprecated app labels for external-dns and ingress-nginx alerts.
 - Fix falco events alerts node label to hostname as node does not exist.
 
 ## [4.15.2] - 2024-09-17

diff --git a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/external-dns.rules.yml b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/external-dns.rules.yml
@@ -17,7 +17,7 @@ spec:
       annotations:
         description: '{{`external-dns in namespace {{ $labels.namespace }}) can''t access registry (cloud service provider DNS service).`}}'
         opsrecipe: external-dns-cant-access-registry/
-      expr: rate(external_dns_registry_errors_total{provider="aws|capa|capz|eks"}[2m]) > 0
+      expr: rate(external_dns_registry_errors_total{provider=~"aws|capa|capz|eks"}[2m]) > 0
       for: 15m
       labels:
         area: platform
@@ -32,7 +32,7 @@ spec:
       annotations:
         description: '{{`external-dns in namespace {{ $labels.namespace }}) can''t access source (Service or Ingress resource).`}}'
         opsrecipe: external-dns-cant-access-source/
-      expr: rate(external_dns_source_errors_total{provider="aws|capa|capz|eks"}[2m]) > 0
+      expr: rate(external_dns_source_errors_total{provider=~"aws|capa|capz|eks"}[2m]) > 0
       for: 15m
       labels:
         area: platform
@@ -47,7 +47,7 @@ spec:
       annotations:
         description: '{{`external-dns in namespace {{ $labels.namespace }}) is down.`}}'
         opsrecipe: external-dns-down/
-      expr: label_replace(up{app=~"external-dns-(app|monitoring)", provider="aws|capa|capz|eks"}, "ip", "$1.$2.$3.$4", "node", "ip-(\\d+)-(\\d+)-(\\d+)-(\\d+).*") == 0
+      expr: label_replace(up{container="external-dns", provider=~"aws|capa|capz|eks"}, "ip", "$1.$2.$3.$4", "node", "ip-(\\d+)-(\\d+)-(\\d+)-(\\d+).*") == 0
       for: 15m
       labels:
         area: platform

diff --git a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/ingress-controller.rules.yml b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/ingress-controller.rules.yml
@@ -66,7 +66,7 @@ spec:
       annotations:
         description: '{{`Ingress Controller in namespace {{ $labels.namespace }}) is down.`}}'
         opsrecipe: managed-app-nginx-ic/
-      expr: label_replace(up{app=~".*(ingress-nginx|nginx-ingress-controller).*"}, "ip", "$1.$2.$3.$4", "node", "ip-(\\d+)-(\\d+)-(\\d+)-(\\d+).*") == 0
+      expr: label_replace(up{pod=~".*(ingress-nginx|nginx-ingress-controller).*"}, "ip", "$1.$2.$3.$4", "node", "ip-(\\d+)-(\\d+)-(\\d+)-(\\d+).*") == 0
       for: 15m
       labels:
         area: platform