From 52b87babd238b7ae7c17569b4b5ff5aa5e63ffa0 Mon Sep 17 00:00:00 2001
From: Matthias Loibl <mail@matthiasloibl.com>
Date: Mon, 21 Jan 2019 14:49:47 +0100
Subject: [PATCH] contrib/kube-prometheus: Update kubernetes mixin for fixed
CPUThrottlingHigh
---
jsonnetfile.lock.json | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 4 ++--
manifests/prometheus-rules.yaml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 5c6929a4..86630edb 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -28,7 +28,7 @@
"subdir": ""
}
},
- "version": "4c23c06fff9ef50744f5ed306c9ab0c4bd78a144"
+ "version": "2e358ff68f00bd0dead547beaddc6ce7526864e8"
},
{
"name": "grafonnet",
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 4900caae..dc491cb6 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -6730,7 +6730,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum by (container_name) (rate(container_cpu_usage_seconds_total{job=\"kubelet\", image!=\"\",container_name!=\"POD\",pod_name=\"$pod\"}[1m]))",
+ "expr": "sum by (container_name) (rate(container_cpu_usage_seconds_total{job=\"kubelet\", namespace=\"$namespace\", image!=\"\",container_name!=\"POD\",pod_name=\"$pod\"}[1m]))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{ container_name }}",
@@ -6833,7 +6833,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sort_desc(sum by (pod_name) (rate(container_network_receive_bytes_total{job=\"kubelet\", pod_name=\"$pod\"}[1m])))",
+ "expr": "sort_desc(sum by (pod_name) (rate(container_network_receive_bytes_total{job=\"kubelet\", namespace=\"$namespace\", pod_name=\"$pod\"}[1m])))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{ pod_name }}",
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 05e0debf..e578dad0 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -626,8 +626,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{container_name!=\"\",
+ }[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