Merge branch 'main' into main#release#patch

giantswarm · Jul 11, 2024 · 2f14e4b · 2f14e4b
2 parents e1642d5 + 73f1981
commit 2f14e4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [4.6.3] - 2024-07-11
 
+### Changed
+
+- link AlloyForPrometheusRulesDown alert to mimir-rules ops-recipe
+
 ### Fixed
 
 - Fix `CiliumNetworkPolicy` for `alloy`.

diff --git a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/mimir.rules.yml b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/mimir.rules.yml
@@ -62,7 +62,7 @@ spec:
     - alert: AlloyForPrometheusRulesDown
       annotations:
         description: 'Alloy sending PrometheusRules to Mimir ruler is down.'
-        opsrecipe: mimir/
+        opsrecipe: prometheus-rules/
       expr: count(up{job="alloy-rules", namespace="mimir"} == 0) by (cluster_id, installation, provider, pipeline) > 0
       for: 1h
       labels:

diff --git a/test/tests/providers/capi/capa-mimir/platform/atlas/alerting-rules/mimir.rules.test.yml b/test/tests/providers/capi/capa-mimir/platform/atlas/alerting-rules/mimir.rules.test.yml
@@ -113,7 +113,7 @@ tests:
               topic: observability
             exp_annotations:
               description: "Alloy sending PrometheusRules to Mimir ruler is down."
-              opsrecipe: "mimir/"
+              opsrecipe: "prometheus-rules/"
   - interval: 1m
     input_series:
       # test: none, rate > 0, rate = 0