linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <florian.davasse@stack-labs.com>
This commit is contained in:
aimbot31 2020-09-29 18:28:53 +02:00 committed by GitHub
parent 1784f0643e
commit 7c08fffd8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
grafana/dashboards/kubernetes.json
View File

@ -1000,10 +1000,10 @@
"steppedLine": true, "steppedLine": true,
"targets": [ "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", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "{{ pod_name }}", "legendFormat": "{{ pod_name }}{{ pod }}",
"metric": "container_cpu", "metric": "container_cpu",
"refId": "A", "refId": "A",
"step": 10 "step": 10
@ -1209,11 +1209,11 @@
"steppedLine": true, "steppedLine": true,
"targets": [ "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, "hide": false,
"interval": "10s", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "pod: {{ pod_name }} | {{ container_name }}", "legendFormat": "pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}",
"metric": "container_cpu", "metric": "container_cpu",
"refId": "A", "refId": "A",
"step": 10 "step": 10
@ -1437,10 +1437,10 @@
"steppedLine": true, "steppedLine": true,
"targets": [ "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", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "{{ pod_name }}", "legendFormat": "{{ pod_name }}{{ pod }}",
"metric": "container_memory_usage:sort_desc", "metric": "container_memory_usage:sort_desc",
"refId": "A", "refId": "A",
"step": 10 "step": 10
@ -1642,10 +1642,10 @@
"steppedLine": true, "steppedLine": true,
"targets": [ "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", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "pod: {{ pod_name }} | {{ container_name }}", "legendFormat": "pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}",
"metric": "container_memory_usage:sort_desc", "metric": "container_memory_usage:sort_desc",
"refId": "A", "refId": "A",
"step": 10 "step": 10
@ -1864,19 +1864,19 @@
"steppedLine": false, "steppedLine": false,
"targets": [ "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", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "-> {{ pod_name }}", "legendFormat": "-> {{ pod_name }}{{ pod }}",
"metric": "network", "metric": "network",
"refId": "A", "refId": "A",
"step": 10 "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", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "<- {{ pod_name }}", "legendFormat": "<- {{ pod_name }}{{ pod }}",
"metric": "network", "metric": "network",
"refId": "B", "refId": "B",
"step": 10 "step": 10
@ -1969,21 +1969,21 @@
"steppedLine": false, "steppedLine": false,
"targets": [ "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, "hide": false,
"interval": "10s", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "-> pod: {{ pod_name }} | {{ container_name }}", "legendFormat": "-> pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}",
"metric": "network", "metric": "network",
"refId": "B", "refId": "B",
"step": 10 "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, "hide": false,
"interval": "10s", "interval": "10s",
"intervalFactor": 1, "intervalFactor": 1,
"legendFormat": "<- pod: {{ pod_name }} | {{ container_name }}", "legendFormat": "<- pod: {{ pod_name }}{{ pod }} | {{ container_name }}{{ container }}",
"metric": "network", "metric": "network",
"refId": "D", "refId": "D",
"step": 10 "step": 10