diff --git a/CHANGELOG.md b/CHANGELOG.md index 360d26522..d1f115778 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 + +- Get rid of useless `prometheus-agent` after the migration to the new `monitoring-agent` inhibitions. + ## [4.81.0] - 2024-10-30 ### Changed diff --git a/files/templates/alertmanager/alertmanager.yaml b/files/templates/alertmanager/alertmanager.yaml index 4c9df0340..0f6b77259 100644 --- a/files/templates/alertmanager/alertmanager.yaml +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden index 4b38bcd04..a3217a49a 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden index 3e073db6d..ef1b14b72 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden +++ b/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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-mc.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-mc.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.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: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.golden index c87039307..4da93ead1 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.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: