From 53b62b7c5090cd35e0d72063ed9015497f5a1d0c Mon Sep 17 00:00:00 2001 From: Patrick J McNerthney Date: Sun, 12 Jun 2022 21:30:33 -1000 Subject: [PATCH] Fix broken lens metrics. --- src/main/prometheus/lens.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/prometheus/lens.ts b/src/main/prometheus/lens.ts index e651a0a896..745ebc06c4 100644 --- a/src/main/prometheus/lens.ts +++ b/src/main/prometheus/lens.ts @@ -23,7 +23,7 @@ export class PrometheusLens extends PrometheusProvider { case "cluster": switch (queryName) { case "memoryUsage": - return `sum(node_memory_MemTotal_bytes - (node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes)) by (kubernetes_name)`.replace(/_bytes/g, `_bytes{kubernetes_node=~"${opts.nodes}"}`); + return `sum(node_memory_MemTotal_bytes - (node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes)) by (kubernetes_node)`.replace(/_bytes/g, `_bytes{kubernetes_node=~"${opts.nodes}"}`); case "workloadMemoryUsage": return `sum(container_memory_working_set_bytes{container!="POD",container!="",instance=~"${opts.nodes}"}) by (component)`; case "memoryRequests": @@ -69,7 +69,7 @@ export class PrometheusLens extends PrometheusProvider { case "cpuUsage": return `sum(rate(node_cpu_seconds_total{mode=~"user|system"}[${this.rateAccuracy}])) by(kubernetes_node)`; case "cpuCapacity": - return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`; + return `sum(kube_node_status_capacity{resource="cpu"}) by (node)`; case "cpuAllocatableCapacity": return `sum(kube_node_status_allocatable{resource="cpu"}) by (node)`; case "fsSize":