diff --git a/assets/prometheus/rules/kubernetes.rules b/assets/prometheus/rules/kubernetes.rules index c7e1c9716d2e7d3bf61c7269785ffe588fd936cf..216c0ccde6f71b762b2488dd22fe563136bb87ce 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 3ea2358a1d7bafb9b3112e06e7fb210edb7546b9..c01a7f3e4856ae4fcbf44d2f2fc7dd8589418b33 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 {