From 5787d3c8243ca879064c675c0d3f1437420909f1 Mon Sep 17 00:00:00 2001 From: Quentin Bisson Date: Wed, 30 Oct 2024 11:56:07 +0100 Subject: [PATCH] rename prometheus-agent inbitions to monitoring agent to be able to take alloy into account (#1405) --- CHANGELOG.md | 3 +- .../capa.management-cluster.rules.yml | 6 +-- .../vintage.aws.management-cluster.rules.yml | 2 +- .../alerting-rules/vintage.vault.rules.yml | 2 +- .../alerting-rules/capi-cluster.rules.yml | 6 +-- .../capi-kubeadmcontrolplane.rules.yml | 4 +- .../alerting-rules/capi-machine.rules.yml | 4 +- .../capi-machinedeployment.rules.yml | 4 +- .../alerting-rules/capi-machinepool.rules.yml | 4 +- .../alerting-rules/capi-machineset.rules.yml | 2 +- .../capi.management-cluster.rules.yml | 6 +-- .../turtles/alerting-rules/kubelet.rules.yml | 2 +- .../management-cluster.rules.yml | 2 +- .../deployment.workload-cluster.rules.yml | 2 +- ...yml => inhibit.monitoring-agent.rules.yml} | 6 +-- .../kube-state-metrics.rules.yml | 2 +- .../alerting-rules/prometheus-agent.rules.yml | 16 +++---- .../atlas/alerting-rules/prometheus.rules.yml | 2 +- .../alerting-rules/chart.rules.yml | 2 +- .../prometheus-agent.rules.test.yml | 48 +++++++++---------- .../prometheus-agent.rules.test.yml | 48 +++++++++---------- .../capi-cluster.rules.test.yml | 6 +-- .../capi-kubeadmcontrolplane.rules.test.yml | 4 +- .../capi-machine.rules.test.yml | 4 +- .../capi-machinedeployment.rules.test.yml | 4 +- .../capi-machinepool.rules.test.yml | 4 +- .../capi-machineset.rules.test.yml | 2 +- .../prometheus-agent.rules.test.yml | 48 +++++++++---------- .../kube-state-metrics.rules.test.yml | 10 ++-- .../alerting-rules/prometheus.rules.test.yml | 2 +- .../inhibit.prometheus-agent.rules.test.yml | 2 +- .../prometheus-agent.rules.test.yml | 48 +++++++++---------- 32 files changed, 154 insertions(+), 153 deletions(-) rename helm/prometheus-rules/templates/platform/atlas/alerting-rules/{inhibit.prometheus-agent.rules.yml => inhibit.monitoring-agent.rules.yml} (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4821cecfa..bf68a38fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Rename all `prometheus-agent` related inhibitions to `monitoring-agent` inhibitions. - Move `Inhibition` from a suffix to a prefix for the prometheus-agent inhibitions to match with the other inhibition alerts: - `PrometheusAgentFailingInhibition` => `InhibitionPrometheusAgentFailing` - `PrometheusAgentShardsMissingInhibition` => `InhibitionPrometheusAgentShardsMissing` @@ -1475,7 +1476,7 @@ Fix `PromtailRequestsErrors` alerts as promtail retries after some backoff so ac - Deprecate `role=master` in favor of `role=control-plane`. - Rename alerts containing `Master` with `ControlPlane` -- Added "cancel_if_prometheus_agent_down" for phoenix alerts ManagementClusterCriticalPodMetricMissing, ManagementClusterDeploymentMissingAWS, WorkloadClusterNonCriticalDeploymentNotSatisfiedKaas +- Added `cancel_if_prometheus_agent_down` for phoenix alerts ManagementClusterCriticalPodMetricMissing, ManagementClusterDeploymentMissingAWS, WorkloadClusterNonCriticalDeploymentNotSatisfiedKaas ## [2.94.0] - 2023-04-26 diff --git a/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/capa.management-cluster.rules.yml b/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/capa.management-cluster.rules.yml index d4b5d51c1..1e9cdb2e7 100644 --- a/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/capa.management-cluster.rules.yml +++ b/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/capa.management-cluster.rules.yml @@ -24,7 +24,7 @@ spec: labels: area: kaas cancel_if_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: phoenix @@ -39,7 +39,7 @@ spec: labels: area: kaas cancel_if_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: phoenix @@ -58,7 +58,7 @@ spec: labels: area: kaas cancel_if_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: phoenix diff --git a/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.aws.management-cluster.rules.yml b/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.aws.management-cluster.rules.yml index 9ab09c1a2..e69fe04f8 100644 --- a/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.aws.management-cluster.rules.yml +++ b/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.aws.management-cluster.rules.yml @@ -154,7 +154,7 @@ spec: for: 15m labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_cluster_status_updating: "true" diff --git a/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.vault.rules.yml b/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.vault.rules.yml index 8b715c920..e2bfed9e8 100644 --- a/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.vault.rules.yml +++ b/helm/prometheus-rules/templates/kaas/phoenix/alerting-rules/vintage.vault.rules.yml @@ -59,7 +59,7 @@ spec: labels: area: kaas cancel_if_outside_working_hours: {{ include "workingHoursOnly" . }} - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: page team: phoenix topic: vault diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-cluster.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-cluster.rules.yml index b6d47c19b..aaec540bf 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-cluster.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-cluster.rules.yml @@ -14,7 +14,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: {{ include "providerTeam" . }} @@ -29,7 +29,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} @@ -45,7 +45,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.yml index a7e71abfe..07c7526d5 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.yml @@ -15,7 +15,7 @@ spec: for: 90m labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} @@ -30,7 +30,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machine.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machine.rules.yml index 5a08597be..29113d960 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machine.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machine.rules.yml @@ -19,7 +19,7 @@ spec: for: 30m labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: {{ include "providerTeam" . }} @@ -29,7 +29,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinedeployment.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinedeployment.rules.yml index d2992db35..9eb0be4f0 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinedeployment.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinedeployment.rules.yml @@ -14,7 +14,7 @@ spec: for: 15m labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} @@ -29,7 +29,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinepool.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinepool.rules.yml index bcfe9af19..f1f86b8d9 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinepool.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machinepool.rules.yml @@ -14,7 +14,7 @@ spec: for: 15m labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: {{ include "providerTeam" . }} @@ -29,7 +29,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machineset.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machineset.rules.yml index e17edad61..dc51a7920 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machineset.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi-machineset.rules.yml @@ -14,7 +14,7 @@ spec: for: 1h labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi.management-cluster.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi.management-cluster.rules.yml index 39cf099f8..aed92be3a 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi.management-cluster.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/capi.management-cluster.rules.yml @@ -22,7 +22,7 @@ spec: labels: area: kaas cancel_if_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: {{ include "providerTeam" . }} @@ -37,7 +37,7 @@ spec: labels: area: kaas cancel_if_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: {{ include "providerTeam" . }} @@ -54,7 +54,7 @@ spec: labels: area: kaas cancel_if_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/kubelet.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/kubelet.rules.yml index af67a5b58..82f6d2a23 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/kubelet.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/kubelet.rules.yml @@ -23,7 +23,7 @@ spec: cancel_if_kubelet_down: "true" cancel_if_cluster_has_no_workers: "true" cancel_if_outside_working_hours: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: page team: turtles topic: kubernetes diff --git a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/management-cluster.rules.yml b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/management-cluster.rules.yml index 4705694e7..17865dc57 100644 --- a/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/management-cluster.rules.yml +++ b/helm/prometheus-rules/templates/kaas/turtles/alerting-rules/management-cluster.rules.yml @@ -97,7 +97,7 @@ spec: for: 25m labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_kube_state_metrics_down: "true" cancel_if_outside_working_hours: {{ include "workingHoursOnly" . }} severity: page diff --git a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/deployment.workload-cluster.rules.yml b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/deployment.workload-cluster.rules.yml index 599682b91..fa9087331 100644 --- a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/deployment.workload-cluster.rules.yml +++ b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/deployment.workload-cluster.rules.yml @@ -46,7 +46,7 @@ spec: for: 30m labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: {{ include "providerTeam" . }} diff --git a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/inhibit.prometheus-agent.rules.yml b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/inhibit.monitoring-agent.rules.yml similarity index 92% rename from helm/prometheus-rules/templates/platform/atlas/alerting-rules/inhibit.prometheus-agent.rules.yml rename to helm/prometheus-rules/templates/platform/atlas/alerting-rules/inhibit.monitoring-agent.rules.yml index 20e1f460f..b717760dc 100644 --- a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/inhibit.prometheus-agent.rules.yml +++ b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/inhibit.monitoring-agent.rules.yml @@ -5,11 +5,11 @@ metadata: creationTimestamp: null labels: {{- include "labels.common" . | nindent 4 }} - name: inhibit.prometheus-agent.rules + name: inhibit.monitoring-agent.rules namespace: {{ .Values.namespace }} spec: groups: - - name: inhibit.prometheus-agent + - name: inhibit.monitoring-agent rules: # this inhibition fires when a cluster is not running prometheus-agent. # we retrieve the list of existing cluster IDs from `kube_namespace_created` @@ -38,7 +38,7 @@ spec: ) ) by (cluster_id) labels: - cluster_is_not_running_prometheus_agent: "true" + cluster_is_not_running_monitoring_agent: "true" area: platform team: atlas topic: monitoring diff --git a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/kube-state-metrics.rules.yml b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/kube-state-metrics.rules.yml index 90b0f0bdf..6c90a4e2c 100644 --- a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/kube-state-metrics.rules.yml +++ b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/kube-state-metrics.rules.yml @@ -40,7 +40,7 @@ spec: cancel_if_cluster_status_deleting: "true" cancel_if_cluster_has_no_workers: "true" inhibit_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_kubelet_down: "true" cancel_if_outside_working_hours: {{ include "workingHoursOnly" . }} severity: page diff --git a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus-agent.rules.yml b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus-agent.rules.yml index 2aadb8d9f..af4c7d434 100644 --- a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus-agent.rules.yml +++ b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus-agent.rules.yml @@ -47,8 +47,8 @@ spec: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_cluster_has_no_workers: "true" @@ -89,8 +89,8 @@ spec: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" ## Page Atlas if prometheus agent is missing shards to send samples to MC prometheus. @@ -119,8 +119,8 @@ spec: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -150,8 +150,8 @@ spec: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" diff --git a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus.rules.yml b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus.rules.yml index 054d4980b..b31713f90 100644 --- a/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus.rules.yml +++ b/helm/prometheus-rules/templates/platform/atlas/alerting-rules/prometheus.rules.yml @@ -112,6 +112,6 @@ spec: team: atlas topic: observability cancel_if_outside_working_hours: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" diff --git a/helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/chart.rules.yml b/helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/chart.rules.yml index c9bc42ce4..1a584734b 100644 --- a/helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/chart.rules.yml +++ b/helm/prometheus-rules/templates/platform/honeybadger/alerting-rules/chart.rules.yml @@ -26,7 +26,7 @@ spec: cancel_if_kubelet_down: "true" cancel_if_cluster_has_no_workers: "true" cancel_if_outside_working_hours: {{ include "workingHoursOnly" . }} - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: notify team: honeybadger topic: releng diff --git a/test/tests/providers/capi/capa-mimir/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml b/test/tests/providers/capi/capa-mimir/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml index 7bb92ce32..01aebe6cb 100644 --- a/test/tests/providers/capi/capa-mimir/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml +++ b/test/tests/providers/capi/capa-mimir/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml @@ -20,9 +20,9 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cluster_id: "gauss" @@ -48,8 +48,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cluster_id: "gauss" @@ -77,10 +77,10 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" customer: "giantswarm" @@ -105,9 +105,9 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" customer: "giantswarm" @@ -156,8 +156,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -177,8 +177,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -198,8 +198,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -219,8 +219,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -260,8 +260,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -281,8 +281,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -302,8 +302,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -323,8 +323,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" diff --git a/test/tests/providers/capi/capa/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml b/test/tests/providers/capi/capa/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml index 23422850a..f539b2347 100644 --- a/test/tests/providers/capi/capa/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml +++ b/test/tests/providers/capi/capa/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml @@ -20,10 +20,10 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" instance: prometheus-agent cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -39,9 +39,9 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" instance: prometheus-agent - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -59,11 +59,11 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall instance: prometheus-agent cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -81,10 +81,10 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall instance: prometheus-agent - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -126,8 +126,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -147,8 +147,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -168,8 +168,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -189,8 +189,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -230,8 +230,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -251,8 +251,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -272,8 +272,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -293,8 +293,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" diff --git a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-cluster.rules.test.yml b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-cluster.rules.test.yml index ff09672d3..71be1d4c3 100644 --- a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-cluster.rules.test.yml +++ b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-cluster.rules.test.yml @@ -20,7 +20,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: phoenix @@ -37,7 +37,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix @@ -55,7 +55,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix diff --git a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.test.yml b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.test.yml index 472371412..2bcb3c23d 100644 --- a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.test.yml +++ b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-kubeadmcontrolplane.rules.test.yml @@ -20,7 +20,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix @@ -37,7 +37,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix diff --git a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machine.rules.test.yml b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machine.rules.test.yml index 2a9bff96f..e85606129 100644 --- a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machine.rules.test.yml +++ b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machine.rules.test.yml @@ -16,7 +16,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page team: phoenix @@ -34,7 +34,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix diff --git a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinedeployment.rules.test.yml b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinedeployment.rules.test.yml index d935d44e5..9d9c1d913 100644 --- a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinedeployment.rules.test.yml +++ b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinedeployment.rules.test.yml @@ -14,7 +14,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify phase: Failed @@ -32,7 +32,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix diff --git a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinepool.rules.test.yml b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinepool.rules.test.yml index ceb6fbb40..70f519087 100644 --- a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinepool.rules.test.yml +++ b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machinepool.rules.test.yml @@ -14,7 +14,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: page phase: Failed @@ -32,7 +32,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix diff --git a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machineset.rules.test.yml b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machineset.rules.test.yml index f322549cc..d41639d87 100644 --- a/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machineset.rules.test.yml +++ b/test/tests/providers/capi/capz/kaas/turtles/alerting-rules/capi-machineset.rules.test.yml @@ -12,7 +12,7 @@ tests: exp_alerts: - exp_labels: area: kaas - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" cancel_if_outside_working_hours: "true" severity: notify team: phoenix diff --git a/test/tests/providers/capi/capz/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml b/test/tests/providers/capi/capz/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml index 838887c58..e8ec81346 100644 --- a/test/tests/providers/capi/capz/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml +++ b/test/tests/providers/capi/capz/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml @@ -20,10 +20,10 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" instance: prometheus-agent cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -39,9 +39,9 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" instance: prometheus-agent - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -59,11 +59,11 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall instance: prometheus-agent cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -81,10 +81,10 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall instance: prometheus-agent - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -126,8 +126,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -147,8 +147,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -168,8 +168,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -189,8 +189,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -230,8 +230,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -251,8 +251,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -272,8 +272,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -293,8 +293,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" diff --git a/test/tests/providers/global/platform/atlas/alerting-rules/kube-state-metrics.rules.test.yml b/test/tests/providers/global/platform/atlas/alerting-rules/kube-state-metrics.rules.test.yml index dcc8fef72..fcb7d84ad 100644 --- a/test/tests/providers/global/platform/atlas/alerting-rules/kube-state-metrics.rules.test.yml +++ b/test/tests/providers/global/platform/atlas/alerting-rules/kube-state-metrics.rules.test.yml @@ -57,7 +57,7 @@ tests: cancel_if_kubelet_down: "true" cancel_if_outside_working_hours: "false" inhibit_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: "page" team: "atlas" topic: "observability" @@ -84,7 +84,7 @@ tests: cancel_if_kubelet_down: "true" cancel_if_outside_working_hours: "false" inhibit_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: "page" team: "atlas" topic: "observability" @@ -117,7 +117,7 @@ tests: cancel_if_kubelet_down: "true" cancel_if_outside_working_hours: "false" inhibit_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: "page" team: "atlas" topic: "observability" @@ -175,7 +175,7 @@ tests: cancel_if_kubelet_down: "true" cancel_if_outside_working_hours: "false" inhibit_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: "page" team: "atlas" topic: "observability" @@ -202,7 +202,7 @@ tests: cancel_if_kubelet_down: "true" cancel_if_outside_working_hours: "false" inhibit_kube_state_metrics_down: "true" - cancel_if_prometheus_agent_down: "true" + cancel_if_monitoring_agent_down: "true" severity: "page" team: "atlas" topic: "observability" diff --git a/test/tests/providers/global/platform/atlas/alerting-rules/prometheus.rules.test.yml b/test/tests/providers/global/platform/atlas/alerting-rules/prometheus.rules.test.yml index c2e8b2ce4..77cdd2167 100644 --- a/test/tests/providers/global/platform/atlas/alerting-rules/prometheus.rules.test.yml +++ b/test/tests/providers/global/platform/atlas/alerting-rules/prometheus.rules.test.yml @@ -86,7 +86,7 @@ tests: pipeline: "testing" job: "kube-controller-manager" cancel_if_outside_working_hours: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: diff --git a/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/inhibit.prometheus-agent.rules.test.yml b/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/inhibit.prometheus-agent.rules.test.yml index aede699d4..1337eb515 100644 --- a/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/inhibit.prometheus-agent.rules.test.yml +++ b/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/inhibit.prometheus-agent.rules.test.yml @@ -27,7 +27,7 @@ tests: area: platform team: atlas topic: monitoring - cluster_is_not_running_prometheus_agent: "true" + cluster_is_not_running_monitoring_agent: "true" cluster_id: "clu02" exp_annotations: description: "Cluster (clu02) is not running Prometheus Agent." diff --git a/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml b/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml index 838887c58..e8ec81346 100644 --- a/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml +++ b/test/tests/providers/vintage/aws/platform/atlas/alerting-rules/prometheus-agent.rules.test.yml @@ -20,10 +20,10 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" instance: prometheus-agent cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -39,9 +39,9 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" instance: prometheus-agent - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -59,11 +59,11 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall instance: prometheus-agent cancel_if_cluster_has_no_workers: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -81,10 +81,10 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" + inhibit_monitoring_agent_down: "true" installation: myinstall instance: prometheus-agent - cancel_if_cluster_is_not_running_prometheus_agent: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" exp_annotations: @@ -126,8 +126,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -147,8 +147,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -168,8 +168,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -189,8 +189,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -230,8 +230,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -251,8 +251,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -272,8 +272,8 @@ tests: severity: page team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true" @@ -293,8 +293,8 @@ tests: severity: none team: atlas topic: observability - inhibit_prometheus_agent_down: "true" - cancel_if_cluster_is_not_running_prometheus_agent: "true" + inhibit_monitoring_agent_down: "true" + cancel_if_cluster_is_not_running_monitoring_agent: "true" cancel_if_cluster_status_creating: "true" cancel_if_cluster_status_deleting: "true" cancel_if_outside_working_hours: "true"