diff --git a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/worker-node-utilization.json b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/worker-node-utilization.json index 0a6d2c83..a7d04e04 100644 --- a/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/worker-node-utilization.json +++ b/helm/dashboards/charts/private_dashboards_mz/dashboards/shared/private/worker-node-utilization.json @@ -1290,7 +1290,7 @@ "sortBy": [ { "desc": true, - "displayName": "CPU requests utilization" + "displayName": "Memory requests utilization" } ] }, @@ -1303,7 +1303,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(\n kube_node_role{role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"memory\"}) by (node)\n /\n sum(machine_memory_bytes{cluster_id=\"$cluster\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", + "expr": "sum(\n kube_node_role{cluster_id=\"$cluster\",role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"memory\"}) by (node)\n /\n sum(machine_memory_bytes{cluster_id=\"$cluster\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", "format": "table", "instant": true, "legendFormat": "__auto", @@ -1317,7 +1317,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(\n kube_node_role{role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"memory\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", + "expr": "sum(\n kube_node_role{cluster_id=\"$cluster\",role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"memory\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", "format": "table", "hide": false, "instant": true, @@ -1332,7 +1332,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(\n kube_node_role{role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"cpu\"}) by (node)\n /\n sum(machine_cpu_cores{cluster_id=\"$cluster\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", + "expr": "sum(\n kube_node_role{cluster_id=\"$cluster\",role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"cpu\"}) by (node)\n /\n sum(machine_cpu_cores{cluster_id=\"$cluster\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", "format": "table", "hide": false, "instant": true, @@ -1347,13 +1347,28 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(\n kube_node_role{role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"cpu\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", + "expr": "sum(\n kube_node_role{cluster_id=\"$cluster\",role=\"worker\"} * 0\n + on(node) group_left()\n (\n sum(kube_pod_container_resource_requests{cluster_id=\"$cluster\",resource=\"cpu\"}) by (node)\n )\n) without (app, cluster_id, cluster_type, container, customer, endpoint, installation, instance, job, namespace, organization, pipeline, pod, provider, service, service_priority)", "format": "table", "hide": false, "instant": true, "legendFormat": "__auto", "range": false, "refId": "cpu_absolute" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum(\n kube_node_role{cluster_id=\"$cluster\",role=\"worker\"} * 0\n + on(node) group_left(zone)\n (\n kube_node_labels{cluster_id=\"$cluster\"}\n )\n) without (cluster_id)", + "format": "table", + "hide": false, + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "zone" } ], "title": "Worker node resource requests", @@ -1384,23 +1399,81 @@ "Time 2": true, "Time 3": true, "Time 4": true, + "Time 5": true, + "Value #zone": true, + "app": true, + "cluster_type": true, + "container": true, + "customer": true, + "endpoint": true, + "installation": true, + "instance": true, + "job": true, + "namespace": true, + "organization": true, + "pipeline": true, + "pod": true, + "provider": true, "region 1": true, "region 2": true, "region 3": true, "region 4": true, + "region 5": true, "role 1": true, "role 2": true, "role 3": true, - "role 4": true + "role 4": true, + "role 5": true, + "service": true, + "service_priority": true }, "includeByName": {}, - "indexByName": {}, + "indexByName": { + "Time 1": 2, + "Time 2": 6, + "Time 3": 10, + "Time 4": 14, + "Time 5": 18, + "Value #cpu_absolute": 17, + "Value #cpu_relative": 13, + "Value #mem_absolute": 9, + "Value #mem_relative": 5, + "Value #zone": 36, + "app": 19, + "cluster_type": 20, + "container": 21, + "customer": 22, + "endpoint": 23, + "installation": 24, + "instance": 25, + "job": 26, + "namespace": 27, + "node": 0, + "organization": 28, + "pipeline": 29, + "pod": 30, + "provider": 31, + "region 1": 3, + "region 2": 7, + "region 3": 11, + "region 4": 15, + "region 5": 32, + "role 1": 4, + "role 2": 8, + "role 3": 12, + "role 4": 16, + "role 5": 33, + "service": 34, + "service_priority": 35, + "zone": 1 + }, "renameByName": { "Value #cpu_absolute": "CPU req total", "Value #cpu_relative": "CPU requests utilization", "Value #mem_absolute": "Mem req total", "Value #mem_relative": "Memory requests utilization", - "node": "Node" + "node": "Node", + "zone": "Zone" } } } @@ -1659,6 +1732,7 @@ "name": "datasource", "options": [], "query": "prometheus", + "queryValue": "", "refresh": 1, "regex": "", "skipUrlSync": false,