openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Grafana - Update cadvisor labels for k8s 1.16"

Browse Source
This commit is contained in:
Zuul 2019-11-18 20:55:10 +00:00 committed by Gerrit Code Review
commit 029f94a776
1 changed files with 18 additions and 18 deletions

36
grafana/values.yaml

@ -9065,10 +9065,10 @@ conf:
steppedLine: true steppedLine: true
targets: targets:
- expr: sum (rate (container_cpu_usage_seconds_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m])) - expr: sum (rate (container_cpu_usage_seconds_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m]))
by (pod_name) by (pod)
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: "{{ pod_name }}" legendFormat: "{{ pod }}"
metric: container_cpu metric: container_cpu
refId: A refId: A
step: 10 step: 10
@ -9224,12 +9224,12 @@ conf:
stack: false stack: false
steppedLine: true steppedLine: true
targets: targets:
- expr: sum (rate (container_cpu_usage_seconds_total{image!="",name=~"^k8s_.*",container_name!="POD",kubernetes_io_hostname=~"^$Node$"}[5m])) - expr: sum (rate (container_cpu_usage_seconds_total{image!="",name=~"^k8s_.*",container!="POD",kubernetes_io_hostname=~"^$Node$"}[5m]))
by (container_name, pod_name) by (container, pod)
hide: false hide: false
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: 'pod: {{ pod_name }} | {{ container_name }}' legendFormat: 'pod: {{ pod }} | {{ container }}'
metric: container_cpu metric: container_cpu
refId: A refId: A
step: 10 step: 10
@ -9399,10 +9399,10 @@ conf:
steppedLine: true steppedLine: true
targets: targets:
- expr: sum (container_memory_working_set_bytes{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}) - expr: sum (container_memory_working_set_bytes{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"})
by (pod_name) by (pod)
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: "{{ pod_name }}" legendFormat: "{{ pod }}"
metric: container_memory_usage:sort_desc metric: container_memory_usage:sort_desc
refId: A refId: A
step: 10 step: 10
@ -9552,11 +9552,11 @@ conf:
stack: false stack: false
steppedLine: true steppedLine: true
targets: targets:
- expr: sum (container_memory_working_set_bytes{image!="",name=~"^k8s_.*",container_name!="POD",kubernetes_io_hostname=~"^$Node$"}) - expr: sum (container_memory_working_set_bytes{image!="",name=~"^k8s_.*",container!="POD",kubernetes_io_hostname=~"^$Node$"})
by (container_name, pod_name) by (container, pod)
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: 'pod: {{ pod_name }} | {{ container_name }}' legendFormat: 'pod: {{ pod }} | {{ container }}'
metric: container_memory_usage:sort_desc metric: container_memory_usage:sort_desc
refId: A refId: A
step: 10 step: 10
@ -9723,18 +9723,18 @@ conf:
steppedLine: false steppedLine: false
targets: targets:
- expr: sum (rate (container_network_receive_bytes_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m])) - expr: sum (rate (container_network_receive_bytes_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m]))
by (pod_name) by (pod)
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: "-> {{ pod_name }}" legendFormat: "-> {{ 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$"}[5m])) - expr: '- sum (rate (container_network_transmit_bytes_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m]))
by (pod_name)' by (pod)'
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: "<- {{ pod_name }}" legendFormat: "<- {{ pod }}"
metric: network metric: network
refId: B refId: B
step: 10 step: 10
@ -9808,20 +9808,20 @@ conf:
steppedLine: false steppedLine: false
targets: targets:
- expr: sum (rate (container_network_receive_bytes_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m])) - expr: sum (rate (container_network_receive_bytes_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m]))
by (container_name, pod_name) by (container, pod)
hide: false hide: false
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: "-> pod: {{ pod_name }} | {{ container_name }}" legendFormat: "-> pod: {{ pod }} | {{ 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$"}[5m])) - expr: '- sum (rate (container_network_transmit_bytes_total{image!="",name=~"^k8s_.*",kubernetes_io_hostname=~"^$Node$"}[5m]))
by (container_name, pod_name)' by (container, pod)'
hide: false hide: false
interval: 10s interval: 10s
intervalFactor: 1 intervalFactor: 1
legendFormat: "<- pod: {{ pod_name }} | {{ container_name }}" legendFormat: "<- pod: {{ pod }} | {{ container }}"
metric: network metric: network
refId: D refId: D
step: 10 step: 10