From 99ef2bfe5ff18e21bc76d75988c079434edffff4 Mon Sep 17 00:00:00 2001
From: Tobias Schmidt <tobidt@gmail.com>
Date: Fri, 4 Nov 2016 08:41:35 -0400
Subject: [PATCH] Fix broken kubernetes.rules

---
 assets/prometheus/rules/kubernetes.rules       | 2 +-
 manifests/prometheus/prometheus-k8s-rules.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/prometheus/rules/kubernetes.rules b/assets/prometheus/rules/kubernetes.rules
index c7e1c971..216c0ccd 100644
--- a/assets/prometheus/rules/kubernetes.rules
+++ b/assets/prometheus/rules/kubernetes.rules
@@ -251,7 +251,7 @@ ALERT K8SApiserverDown
 
 # Disable for non HA kubernetes setups.
 ALERT K8SApiserverDown
-  IF absent({job="kubernetes"}) or (count by(cluster) (up{job="kubernetes"} == 1) < count by(cluster) (up{job="kubernetes"})
+  IF absent({job="kubernetes"}) or (count by(cluster) (up{job="kubernetes"} == 1) < count by(cluster) (up{job="kubernetes"}))
   FOR 5m
   LABELS {
     service = "k8s",
diff --git a/manifests/prometheus/prometheus-k8s-rules.yaml b/manifests/prometheus/prometheus-k8s-rules.yaml
index 3ea2358a..c01a7f3e 100644
--- a/manifests/prometheus/prometheus-k8s-rules.yaml
+++ b/manifests/prometheus/prometheus-k8s-rules.yaml
@@ -306,7 +306,7 @@ data:
 
     # Disable for non HA kubernetes setups.
     ALERT K8SApiserverDown
-      IF absent({job="kubernetes"}) or count by(cluster) (up{job="kubernetes"} == 1) < 2
+      IF absent({job="kubernetes"}) or (count by(cluster) (up{job="kubernetes"} == 1) < count by(cluster) (up{job="kubernetes"}))
       FOR 5m
       LABELS {
         service = "k8s",
@@ -418,7 +418,7 @@ data:
     ALERT K8SApiServerLatency
       IF histogram_quantile(
           0.99,
-          sum without (instance,node,resource) (apiserver_request_latencies_bucket{verb!~"CONNECT|WATCHLIST"})
+          sum without (instance,node,resource) (apiserver_request_latencies_bucket{verb!~"CONNECT|WATCHLIST|WATCH"})
         ) / 1e6 > 1.0
       FOR 10m
       LABELS {
-- 
GitLab