rename prometheus-agent inbitions to monitoring agent to be able to t…

…ake alloy into account (#1753)
giantswarm · Oct 30, 2024 · 4c15b7b · 4c15b7b
1 parent 12fb820
commit 4c15b7b
Show file tree

Hide file tree

Showing 26 changed files with 304 additions and 0 deletions.
diff --git 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]
 
+### Changed
+
+- Create new `monitoring-agent` inhibitions based on the `prometheus-agent` inhibitions to be agnostic to the tool used to monitor targets.
+
 ## [4.80.0] - 2024-10-21
 
 ### Added

diff --git a/files/templates/alertmanager/alertmanager.yaml b/files/templates/alertmanager/alertmanager.yaml
@@ -627,6 +627,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...e/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden b/...e/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden b/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden b/...urce/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...ource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden b/...ource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...ource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden b/...ource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...ting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden b/...ting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...lerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden b/...lerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...lerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden b/...lerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden
@@ -449,6 +449,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...ting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden b/...ting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...lerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden b/...lerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...lerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden b/...lerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden b/...alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden b/...alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...lertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden b/...lertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...g/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden b/...g/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...g/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden b/...g/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden
@@ -468,6 +468,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/...erting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden b/...erting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden
@@ -485,6 +485,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/.../alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden b/.../alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden
@@ -485,6 +485,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers:

diff --git a/.../alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden b/.../alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden
@@ -485,6 +485,18 @@ inhibit_rules:
     - cancel_if_prometheus_agent_down=true
   equal: [cluster_id]
 
+- source_matchers:
+    - cluster_is_not_running_monitoring_agent=true
+  target_matchers:
+    - cancel_if_cluster_is_not_running_monitoring_agent=true
+  equal: [cluster_id]
+
+- source_matchers:
+    - inhibit_monitoring_agent_down=true
+  target_matchers:
+    - cancel_if_monitoring_agent_down=true
+  equal: [cluster_id]
+
 - source_matchers:
     - stack_failed=true
   target_matchers: