From d6a2b717d3f0d46178882687a3e16d87955cff7f Mon Sep 17 00:00:00 2001
From: Xabier Larrakoetxea <slok69@gmail.com>
Date: Tue, 28 Nov 2017 14:52:16 +0100
Subject: [PATCH] Fix cluster:container_cpu_usage:ratio rule on prometheus
kubernetes files
Signed-off-by: Xabier Larrakoetxea <slok69@gmail.com>
---
assets/prometheus/rules/kubernetes.rules.yaml | 2 +-
manifests/prometheus/prometheus-k8s-rules.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/prometheus/rules/kubernetes.rules.yaml b/assets/prometheus/rules/kubernetes.rules.yaml
index f13d0088..537079a4 100644
--- a/assets/prometheus/rules/kubernetes.rules.yaml
+++ b/assets/prometheus/rules/kubernetes.rules.yaml
@@ -25,7 +25,7 @@ groups:
expr: sum(container_spec_cpu_shares{container_name!="POD",pod_name!=""}) / 1000
/ sum(machine_cpu_cores)
- record: cluster:container_cpu_usage:ratio
- expr: rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name!=""}[5m])
+ expr: sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name!=""}[5m]))
/ sum(machine_cpu_cores)
- record: apiserver_latency_seconds:quantile
expr: histogram_quantile(0.99, rate(apiserver_request_latencies_bucket[5m])) /
diff --git a/manifests/prometheus/prometheus-k8s-rules.yaml b/manifests/prometheus/prometheus-k8s-rules.yaml
index 6493ff74..c7d5736e 100644
--- a/manifests/prometheus/prometheus-k8s-rules.yaml
+++ b/manifests/prometheus/prometheus-k8s-rules.yaml
@@ -406,7 +406,7 @@ data:
expr: sum(container_spec_cpu_shares{container_name!="POD",pod_name!=""}) / 1000
/ sum(machine_cpu_cores)
- record: cluster:container_cpu_usage:ratio
- expr: rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name!=""}[5m])
+ expr: sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name!=""}[5m]))
/ sum(machine_cpu_cores)
- record: apiserver_latency_seconds:quantile
expr: histogram_quantile(0.99, rate(apiserver_request_latencies_bucket[5m])) /
--
GitLab