diff --git a/resources/mixins/kubernetes/generated/alerts.yml b/resources/mixins/kubernetes/generated/alerts.yml index fefb04d..09a407f 100644 --- a/resources/mixins/kubernetes/generated/alerts.yml +++ b/resources/mixins/kubernetes/generated/alerts.yml @@ -414,6 +414,7 @@ kube_persistentvolumeclaim_access_mode{namespace!~"openshift-kube.*|openshift-logging|openshift-marketplace|openshift-aws-vpce-operator|openshift-deployment.*|kube.*", access_mode="ReadOnlyMany"} == 1 unless on(cluster, namespace, persistentvolumeclaim) kube_persistentvolumeclaim_labels{namespace!~"openshift-kube.*|openshift-logging|openshift-marketplace|openshift-aws-vpce-operator|openshift-deployment.*|kube.*",label_excluded_from_alerts="true"} == 1 + unless on(cluster, namespace, persistentvolumeclaim) kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"scanner-db.*"} "for": "1h" "labels": "severity": "warning" diff --git a/resources/mixins/kubernetes/mixin.libsonnet b/resources/mixins/kubernetes/mixin.libsonnet index 48167cc..f697ab7 100644 --- a/resources/mixins/kubernetes/mixin.libsonnet +++ b/resources/mixins/kubernetes/mixin.libsonnet @@ -63,6 +63,20 @@ kubernetes { group.rules ), } + else if group.name == 'kubernetes-storage' then + group { + rules: std.map( + function(rule) + if rule.alert == 'KubePersistentVolumeFillingUp' && rule.labels.severity == 'warning' then + rule { + // Exclude scanner-db PVCs from warning alerts because scanner-db dynamically grows/shrinks. + expr: std.rstripChars(rule.expr, '\n') + '\nunless on(%(clusterLabel)s, namespace, persistentvolumeclaim) kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"scanner-db.*"}\n' % $._config, + } + else + rule, + group.rules + ), + } else if group.name == 'kubernetes-system-kubelet' then group { rules: std.filter( diff --git a/resources/prometheus/generated/kubernetes-mixin-alerts.yaml b/resources/prometheus/generated/kubernetes-mixin-alerts.yaml index 1e544ce..493366e 100644 --- a/resources/prometheus/generated/kubernetes-mixin-alerts.yaml +++ b/resources/prometheus/generated/kubernetes-mixin-alerts.yaml @@ -422,6 +422,7 @@ spec: kube_persistentvolumeclaim_access_mode{namespace!~"openshift-kube.*|openshift-logging|openshift-marketplace|openshift-aws-vpce-operator|openshift-deployment.*|kube.*", access_mode="ReadOnlyMany"} == 1 unless on(cluster, namespace, persistentvolumeclaim) kube_persistentvolumeclaim_labels{namespace!~"openshift-kube.*|openshift-logging|openshift-marketplace|openshift-aws-vpce-operator|openshift-deployment.*|kube.*",label_excluded_from_alerts="true"} == 1 + unless on(cluster, namespace, persistentvolumeclaim) kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"scanner-db.*"} "for": "1h" "labels": "severity": "warning"