diff --git a/assets/grafana/pods.dashboard.py b/assets/grafana/pods.dashboard.py index 1003d8a51a5d0a43f8538d4f153069caa5e4e7cc..cea80f663a6952d7cf5176540d98e8d5e592e555 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 a55a8df552ea7c34c38dd1cff32b777f8249c9f3..3834d74899492f71916167bce62571462184bde5 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",