diff --git a/CHANGELOG.md b/CHANGELOG.md index 051deca2a..019f1404d 100644 --- 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] +### Removed + +- Ignore `api-spec` from `AppWithoutTeamAnnotation` alert. + ## [2.145.0] - 2023-11-30 ### Fixed @@ -17,10 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - reduced sensitivity for lokiringunhealthy -### Removed - -- Ignore `akv2k8s` and `opencost` from `AppWithoutTeamAnnotation` alert. - ## [2.144.0] - 2023-11-27 ### Changed diff --git a/helm/prometheus-rules/templates/alerting-rules/app.rules.yml b/helm/prometheus-rules/templates/alerting-rules/app.rules.yml index f7dbef376..4e17c1b8f 100644 --- a/helm/prometheus-rules/templates/alerting-rules/app.rules.yml +++ b/helm/prometheus-rules/templates/alerting-rules/app.rules.yml @@ -105,9 +105,9 @@ spec: description: '{{`App {{ $labels.name }} has no team label.`}}' opsrecipe: app-without-team-annotation/ {{- if eq .Values.managementCluster.provider.flavor "capi" }} - expr: label_replace(app_operator_app_info{app!~"akv2k8s|opencost", team=~"^$|noteam", catalog=~"giantswarm.*|control-plane(-test)?-catalog|cluster(-test)?|default(-test)?|releases(-test)?"}, "cluster_id", "$1", "name", "([a-zA-Z0-9]+)-.*") == 1 + expr: label_replace(app_operator_app_info{app!~"api-spec", team=~"^$|noteam", catalog=~"giantswarm.*|control-plane(-test)?-catalog|cluster(-test)?|default(-test)?|releases(-test)?"}, "cluster_id", "$1", "name", "([a-zA-Z0-9]+)-.*") == 1 {{- else }} - expr: label_replace(app_operator_app_info{app!~"akv2k8s|opencost", team=~"^$|noteam", catalog=~"giantswarm.*|control-plane(-test)?-catalog|cluster(-test)?|default(-test)?|releases(-test)?"}, "cluster_id", "$1", "namespace", {{ include "namespaceNotGiantswarm" . }}) == 1 + expr: label_replace(app_operator_app_info{app!~"api-spec", team=~"^$|noteam", catalog=~"giantswarm.*|control-plane(-test)?-catalog|cluster(-test)?|default(-test)?|releases(-test)?"}, "cluster_id", "$1", "namespace", {{ include "namespaceNotGiantswarm" . }}) == 1 {{- end }} for: 40m labels: