From 7c08fffd8ac71cffe07da09b9e9ebd294ed0bd94 Mon Sep 17 00:00:00 2001 From: aimbot31 <25128938+aimbot31@users.noreply.github.com> Date: Tue, 29 Sep 2020 18:28:53 +0200 Subject: [PATCH] Fix kubernetes grafana dashboard (#4380) (#5012) Prometheus use a relabel rule that changed since 1.16 Use "pod_name" and "pod" to avoid breaking changes. Also use "container" and "container_name" for the same reasons. Fixes #4380 Signed-off-by: Florian Davasse --- grafana/dashboards/kubernetes.json | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/grafana/dashboards/kubernetes.json b/grafana/dashboards/kubernetes.json index e0f99c785..710b5175a 100644 --- a/grafana/dashboards/kubernetes.json +++ b/grafana/dashboards/kubernetes.json @@ -1000,10 +1000,10 @@ "steppedLine": true, "targets": [ { - "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod_name)", + "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod_name, pod)", "interval": "10s", "intervalFactor": 1, - "legendFormat": "{{ pod_name }}", + "legendFormat": "{{ pod_name }}{{ pod }}", "metric": "container_cpu", "refId": "A", "step": 10 @@ -1209,11 +1209,11 @@ "steppedLine": true, "targets": [ { - "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",name=~\"^k8s_.*\",container_name!=\"POD\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, pod_name)", + "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",container_name!=\"POD\",container!=\"POD\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, container, pod_name, pod)", "hide": false, "interval": "10s", "intervalFactor": 1, - "legendFormat": "pod: {{ pod_name }} | {{ container_name }}", + "legendFormat": "pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}", "metric": "container_cpu", "refId": "A", "step": 10 @@ -1437,10 +1437,10 @@ "steppedLine": true, "targets": [ { - "expr": "sum (container_memory_working_set_bytes{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}) by (pod_name)", + "expr": "sum (container_memory_working_set_bytes{image!=\"\",kubernetes_io_hostname=~\"^$Node$\"}) by (pod_name, pod)", "interval": "10s", "intervalFactor": 1, - "legendFormat": "{{ pod_name }}", + "legendFormat": "{{ pod_name }}{{ pod }}", "metric": "container_memory_usage:sort_desc", "refId": "A", "step": 10 @@ -1642,10 +1642,10 @@ "steppedLine": true, "targets": [ { - "expr": "sum (container_memory_working_set_bytes{image!=\"\",name=~\"^k8s_.*\",container_name!=\"POD\",kubernetes_io_hostname=~\"^$Node$\"}) by (container_name, pod_name)", + "expr": "sum (container_memory_working_set_bytes{image!=\"\",container_name!=\"POD\",container!=\"POD\",kubernetes_io_hostname=~\"^$Node$\"}) by (container_name, container, pod_name, pod)", "interval": "10s", "intervalFactor": 1, - "legendFormat": "pod: {{ pod_name }} | {{ container_name }}", + "legendFormat": "pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}", "metric": "container_memory_usage:sort_desc", "refId": "A", "step": 10 @@ -1864,19 +1864,19 @@ "steppedLine": false, "targets": [ { - "expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod_name)", + "expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod_name, pod)", "interval": "10s", "intervalFactor": 1, - "legendFormat": "-> {{ pod_name }}", + "legendFormat": "-> {{ pod_name }}{{ pod }}", "metric": "network", "refId": "A", "step": 10 }, { - "expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod_name)", + "expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod_name, pod)", "interval": "10s", "intervalFactor": 1, - "legendFormat": "<- {{ pod_name }}", + "legendFormat": "<- {{ pod_name }}{{ pod }}", "metric": "network", "refId": "B", "step": 10 @@ -1969,21 +1969,21 @@ "steppedLine": false, "targets": [ { - "expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, pod_name)", + "expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, container, pod_name, pod)", "hide": false, "interval": "10s", "intervalFactor": 1, - "legendFormat": "-> pod: {{ pod_name }} | {{ container_name }}", + "legendFormat": "-> pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}", "metric": "network", "refId": "B", "step": 10 }, { - "expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, pod_name)", + "expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, container, pod_name, pod)", "hide": false, "interval": "10s", "intervalFactor": 1, - "legendFormat": "<- pod: {{ pod_name }} | {{ container_name }}", + "legendFormat": "<- pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}", "metric": "network", "refId": "D", "step": 10 @@ -2244,4 +2244,4 @@ "title": "Kubernetes cluster monitoring (via Prometheus)", "uid": "k8s", "version": 1 -} +} \ No newline at end of file