diff --git a/CHANGELOG.md b/CHANGELOG.md index a7e5af09..01562fd1 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] +### Changed + +- Disable `cluster-service` and `vault` rules for CAPO and CAPV. + ## [2.12.0] - 2022-04-11 ### Added diff --git a/helm/prometheus-rules/templates/_helpers.tpl b/helm/prometheus-rules/templates/_helpers.tpl index 8255d45c..102bfabb 100644 --- a/helm/prometheus-rules/templates/_helpers.tpl +++ b/helm/prometheus-rules/templates/_helpers.tpl @@ -42,3 +42,19 @@ phoenix "false" {{- end -}} {{- end -}} + +{{- define "isClusterServiceInstalled" -}} +{{- if has .Values.managementCluster.provider.kind (list "openstack" "vsphere") -}} +false +{{- else -}} +true +{{- end -}} +{{- end -}} + +{{- define "isVaultBeingMonitored" -}} +{{- if has .Values.managementCluster.provider.kind (list "openstack" "vsphere") -}} +false +{{- else -}} +true +{{- end -}} +{{- end -}} diff --git a/helm/prometheus-rules/templates/alerting-rules/cluster-service.rules.yml b/helm/prometheus-rules/templates/alerting-rules/cluster-service.rules.yml index e96d2285..777d8a63 100644 --- a/helm/prometheus-rules/templates/alerting-rules/cluster-service.rules.yml +++ b/helm/prometheus-rules/templates/alerting-rules/cluster-service.rules.yml @@ -1,3 +1,4 @@ +{{- if eq (include "isClusterServiceInstalled" .) "true" }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: @@ -32,3 +33,4 @@ spec: labels: severity: notify {{- end }} +{{- end }} diff --git a/helm/prometheus-rules/templates/alerting-rules/vault.rules.yml b/helm/prometheus-rules/templates/alerting-rules/vault.rules.yml index 6fd47641..f7ab2a3b 100644 --- a/helm/prometheus-rules/templates/alerting-rules/vault.rules.yml +++ b/helm/prometheus-rules/templates/alerting-rules/vault.rules.yml @@ -1,3 +1,4 @@ +{{- if eq (include "isVaultBeingMonitored" .) "true" }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: @@ -83,3 +84,4 @@ spec: severity: page team: {{ include "providerTeam" . }} topic: vault +{{- end }}