diff --git a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml index e674fc2f..fb29bf7c 100644 --- a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml +++ b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml @@ -63,7 +63,7 @@ spec: - alert: FluxHelmReleaseFailed annotations: description: |- - {{`Flux HelmRelease {{ $labels.name }} in ns {{ $labels.exported_namespace }} on {{ $labels.installation }}/{{ $labels.cluster_id }} is stuck in Failed state.`}} + {{`Flux HelmRelease {{ $labels.name }} in ns {{ $labels.exported_namespace }} on {{ $labels.installation }}-{{ $labels.cluster_id }} is stuck in Failed state.`}} opsrecipe: fluxcd-failing-helmrelease/ expr: gotk_reconcile_condition{type="Ready", status="False", kind="HelmRelease", cluster_type="management_cluster", exported_namespace!="flux-giantswarm", name=~".*(cilium|network-policies)"} > 0 for: 20m diff --git a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml index f67cfb8c..b18b2f29 100644 --- a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml +++ b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml @@ -29,7 +29,7 @@ spec: - alert: FluxHelmReleaseFailed annotations: description: |- - {{`Flux HelmRelease {{ $labels.name }} in ns {{ $labels.exported_namespace }} on {{ $labels.installation }}/{{ $labels.cluster_id }} is stuck in Failed state.`}} + {{`Flux HelmRelease {{ $labels.name }} in ns {{ $labels.exported_namespace }} on {{ $labels.installation }}-{{ $labels.cluster_id }} is stuck in Failed state.`}} opsrecipe: fluxcd-failing-helmrelease/ expr: gotk_reconcile_condition{type="Ready", status="False", kind="HelmRelease", cluster_type="management_cluster", exported_namespace!="flux-giantswarm", name=~".*coredns"} > 0 for: 20m