From 0dec594c417b2423f42b033552c8ccef661f1034 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Tue, 20 Nov 2018 14:10:41 +0100
Subject: [PATCH] kube-prometheus: Re-generate
---
manifests/grafana-deployment.yaml | 4 ++++
manifests/prometheus-rules.yaml | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index e378f689..6816ce2f 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -21,6 +21,10 @@ spec:
ports:
- containerPort: 3000
name: http
+ readinessProbe:
+ httpGet:
+ path: /api/health
+ port: http
resources:
limits:
cpu: 200m
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 28476cb3..ad3a6065 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -595,8 +595,8 @@ spec:
}} for container {{ $labels.container_name }} in pod {{ $labels.pod_name
}}.'
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-cputhrottlinghigh
- expr: "100 * sum(increase(container_cpu_cfs_throttled_periods_total[5m])) by
- (container_name, pod_name, namespace) \n / \nsum(increase(container_cpu_cfs_periods_total[5m]))
+ expr: "100 * sum(increase(container_cpu_cfs_throttled_periods_total{}[5m]))
+ by (container_name, pod_name, namespace) \n / \nsum(increase(container_cpu_cfs_periods_total{}[5m]))
by (container_name, pod_name, namespace)\n > 25 \n"
for: 15m
labels:
--
GitLab