From fb01fe91dc264e7f75dedf02e6ff51c5a2187129 Mon Sep 17 00:00:00 2001
From: Bradley <bwilsonhunt@gmail.com>
Date: Thu, 7 Dec 2017 18:35:58 +0000
Subject: [PATCH] Adding requested and limit values to CPU and limit value to
memory
---
assets/grafana/pods.dashboard.py | 36 +++++++++++++++++++++++
manifests/grafana/grafana-dashboards.yaml | 27 +++++++++++++++++
2 files changed, 63 insertions(+)
diff --git a/assets/grafana/pods.dashboard.py b/assets/grafana/pods.dashboard.py
index 1003d8a5..cea80f66 100644
--- a/assets/grafana/pods.dashboard.py
+++ b/assets/grafana/pods.dashboard.py
@@ -132,6 +132,18 @@ dashboard = Dashboard(
'refId': 'B',
'step': 20,
},
+ {
+ 'expr': 'kube_pod_container_resource_limits_'
+ 'memory_bytes{pod="$pod", container=~'
+ '"$container"}',
+ 'interval': '10s',
+ 'intervalFactor': 2,
+ 'legendFormat': 'Limit: {{ container }}',
+ 'metric': 'kube_pod_container_resource_'
+ 'limits_memory_bytes',
+ 'refId': 'C',
+ 'step': 20,
+ },
],
),
],
@@ -170,6 +182,30 @@ dashboard = Dashboard(
'refId': 'A',
'step': 30
},
+ {
+ 'expr': 'kube_pod_container_resource_requests_'
+ 'cpu_cores{pod="$pod", container=~'
+ '"$container"}',
+ 'interval': '10s',
+ 'intervalFactor': 2,
+ 'legendFormat': 'Requested: {{ container }}',
+ 'metric': 'kube_pod_container_resource_'
+ 'requests_cpu_cores',
+ 'refId': 'B',
+ 'step': 20,
+ },
+ {
+ 'expr': 'kube_pod_container_resource_limits_'
+ 'cpu_cores{pod="$pod", container=~'
+ '"$container"}',
+ 'interval': '10s',
+ 'intervalFactor': 2,
+ 'legendFormat': 'Limit: {{ container }}',
+ 'metric': 'kube_pod_container_resource_'
+ 'limits_memory_bytes',
+ 'refId': 'C',
+ 'step': 20,
+ },
],
),
],
diff --git a/manifests/grafana/grafana-dashboards.yaml b/manifests/grafana/grafana-dashboards.yaml
index a55a8df5..3834d748 100644
--- a/manifests/grafana/grafana-dashboards.yaml
+++ b/manifests/grafana/grafana-dashboards.yaml
@@ -5241,6 +5241,15 @@ data:
"metric": "kube_pod_container_resource_requests_memory_bytes",
"refId": "B",
"step": 20
+ },
+ {
+ "expr": "kube_pod_container_resource_limits_memory_bytes{pod=\"$pod\", container=~\"$container\"}",
+ "interval": "10s",
+ "intervalFactor": 2,
+ "legendFormat": "Limit: {{ container }}",
+ "metric": "kube_pod_container_resource_limits_memory_bytes",
+ "refId": "C",
+ "step": 20
}
],
"title": "Memory Usage",
@@ -5327,6 +5336,24 @@ data:
"legendFormat": "{{ container_name }}",
"refId": "A",
"step": 30
+ },
+ {
+ "expr": "kube_pod_container_resource_requests_cpu_cores{pod=\"$pod\", container=~\"$container\"}",
+ "interval": "10s",
+ "intervalFactor": 2,
+ "legendFormat": "Requested: {{ container }}",
+ "metric": "kube_pod_container_resource_requests_cpu_cores",
+ "refId": "B",
+ "step": 20
+ },
+ {
+ "expr": "kube_pod_container_resource_limits_cpu_cores{pod=\"$pod\", container=~\"$container\"}",
+ "interval": "10s",
+ "intervalFactor": 2,
+ "legendFormat": "Limit: {{ container }}",
+ "metric": "kube_pod_container_resource_limits_memory_bytes",
+ "refId": "C",
+ "step": 20
}
],
"title": "CPU Usage",
--
GitLab