From 7ac58e53a4a0c2380a504cd233ead36977d18cc2 Mon Sep 17 00:00:00 2001 From: David Calvert Date: Mon, 18 Dec 2023 23:05:21 +0100 Subject: [PATCH] feat: added cluster var in ns, nodes and pods views (#82) Signed-off-by: David Calvert --- dashboards/k8s-views-namespaces.json | 165 +++++++++++++++------- dashboards/k8s-views-nodes.json | 204 +++++++++++++++++---------- dashboards/k8s-views-pods.json | 123 +++++++++------- 3 files changed, 319 insertions(+), 173 deletions(-) diff --git a/dashboards/k8s-views-namespaces.json b/dashboards/k8s-views-namespaces.json index 06ff0b9..948c5a0 100644 --- a/dashboards/k8s-views-namespaces.json +++ b/dashboards/k8s-views-namespaces.json @@ -122,6 +122,8 @@ }, "id": 46, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -134,7 +136,7 @@ "showThresholdMarkers": true, "text": {} }, - "pluginVersion": "10.0.3", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -143,7 +145,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", image!=\"\"}[$__rate_interval])) / sum(machine_cpu_cores)", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", image!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) / sum(machine_cpu_cores{cluster=~\"$cluster\"})", "instant": true, "interval": "", "legendFormat": "", @@ -194,6 +196,8 @@ }, "id": 48, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -206,7 +210,7 @@ "showThresholdMarkers": true, "text": {} }, - "pluginVersion": "10.0.3", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -214,7 +218,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=~\"$namespace\", image!=\"\"}) / sum(machine_memory_bytes)", + "expr": "sum(container_memory_working_set_bytes{namespace=~\"$namespace\", image!=\"\", cluster=~\"$cluster\"}) / sum(machine_memory_bytes{cluster=~\"$cluster\"})", "interval": "", "legendFormat": "", "refId": "A" @@ -234,6 +238,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -247,6 +252,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -313,7 +319,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_pod_container_status_running{namespace=~\"$namespace\"})", + "expr": "sum(kube_pod_container_status_running{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Running Pods", "refId": "A" @@ -323,7 +329,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_service_info{namespace=~\"$namespace\"})", + "expr": "sum(kube_service_info{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Services", "refId": "B" @@ -333,7 +339,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_ingress_info{namespace=~\"$namespace\"})", + "expr": "sum(kube_ingress_info{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Ingresses", "refId": "C" @@ -343,7 +349,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_deployment_labels{namespace=~\"$namespace\"})", + "expr": "sum(kube_deployment_labels{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Deployments", "refId": "D" @@ -353,7 +359,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_statefulset_labels{namespace=~\"$namespace\"})", + "expr": "sum(kube_statefulset_labels{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Statefulsets", "refId": "E" @@ -363,7 +369,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_daemonset_labels{namespace=~\"$namespace\"})", + "expr": "sum(kube_daemonset_labels{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Daemonsets", "refId": "F" @@ -373,7 +379,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_persistentvolumeclaim_info{namespace=~\"$namespace\"})", + "expr": "sum(kube_persistentvolumeclaim_info{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Persistent Volume Claims", "refId": "G" @@ -383,7 +389,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_hpa_labels{namespace=~\"$namespace\"})", + "expr": "sum(kube_hpa_labels{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Horizontal Pod Autoscalers", "refId": "H" @@ -393,7 +399,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_configmap_info{namespace=~\"$namespace\"})", + "expr": "sum(kube_configmap_info{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Configmaps", "refId": "I" @@ -403,7 +409,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_secret_info{namespace=~\"$namespace\"})", + "expr": "sum(kube_secret_info{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Secrets", "refId": "J" @@ -413,7 +419,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_networkpolicy_labels{namespace=~\"$namespace\"})", + "expr": "sum(kube_networkpolicy_labels{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Network Policies", "refId": "K" @@ -464,9 +470,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.3", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -475,7 +482,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", image!=\"\"}[$__rate_interval]))", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", image!=\"\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "", "legendFormat": "Real", "range": true, @@ -487,7 +494,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"cpu\"})", + "expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"cpu\", cluster=~\"$cluster\"})", "hide": false, "legendFormat": "Requests", "range": true, @@ -499,7 +506,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"cpu\"})", + "expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"cpu\", cluster=~\"$cluster\"})", "hide": false, "legendFormat": "Limits", "range": true, @@ -511,7 +518,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(machine_cpu_cores)", + "expr": "sum(machine_cpu_cores{cluster=~\"$cluster\"})", "hide": false, "legendFormat": "Cluster Total", "range": true, @@ -563,9 +570,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.0.3", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -574,7 +582,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=~\"$namespace\", image!=\"\"})", + "expr": "sum(container_memory_working_set_bytes{namespace=~\"$namespace\", image!=\"\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Real", "range": true, @@ -586,7 +594,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"memory\"})", + "expr": "sum(kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"memory\", cluster=~\"$cluster\"})", "hide": false, "legendFormat": "Requests", "range": true, @@ -598,7 +606,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"memory\"})", + "expr": "sum(kube_pod_container_resource_limits{namespace=~\"$namespace\", resource=\"memory\", cluster=~\"$cluster\"})", "hide": false, "legendFormat": "Limits", "range": true, @@ -610,7 +618,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(machine_memory_bytes)", + "expr": "sum(machine_memory_bytes{cluster=~\"$cluster\"})", "hide": false, "legendFormat": "Cluster Total", "range": true, @@ -648,6 +656,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "CPU CORES", @@ -661,6 +670,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -723,7 +733,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", image!=\"\", pod=~\"${created_by}.*\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", image!=\"\", pod=~\"${created_by}.*\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }}", "range": true, @@ -744,6 +754,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -757,6 +768,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -819,7 +831,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=~\"$namespace\", image!=\"\", pod=~\"${created_by}.*\"}) by (pod)", + "expr": "sum(container_memory_working_set_bytes{namespace=~\"$namespace\", image!=\"\", pod=~\"${created_by}.*\", cluster=~\"$cluster\"}) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }}", "range": true, @@ -841,6 +853,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "SECONDS", @@ -854,6 +867,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineStyle": { "fill": "solid" @@ -926,7 +940,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_cpu_cfs_throttled_seconds_total{namespace=~\"$namespace\", image!=\"\", pod=~\"${created_by}.*\"}[$__rate_interval])) by (pod) > 0", + "expr": "sum(rate(container_cpu_cfs_throttled_seconds_total{namespace=~\"$namespace\", image!=\"\", pod=~\"${created_by}.*\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod) > 0", "interval": "$resolution", "legendFormat": "{{ pod }}", "range": true, @@ -960,6 +974,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -973,6 +988,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1041,7 +1057,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kube_pod_status_qos_class{namespace=~\"$namespace\"}) by (qos_class)", + "expr": "sum(kube_pod_status_qos_class{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (qos_class)", "interval": "", "legendFormat": "{{ qos_class }} pods", "range": true, @@ -1053,7 +1069,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_info{namespace=~\"$namespace\"})", + "expr": "sum(kube_pod_info{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "hide": false, "legendFormat": "Total pods", "range": true, @@ -1074,6 +1090,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1087,6 +1104,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1155,7 +1173,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kube_pod_status_reason) by (reason)", + "expr": "sum(kube_pod_status_reason{cluster=~\"$cluster\"}) by (reason)", "interval": "", "legendFormat": "{{ reason }}", "range": true, @@ -1177,6 +1195,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1190,6 +1209,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1258,7 +1278,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(increase(container_oom_events_total{namespace=~\"${namespace}\"}[$__rate_interval])) by (namespace, pod) > 0", + "expr": "sum(increase(container_oom_events_total{namespace=~\"${namespace}\", cluster=~\"$cluster\"}[$__rate_interval])) by (namespace, pod) > 0", "interval": "", "legendFormat": "namespace: {{ namespace }} - pod: {{ pod }}", "range": true, @@ -1280,6 +1300,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1293,6 +1314,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1361,7 +1383,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=~\"${namespace}\"}[$__rate_interval])) by (namespace, pod) > 0", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=~\"${namespace}\", cluster=~\"$cluster\"}[$__rate_interval])) by (namespace, pod) > 0", "interval": "", "legendFormat": "namespace: {{ namespace }} - pod: {{ pod }}", "range": true, @@ -1382,6 +1404,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1395,6 +1418,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1457,7 +1481,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_status_ready{namespace=~\"$namespace\", pod=~\"${created_by}.*\"})", + "expr": "sum(kube_pod_container_status_ready{namespace=~\"$namespace\", pod=~\"${created_by}.*\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Ready", "range": true, @@ -1469,7 +1493,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_status_running{namespace=~\"$namespace\", pod=~\"${created_by}.*\"})", + "expr": "sum(kube_pod_container_status_running{namespace=~\"$namespace\", pod=~\"${created_by}.*\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Running", "range": true, @@ -1480,7 +1504,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_pod_container_status_waiting{namespace=~\"$namespace\"})", + "expr": "sum(kube_pod_container_status_waiting{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Waiting", "refId": "C" @@ -1490,7 +1514,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_pod_container_status_restarts_total{namespace=~\"$namespace\"})", + "expr": "sum(kube_pod_container_status_restarts_total{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Restarts Total", "refId": "D" @@ -1500,7 +1524,7 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "sum(kube_pod_container_status_terminated{namespace=~\"$namespace\"})", + "expr": "sum(kube_pod_container_status_terminated{namespace=~\"$namespace\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "Terminated", "refId": "E" @@ -1520,6 +1544,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1533,6 +1558,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1595,7 +1621,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_pod_container_info{namespace=~\"$namespace\", pod=~\"${created_by}.*\"}) by (pod)", + "expr": "sum(kube_pod_container_info{namespace=~\"$namespace\", pod=~\"${created_by}.*\", cluster=~\"$cluster\"}) by (pod)", "interval": "", "legendFormat": "{{ pod }}", "range": true, @@ -1616,6 +1642,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1629,6 +1656,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1691,7 +1719,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kube_deployment_status_replicas_available{namespace=~\"$namespace\"}) by (deployment)", + "expr": "sum(kube_deployment_status_replicas_available{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (deployment)", "interval": "", "legendFormat": "{{ deployment }}", "range": true, @@ -1712,6 +1740,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1725,6 +1754,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1786,7 +1816,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(kube_deployment_status_replicas_unavailable{namespace=~\"$namespace\", pod=~\"${created_by}.*\"}) by (deployment)", + "expr": "sum(kube_deployment_status_replicas_unavailable{namespace=~\"$namespace\", pod=~\"${created_by}.*\", cluster=~\"$cluster\"}) by (deployment)", "interval": "", "legendFormat": "{{ deployment }}", "range": true, @@ -1824,6 +1854,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1837,6 +1868,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1899,7 +1931,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "interval": "", "legendFormat": "{{ persistentvolumeclaim }}", "refId": "A" @@ -1919,6 +1951,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1932,6 +1965,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -1994,7 +2028,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_used_bytes{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "interval": "", "legendFormat": "{{ persistentvolumeclaim }} - Used", "refId": "A" @@ -2005,7 +2039,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_capacity_bytes{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "hide": false, "interval": "", "legendFormat": "{{ persistentvolumeclaim }} - Capacity", @@ -2026,6 +2060,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2039,6 +2074,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 2, "pointSize": 5, @@ -2101,7 +2137,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "1 - sum(kubelet_volume_stats_inodes_used{namespace=~\"$namespace\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_inodes{namespace=~\"$namespace\"}) by (persistentvolumeclaim)", + "expr": "1 - sum(kubelet_volume_stats_inodes_used{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_inodes{namespace=~\"$namespace\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "interval": "", "legendFormat": "{{ persistentvolumeclaim }}", "refId": "A" @@ -2113,7 +2149,6 @@ ], "refresh": "30s", "schemaVersion": 38, - "style": "dark", "tags": [ "Kubernetes", "Prometheus" @@ -2124,7 +2159,7 @@ "current": { "selected": false, "text": "Prometheus", - "value": "Prometheus" + "value": "prometheus" }, "hide": 0, "includeAll": false, @@ -2138,6 +2173,34 @@ "skipUrlSync": false, "type": "datasource" }, + { + "current": { + "isNone": true, + "selected": false, + "text": "None", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(kube_node_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(kube_node_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": { "selected": true, @@ -2173,7 +2236,7 @@ }, { "current": { - "selected": true, + "selected": false, "text": "30s", "value": "30s" }, @@ -2255,6 +2318,6 @@ "timezone": "", "title": "Kubernetes / Views / Namespaces", "uid": "k8s_views_ns", - "version": 27, + "version": 28, "weekStart": "" } diff --git a/dashboards/k8s-views-nodes.json b/dashboards/k8s-views-nodes.json index 1287f08..cc916f5 100644 --- a/dashboards/k8s-views-nodes.json +++ b/dashboards/k8s-views-nodes.json @@ -134,6 +134,8 @@ }, "id": 7, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -146,7 +148,7 @@ "showThresholdMarkers": true, "text": {} }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -154,7 +156,7 @@ "uid": "${datasource}" }, "exemplar": false, - "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\"}[$__rate_interval]))", + "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "instant": true, "interval": "$resolution", "legendFormat": "", @@ -204,6 +206,8 @@ }, "id": 13, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -216,7 +220,7 @@ "showThresholdMarkers": true, "text": {} }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -224,7 +228,7 @@ "uid": "${datasource}" }, "exemplar": false, - "expr": "sum(node_memory_MemTotal_bytes{instance=\"$instance\"} - node_memory_MemAvailable_bytes{instance=\"$instance\"}) / sum(node_memory_MemTotal_bytes{instance=\"$instance\"})", + "expr": "sum(node_memory_MemTotal_bytes{instance=\"$instance\", cluster=~\"$cluster\"} - node_memory_MemAvailable_bytes{instance=\"$instance\", cluster=~\"$cluster\"}) / sum(node_memory_MemTotal_bytes{instance=\"$instance\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "", @@ -275,9 +279,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -285,7 +290,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(kube_pod_info{node=\"$node\"})", + "expr": "sum(kube_pod_info{node=\"$node\", cluster=~\"$cluster\"})", "interval": "", "legendFormat": "", "refId": "A" @@ -416,7 +421,7 @@ "showHeader": true, "sortBy": [] }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -424,7 +429,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "kube_pod_info{node=\"$node\"}", + "expr": "kube_pod_info{node=\"$node\", cluster=~\"$cluster\"}", "format": "table", "interval": "", "legendFormat": "", @@ -560,9 +565,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -570,7 +576,7 @@ "uid": "${datasource}" }, "exemplar": false, - "expr": "sum(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\"}[$__rate_interval]))", + "expr": "sum(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "instant": true, "interval": "$resolution", "legendFormat": "", @@ -622,9 +628,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -632,7 +639,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(machine_cpu_cores{node=\"$node\"})", + "expr": "sum(machine_cpu_cores{node=\"$node\", cluster=~\"$cluster\"})", "interval": "$resolution", "legendFormat": "", "refId": "A" @@ -683,9 +690,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -693,7 +701,7 @@ "uid": "${datasource}" }, "exemplar": false, - "expr": "sum(node_memory_MemTotal_bytes{instance=\"$instance\"} - node_memory_MemAvailable_bytes{instance=\"$instance\"})", + "expr": "sum(node_memory_MemTotal_bytes{instance=\"$instance\", cluster=~\"$cluster\"} - node_memory_MemAvailable_bytes{instance=\"$instance\", cluster=~\"$cluster\"})", "instant": true, "interval": "", "legendFormat": "", @@ -745,9 +753,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -755,7 +764,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "machine_memory_bytes{node=\"$node\"}", + "expr": "machine_memory_bytes{node=\"$node\", cluster=~\"$cluster\"}", "instant": false, "interval": "", "legendFormat": "", @@ -815,9 +824,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -825,7 +835,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_time_seconds{instance=\"$instance\"} - node_boot_time_seconds{instance=\"$instance\"}", + "expr": "node_time_seconds{instance=\"$instance\", cluster=~\"$cluster\"} - node_boot_time_seconds{instance=\"$instance\", cluster=~\"$cluster\"}", "instant": false, "interval": "", "legendFormat": "", @@ -863,6 +873,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -941,7 +952,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "avg(rate(node_cpu_seconds_total{instance=\"$instance\"}[$__rate_interval]) * 100) by (mode)", + "expr": "avg(rate(node_cpu_seconds_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]) * 100) by (mode)", "hide": false, "instant": false, "interval": "$resolution", @@ -963,6 +974,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1040,7 +1052,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_memory_MemTotal_bytes{instance=\"$instance\"} - node_memory_MemFree_bytes{instance=\"$instance\"} - (node_memory_Cached_bytes{instance=\"$instance\"} + node_memory_Buffers_bytes{instance=\"$instance\"})", + "expr": "node_memory_MemTotal_bytes{instance=\"$instance\", cluster=~\"$cluster\"} - node_memory_MemFree_bytes{instance=\"$instance\", cluster=~\"$cluster\"} - (node_memory_Cached_bytes{instance=\"$instance\", cluster=~\"$cluster\"} + node_memory_Buffers_bytes{instance=\"$instance\", cluster=~\"$cluster\"})", "instant": false, "interval": "$resolution", "legendFormat": "RAM Used", @@ -1052,7 +1064,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_memory_MemTotal_bytes{instance=\"$instance\"}", + "expr": "node_memory_MemTotal_bytes{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "RAM Total", @@ -1064,7 +1076,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_memory_Cached_bytes{instance=\"$instance\"}", + "expr": "node_memory_Cached_bytes{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "RAM Cache", @@ -1076,7 +1088,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_memory_Buffers_bytes{instance=\"$instance\"}", + "expr": "node_memory_Buffers_bytes{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "RAM Buffer", @@ -1088,7 +1100,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_memory_MemFree_bytes{instance=\"$instance\"}", + "expr": "node_memory_MemFree_bytes{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "RAM Free", @@ -1100,7 +1112,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_memory_SwapTotal_bytes{instance=\"$instance\"} - node_memory_SwapFree_bytes{instance=\"$instance\"}", + "expr": "node_memory_SwapTotal_bytes{instance=\"$instance\", cluster=~\"$cluster\"} - node_memory_SwapFree_bytes{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "SWAP Used", @@ -1112,7 +1124,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "node_memory_SwapTotal_bytes{instance=\"$instance\"}", + "expr": "node_memory_SwapTotal_bytes{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "SWAP Total", @@ -1133,6 +1145,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "CPU Cores", @@ -1208,7 +1221,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(container_cpu_usage_seconds_total{node=\"$node\", image!=\"\"}[$__rate_interval])) by (pod)", + "expr": "sum(rate(container_cpu_usage_seconds_total{node=\"$node\", image!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }}", "refId": "A" @@ -1228,6 +1241,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1303,7 +1317,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{node=\"$node\", image!=\"\"}) by (pod)", + "expr": "sum(container_memory_working_set_bytes{node=\"$node\", image!=\"\", cluster=~\"$cluster\"}) by (pod)", "interval": "$resolution", "legendFormat": "{{ pod }}", "refId": "A" @@ -1324,6 +1338,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "CPU CORES", @@ -1410,7 +1425,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(node_cpu_core_throttles_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "sum(rate(node_cpu_core_throttles_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Nb of cpu core throttles", "range": true, @@ -1448,6 +1463,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1525,7 +1541,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_load1{instance=\"$instance\"}", + "expr": "node_load1{instance=\"$instance\", cluster=~\"$cluster\"}", "interval": "$resolution", "legendFormat": "1m", "range": true, @@ -1538,7 +1554,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_load5{instance=\"$instance\"}", + "expr": "node_load5{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "5m", @@ -1552,7 +1568,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_load15{instance=\"$instance\"}", + "expr": "node_load15{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "15m", @@ -1574,6 +1590,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1648,7 +1665,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "rate(node_context_switches_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "rate(node_context_switches_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])", "interval": "$resolution", "intervalFactor": 1, "legendFormat": "Context switches", @@ -1662,7 +1679,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "rate(node_intr_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "rate(node_intr_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])", "hide": false, "interval": "$resolution", "legendFormat": "Interrupts", @@ -1684,6 +1701,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1761,7 +1779,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_filefd_maximum{instance=\"$instance\"}", + "expr": "node_filefd_maximum{instance=\"$instance\", cluster=~\"$cluster\"}", "instant": false, "interval": "$resolution", "legendFormat": "Maximum file descriptors", @@ -1774,7 +1792,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_filefd_allocated{instance=\"$instance\"}", + "expr": "node_filefd_allocated{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "instant": false, "interval": "$resolution", @@ -1796,6 +1814,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1874,7 +1893,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_timex_estimated_error_seconds{instance=\"$instance\"}", + "expr": "node_timex_estimated_error_seconds{instance=\"$instance\", cluster=~\"$cluster\"}", "instant": false, "interval": "$resolution", "intervalFactor": 1, @@ -1888,7 +1907,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_timex_maxerror_seconds{instance=\"$instance\"}", + "expr": "node_timex_maxerror_seconds{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "intervalFactor": 1, @@ -1928,6 +1947,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "BANDWIDTH", @@ -2004,7 +2024,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(node_network_receive_bytes_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "sum(rate(node_network_receive_bytes_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "In", "range": true, @@ -2017,7 +2037,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "- sum(rate(node_network_transmit_bytes_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "- sum(rate(node_network_transmit_bytes_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Out", "range": true, @@ -2038,6 +2058,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2113,7 +2134,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(node_network_receive_errs_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "sum(rate(node_network_receive_errs_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "In", "refId": "A" @@ -2125,7 +2146,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "- sum(rate(node_network_transmit_errs_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "- sum(rate(node_network_transmit_errs_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Out", "range": true, @@ -2146,6 +2167,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2222,7 +2244,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(node_network_receive_packets_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "sum(rate(node_network_receive_packets_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "In", "range": true, @@ -2235,7 +2257,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "- sum(rate(node_network_transmit_packets_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "- sum(rate(node_network_transmit_packets_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Out", "range": true, @@ -2256,6 +2278,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2331,7 +2354,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(node_network_receive_drop_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "sum(rate(node_network_receive_drop_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "hide": false, "interval": "$resolution", "legendFormat": "In", @@ -2343,7 +2366,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "- sum(rate(node_network_transmit_drop_total{instance=\"$instance\"}[$__rate_interval]))", + "expr": "- sum(rate(node_network_transmit_drop_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]))", "hide": false, "interval": "$resolution", "legendFormat": "Out", @@ -2364,6 +2387,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2440,7 +2464,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_netstat_Tcp_CurrEstab{instance=\"$instance\"}", + "expr": "node_netstat_Tcp_CurrEstab{instance=\"$instance\", cluster=~\"$cluster\"}", "instant": false, "interval": "$resolution", "legendFormat": "TCP Currently Established", @@ -2461,6 +2485,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2553,7 +2578,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_nf_conntrack_entries{instance=\"$instance\"}", + "expr": "node_nf_conntrack_entries{instance=\"$instance\", cluster=~\"$cluster\"}", "instant": false, "interval": "$resolution", "legendFormat": "NF Conntrack entries", @@ -2566,7 +2591,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "node_nf_conntrack_entries_limit{instance=\"$instance\"}", + "expr": "node_nf_conntrack_entries_limit{instance=\"$instance\", cluster=~\"$cluster\"}", "hide": false, "interval": "$resolution", "legendFormat": "NF Conntrack limit", @@ -2605,6 +2630,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2682,7 +2708,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{node=\"$node\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "interval": "$resolution", "legendFormat": "{{ persistentvolumeclaim }}", "range": true, @@ -2773,7 +2799,7 @@ "showHeader": true, "sortBy": [] }, - "pluginVersion": "10.1.5", + "pluginVersion": "10.2.2", "targets": [ { "datasource": { @@ -2781,7 +2807,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\"}) by (persistentvolumeclaim)", + "expr": "sum(kubelet_volume_stats_used_bytes{node=\"$node\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "format": "table", "hide": false, "interval": "", @@ -2794,7 +2820,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(kubelet_volume_stats_capacity_bytes{node=\"$node\"}) by (persistentvolumeclaim) ", + "expr": "sum(kubelet_volume_stats_capacity_bytes{node=\"$node\", cluster=~\"$cluster\"}) by (persistentvolumeclaim)", "format": "table", "hide": false, "interval": "", @@ -2865,6 +2891,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2942,7 +2969,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(kubelet_volume_stats_inodes_used{node=\"$node\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_inodes{node=\"$node\"}) by (persistentvolumeclaim) * 100", + "expr": "sum(kubelet_volume_stats_inodes_used{node=\"$node\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) / sum(kubelet_volume_stats_inodes{node=\"$node\", cluster=~\"$cluster\"}) by (persistentvolumeclaim) * 100", "interval": "$resolution", "legendFormat": "{{ persistentvolumeclaim }}", "range": true, @@ -2980,6 +3007,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3057,7 +3085,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "100 - ((node_filesystem_avail_bytes{instance=\"$instance\"} * 100) / node_filesystem_size_bytes{instance=\"$instance\"})", + "expr": "100 - ((node_filesystem_avail_bytes{instance=\"$instance\", cluster=~\"$cluster\"} * 100) / node_filesystem_size_bytes{instance=\"$instance\", cluster=~\"$cluster\"})", "hide": false, "interval": "$resolution", "legendFormat": "{{ mountpoint }}", @@ -3079,6 +3107,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3156,7 +3185,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "100 - (node_filesystem_files_free{instance=\"$instance\"} / node_filesystem_files{instance=\"$instance\"} * 100)", + "expr": "100 - (node_filesystem_files_free{instance=\"$instance\", cluster=~\"$cluster\"} / node_filesystem_files{instance=\"$instance\", cluster=~\"$cluster\"} * 100)", "hide": false, "interval": "$resolution", "legendFormat": "{{ mountpoint }}", @@ -3178,6 +3207,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3255,7 +3285,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "rate(node_disk_read_bytes_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "rate(node_disk_read_bytes_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])", "interval": "$resolution", "legendFormat": "{{device}}", "range": true, @@ -3276,6 +3306,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3353,7 +3384,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "rate(node_disk_written_bytes_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "rate(node_disk_written_bytes_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])", "hide": false, "interval": "$resolution", "legendFormat": "{{device}}", @@ -3375,6 +3406,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3452,7 +3484,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "rate(node_disk_reads_completed_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "rate(node_disk_reads_completed_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])", "interval": "$resolution", "legendFormat": "{{device}}", "range": true, @@ -3473,6 +3505,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3550,7 +3583,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "rate(node_disk_writes_completed_total{instance=\"$instance\"}[$__rate_interval])", + "expr": "rate(node_disk_writes_completed_total{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval])", "hide": false, "interval": "$resolution", "legendFormat": "{{device}}", @@ -3572,6 +3605,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3649,7 +3683,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "rate(node_disk_io_now{instance=\"$instance\"}[$__rate_interval]) ", + "expr": "rate(node_disk_io_now{instance=\"$instance\", cluster=~\"$cluster\"}[$__rate_interval]) ", "interval": "$resolution", "legendFormat": "{{device}}", "range": true, @@ -3670,6 +3704,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -3747,7 +3782,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(node_filesystem_device_error{instance=\"$instance\"}) by (mountpoint)", + "expr": "sum(node_filesystem_device_error{instance=\"$instance\", cluster=~\"$cluster\"}) by (mountpoint)", "interval": "$resolution", "legendFormat": "{{ mountpoint }}", "range": true, @@ -3760,7 +3795,6 @@ ], "refresh": "30s", "schemaVersion": 38, - "style": "dark", "tags": [ "Kubernetes", "Prometheus" @@ -3787,7 +3821,35 @@ }, { "current": { - "selected": true, + "isNone": true, + "selected": false, + "text": "None", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(kube_node_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(kube_node_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, + { + "current": { + "selected": false, "text": "30s", "value": "30s" }, @@ -3894,6 +3956,6 @@ "timezone": "", "title": "Kubernetes / Views / Nodes", "uid": "k8s_views_nodes", - "version": 21, + "version": 22, "weekStart": "" } diff --git a/dashboards/k8s-views-pods.json b/dashboards/k8s-views-pods.json index 90711d2..b4472f7 100644 --- a/dashboards/k8s-views-pods.json +++ b/dashboards/k8s-views-pods.json @@ -155,7 +155,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\"}", + "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}", "instant": true, "interval": "", "legendFormat": "{{ created_by_kind }}: {{ created_by_name }}", @@ -223,7 +223,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\"}", + "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}", "instant": true, "interval": "", "legendFormat": "{{ node }}", @@ -285,7 +285,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\"}", + "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}", "instant": true, "interval": "", "legendFormat": "{{ pod_ip }}", @@ -347,7 +347,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\", priority_class!=\"\"}", + "expr": "kube_pod_info{namespace=\"$namespace\", pod=\"$pod\", priority_class!=\"\", cluster=~\"$cluster\"}", "format": "time_series", "instant": true, "interval": "", @@ -443,7 +443,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_pod_status_qos_class{namespace=\"$namespace\", pod=\"$pod\"} > 0", + "expr": "kube_pod_status_qos_class{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"} > 0", "instant": true, "interval": "", "legendFormat": "{{ qos_class }}", @@ -507,7 +507,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_pod_container_status_last_terminated_reason{namespace=\"$namespace\", pod=\"$pod\"}", + "expr": "kube_pod_container_status_last_terminated_reason{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}", "instant": true, "interval": "", "legendFormat": "{{ reason }}", @@ -575,7 +575,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_pod_container_status_last_terminated_exitcode{namespace=\"$namespace\", pod=\"$pod\"}", + "expr": "kube_pod_container_status_last_terminated_exitcode{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}", "instant": true, "interval": "", "legendFormat": "__auto", @@ -678,7 +678,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}[$__rate_interval])) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\"})", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "Requests", @@ -750,7 +750,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}[$__rate_interval])) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\"})", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "Limits", @@ -826,7 +826,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\"})", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\", cluster=~\"$cluster\"})", "instant": true, "interval": "$resolution", "legendFormat": "Requests", @@ -898,7 +898,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\"}) ", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\", cluster=~\"$cluster\"}) ", "instant": true, "interval": "$resolution", "legendFormat": "Limits", @@ -1017,7 +1017,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\"}) by (container)", + "expr": "sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "format": "table", "instant": true, "interval": "", @@ -1032,7 +1032,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\"}) by (container)", + "expr": "sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "format": "table", "instant": true, "interval": "", @@ -1047,7 +1047,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\"}) by (container)", + "expr": "sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "format": "table", "instant": true, "interval": "", @@ -1061,7 +1061,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\"}) by (container)", + "expr": "sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "format": "table", "instant": true, "interval": "", @@ -1075,7 +1075,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\"}[$__rate_interval])) by (container)", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (container)", "format": "table", "hide": false, "instant": true, @@ -1090,7 +1090,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\"}) by (container)", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\", cluster=~\"$cluster\"}) by (container)", "format": "table", "hide": false, "instant": true, @@ -1292,7 +1292,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}[$__rate_interval])) by (container) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\"}) by (container)", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (container) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "interval": "$resolution", "legendFormat": "{{ container }} REQUESTS", "range": true, @@ -1304,7 +1304,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}[$__rate_interval])) by (container) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\"}) by (container)", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (container) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"cpu\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "hide": false, "legendFormat": "{{ container }} LIMITS", "range": true, @@ -1420,7 +1420,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}) by (container) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\"}) by (container)", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}) by (container) / sum(kube_pod_container_resource_requests{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "interval": "", "legendFormat": "{{ container }} REQUESTS", "range": true, @@ -1432,7 +1432,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\"}) by (container) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\"}) by (container)", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", cluster=~\"$cluster\"}) by (container) / sum(kube_pod_container_resource_limits{namespace=\"$namespace\", pod=\"$pod\", resource=\"memory\", job=~\"$job\", cluster=~\"$cluster\"}) by (container)", "hide": false, "legendFormat": "{{ container }} LIMITS", "range": true, @@ -1555,7 +1555,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\"}[$__rate_interval])) by (container)", + "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (container)", "interval": "$resolution", "legendFormat": "{{ container }}", "range": true, @@ -1661,7 +1661,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\"}) by (container)", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\", cluster=~\"$cluster\"}) by (container)", "interval": "", "legendFormat": "{{ container }}", "range": true, @@ -1723,8 +1723,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1770,7 +1769,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(rate(container_cpu_cfs_throttled_seconds_total{namespace=~\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\"}[$__rate_interval])) by (container)", + "expr": "sum(rate(container_cpu_cfs_throttled_seconds_total{namespace=~\"$namespace\", pod=\"$pod\", image!=\"\", container!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (container)", "interval": "$resolution", "legendFormat": "{{ container }}", "range": true, @@ -1846,8 +1845,7 @@ "mode": "percentage", "steps": [ { - "color": "red", - "value": null + "color": "red" }, { "color": "yellow", @@ -1899,7 +1897,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(increase(container_oom_events_total{namespace=\"${namespace}\", pod=\"${pod}\", container!=\"\"}[$__rate_interval])) by (container)", + "expr": "sum(increase(container_oom_events_total{namespace=\"${namespace}\", pod=\"${pod}\", container!=\"\", cluster=~\"$cluster\"}[$__rate_interval])) by (container)", "interval": "", "legendFormat": "{{ container }}", "range": true, @@ -1962,8 +1960,7 @@ "mode": "percentage", "steps": [ { - "color": "red", - "value": null + "color": "red" }, { "color": "yellow", @@ -2015,7 +2012,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=~\"${namespace}\", pod=\"${pod}\", container!=\"\", job=~\"$job\"}[$__rate_interval])) by (container)", + "expr": "sum(increase(kube_pod_container_status_restarts_total{namespace=~\"${namespace}\", pod=\"${pod}\", container!=\"\", job=~\"$job\", cluster=~\"$cluster\"}[$__rate_interval])) by (container)", "interval": "", "legendFormat": "{{ container }}", "range": true, @@ -2098,8 +2095,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2138,7 +2134,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "sum(rate(container_network_receive_bytes_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Received", "refId": "A" @@ -2149,7 +2145,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "- sum(rate(container_network_transmit_bytes_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "- sum(rate(container_network_transmit_bytes_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Transmitted", "refId": "B" @@ -2205,8 +2201,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2245,7 +2240,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(container_network_receive_packets_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "sum(rate(container_network_receive_packets_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Received", "refId": "A" @@ -2256,7 +2251,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "- sum(rate(container_network_transmit_packets_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "- sum(rate(container_network_transmit_packets_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Transmitted", "refId": "B" @@ -2312,8 +2307,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2352,7 +2346,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(container_network_receive_packets_dropped_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "sum(rate(container_network_receive_packets_dropped_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Received", "refId": "A" @@ -2363,7 +2357,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "- sum(rate(container_network_transmit_packets_dropped_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "- sum(rate(container_network_transmit_packets_dropped_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Transmitted", "refId": "B" @@ -2419,8 +2413,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2459,7 +2452,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "sum(rate(container_network_receive_errors_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "sum(rate(container_network_receive_errors_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Received", "refId": "A" @@ -2470,7 +2463,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "- sum(rate(container_network_transmit_errors_total{namespace=\"$namespace\", pod=\"$pod\"}[$__rate_interval]))", + "expr": "- sum(rate(container_network_transmit_errors_total{namespace=\"$namespace\", pod=\"$pod\", cluster=~\"$cluster\"}[$__rate_interval]))", "interval": "$resolution", "legendFormat": "Transmitted", "refId": "B" @@ -2492,7 +2485,7 @@ "current": { "selected": false, "text": "Prometheus", - "value": "Prometheus" + "value": "prometheus" }, "hide": 0, "includeAll": false, @@ -2506,6 +2499,34 @@ "skipUrlSync": false, "type": "datasource" }, + { + "current": { + "isNone": true, + "selected": false, + "text": "None", + "value": "" + }, + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "definition": "label_values(kube_node_info,cluster)", + "hide": 0, + "includeAll": false, + "multi": false, + "name": "cluster", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(kube_node_info,cluster)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "type": "query" + }, { "current": { "selected": false, @@ -2566,7 +2587,7 @@ }, { "current": { - "selected": true, + "selected": false, "text": "30s", "value": "30s" }, @@ -2648,6 +2669,6 @@ "timezone": "", "title": "Kubernetes / Views / Pods", "uid": "k8s_views_pods", - "version": 23, + "version": 24, "weekStart": "" }