Skip to content

Commit

Permalink
Fix kubernetes grafana dashboard
Browse files Browse the repository at this point in the history
Change "pod_name" to "pod" linkerd#4380
  • Loading branch information
aimbot31 committed May 14, 2020
1 parent bfe0249 commit 3783901
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions grafana/dashboards/kubernetes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod)",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "{{ pod_name }}",
"legendFormat": "{{ pod }}",
"metric": "container_cpu",
"refId": "A",
"step": 10
Expand Down Expand Up @@ -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!=\"\",name=~\"^k8s_.*\",container_name!=\"POD\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, pod)",
"hide": false,
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "pod: {{ pod_name }} | {{ container_name }}",
"legendFormat": "pod: {{ pod }} | {{ container_name }}",
"metric": "container_cpu",
"refId": "A",
"step": 10
Expand Down Expand Up @@ -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!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}) by (pod)",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "{{ pod_name }}",
"legendFormat": "{{ pod }}",
"metric": "container_memory_usage:sort_desc",
"refId": "A",
"step": 10
Expand Down Expand Up @@ -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!=\"\",name=~\"^k8s_.*\",container_name!=\"POD\",kubernetes_io_hostname=~\"^$Node$\"}) by (container_name, pod)",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "pod: {{ pod_name }} | {{ container_name }}",
"legendFormat": "pod: {{ pod }} | {{ container_name }}",
"metric": "container_memory_usage:sort_desc",
"refId": "A",
"step": 10
Expand Down Expand Up @@ -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!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod)",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "-> {{ pod_name }}",
"legendFormat": "-> {{ 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!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (pod)",
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "<- {{ pod_name }}",
"legendFormat": "<- {{ pod }}",
"metric": "network",
"refId": "B",
"step": 10
Expand Down Expand Up @@ -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!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, pod)",
"hide": false,
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "-> pod: {{ pod_name }} | {{ container_name }}",
"legendFormat": "-> pod: {{ pod }} | {{ container_name }}",
"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!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (container_name, pod)",
"hide": false,
"interval": "10s",
"intervalFactor": 1,
"legendFormat": "<- pod: {{ pod_name }} | {{ container_name }}",
"legendFormat": "<- pod: {{ pod }} | {{ container_name }}",
"metric": "network",
"refId": "D",
"step": 10
Expand Down

0 comments on commit 3783901

Please sign in to comment.