From 4b7ca11520a45dbbdb67f81e0accfd878d50db99 Mon Sep 17 00:00:00 2001 From: Sam Weston Date: Tue, 2 Jun 2020 09:50:16 +0100 Subject: [PATCH] [stable/prometheus-operator] Update KubeNodeUnreachable alert to fix #21371 (#22359) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [stable/prometheus-operator] Update KubeNodeUnreachable alert to fix #21371 Signed-off-by: Sam Weston * [stable/prometheus-operator] Bump chart version Signed-off-by: Sam Weston Co-authored-by: Reinhard Nägele --- stable/prometheus-operator/Chart.yaml | 2 +- .../prometheus/rules-1.14/kubernetes-system-kubelet.yaml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 568e9cdd02..936ffd24b9 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,7 +12,7 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.13.9 +version: 8.13.10 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml index 38050de6f4..ff8193d78d 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml @@ -36,8 +36,7 @@ spec: annotations: message: '{{`{{`}} $labels.node {{`}}`}} is unreachable and some workloads may be rescheduled.' runbook_url: {{ .Values.defaultRules.runbookUrl }}alert-name-kubenodeunreachable - expr: kube_node_spec_taint{job="kube-state-metrics",key="node.kubernetes.io/unreachable",effect="NoSchedule"} == 1 - for: 2m + expr: (kube_node_spec_taint{job="kube-state-metrics",key="node.kubernetes.io/unreachable",effect="NoSchedule"} unless ignoring(key,value) kube_node_spec_taint{job="kube-state-metrics",key="ToBeDeletedByClusterAutoscaler"}) == 1 labels: severity: warning - alert: KubeletTooManyPods @@ -82,4 +81,4 @@ spec: labels: severity: critical {{- end }} -{{- end }} \ No newline at end of file +{{- end }}