From e48278f3973bb88fe47c41ac46dbc02264025b78 Mon Sep 17 00:00:00 2001
From: crandl201 <christopher_randles@cable.comcast.com>
Date: Thu, 17 Aug 2017 20:05:55 -0400
Subject: [PATCH] update kube-state rules for 1.0.0
---
assets/prometheus/rules/kubelet.rules | 8 ++++----
assets/prometheus/rules/node.rules | 6 +++---
manifests/prometheus/prometheus-k8s-rules.yaml | 14 +++++++-------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/assets/prometheus/rules/kubelet.rules b/assets/prometheus/rules/kubelet.rules
index 8c0843ce..0d47d9d7 100644
--- a/assets/prometheus/rules/kubelet.rules
+++ b/assets/prometheus/rules/kubelet.rules
@@ -1,5 +1,5 @@
ALERT K8SNodeNotReady
- IF kube_node_status_ready{condition="true"} == 0
+ IF kube_node_status_condition{condition="Ready", status="true"} == 0
FOR 1h
LABELS {
severity = "warning",
@@ -11,12 +11,12 @@ ALERT K8SNodeNotReady
ALERT K8SManyNodesNotReady
IF
- count(kube_node_status_ready{condition="true"} == 0) > 1
+ count(kube_node_status_condition{condition="Ready", status="true"} == 0) > 1
AND
(
- count(kube_node_status_ready{condition="true"} == 0)
+ count(kube_node_status_condition{condition="Ready", status="true"} == 0)
/
- count(kube_node_status_ready{condition="true"})
+ count(kube_node_status_condition{condition="Ready", status="true"})
) > 0.2
FOR 1m
LABELS {
diff --git a/assets/prometheus/rules/node.rules b/assets/prometheus/rules/node.rules
index 54085392..94af0990 100644
--- a/assets/prometheus/rules/node.rules
+++ b/assets/prometheus/rules/node.rules
@@ -9,7 +9,7 @@ ALERT NodeExporterDown
description = "Prometheus could not scrape a node-exporter for more than 10m, or node-exporters have disappeared from discovery.",
}
ALERT K8SNodeOutOfDisk
- IF kube_node_status_out_of_disk{condition="true"} == 1
+ IF kube_node_status_condition{condition"OutOfDisk", status="true"} == 1
LABELS {
service = "k8s",
severity = "critical"
@@ -20,7 +20,7 @@ ALERT K8SNodeOutOfDisk
}
ALERT K8SNodeMemoryPressure
- IF kube_node_status_memory_pressure{condition="true"} == 1
+ IF kube_node_status_condition{condition="MemoryPressure", status="true"} == 1
LABELS {
service = "k8s",
severity = "warning"
@@ -31,7 +31,7 @@ ALERT K8SNodeMemoryPressure
}
ALERT K8SNodeDiskPressure
- IF kube_node_status_disk_pressure{condition="true"} == 1
+ IF kube_node_status_condition{condition="DiskPressure", status="true"} == 1
LABELS {
service = "k8s",
severity = "warning"
diff --git a/manifests/prometheus/prometheus-k8s-rules.yaml b/manifests/prometheus/prometheus-k8s-rules.yaml
index e1740562..a4459b43 100644
--- a/manifests/prometheus/prometheus-k8s-rules.yaml
+++ b/manifests/prometheus/prometheus-k8s-rules.yaml
@@ -328,7 +328,7 @@ data:
}
kubelet.rules: |+
ALERT K8SNodeNotReady
- IF kube_node_status_ready{condition="true"} == 0
+ IF kube_node_status_condition{condition="Ready", status="true"} == 0
FOR 1h
LABELS {
severity = "warning",
@@ -340,12 +340,12 @@ data:
ALERT K8SManyNodesNotReady
IF
- count(kube_node_status_ready{condition="true"} == 0) > 1
+ count(kube_node_status_condition{condition="Ready", status="true"} == 0) > 1
AND
(
- count(kube_node_status_ready{condition="true"} == 0)
+ count(kube_node_status_condition{condition="Ready", status="true"} == 0)
/
- count(kube_node_status_ready{condition="true"})
+ count(kube_node_status_condition{condition="Ready", status="true"})
) > 0.2
FOR 1m
LABELS {
@@ -583,7 +583,7 @@ data:
description = "Prometheus could not scrape a node-exporter for more than 10m, or node-exporters have disappeared from discovery.",
}
ALERT K8SNodeOutOfDisk
- IF kube_node_status_out_of_disk{condition="true"} == 1
+ IF kube_node_status_condition{condition="OutOfDisk",status="true"} == 1
LABELS {
service = "k8s",
severity = "critical"
@@ -594,7 +594,7 @@ data:
}
ALERT K8SNodeMemoryPressure
- IF kube_node_status_memory_pressure{condition="true"} == 1
+ IF kube_node_status_condition{condition="MemoryPressure", status="true"} == 1
LABELS {
service = "k8s",
severity = "warning"
@@ -605,7 +605,7 @@ data:
}
ALERT K8SNodeDiskPressure
- IF kube_node_status_disk_pressure{condition="true"} == 1
+ IF kube_node_status_condition{condition="DiskPressure", status="true"} == 1
LABELS {
service = "k8s",
severity = "warning"
--
GitLab