remove useless prometheus-agent inhibitions as they were replaced (#1758)

Author: QuentinBisson

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+- Get rid of useless `prometheus-agent` after the migration to the new `monitoring-agent` inhibitions.
+
 ## [4.81.0] - 2024-10-30
 
 ### Changed

files/templates/alertmanager/alertmanager.yaml

@@ -615,18 +615,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden

@@ -437,18 +437,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden

@@ -456,18 +456,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden

@@ -473,18 +473,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden

@@ -473,18 +473,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers:

service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden

@@ -473,18 +473,6 @@ inhibit_rules:
   - cancel_if_cluster_has_no_workers=true
   equal: [cluster_id]
 
-- source_matchers:
-    - cluster_is_not_running_prometheus_agent=true
-  target_matchers:
-    - cancel_if_cluster_is_not_running_prometheus_agent=true
-  equal: [cluster_id]
-
-- source_matchers:
-    - inhibit_prometheus_agent_down=true
-  target_matchers:
-    - cancel_if_prometheus_agent_down=true
-  equal: [cluster_id]
-
 - source_matchers:
     - cluster_is_not_running_monitoring_agent=true
   target_matchers: