fix prometheus queries for new prom vsn

pluralsh · Sep 18, 2022 · 0aa96fe · 0aa96fe
1 parent 89abee2
commit 0aa96fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/assets/src/components/kubernetes/Node.js b/assets/src/components/kubernetes/Node.js
@@ -454,6 +454,8 @@ function SaturationGraphs({ cpu, mem }) {
 
     const { cpuUtilization, memUtilization } = data
 
+    if (!cpuUtilization[0] || !memUtilization[0]) return null
+
     return ([
       { id: 'cpu utilization', data: cpuUtilization[0].values.map(datum) },
       { id: 'memory utilization', data: memUtilization[0].values.map(datum) },

diff --git a/assets/src/components/kubernetes/constants.js b/assets/src/components/kubernetes/constants.js
@@ -15,20 +15,20 @@ export const ScalingTypes = {
 }
 
 export const ClusterMetrics = {
-  CPU: 'sum (rate (container_cpu_usage_seconds_total{id="/"}[5m])) / sum (machine_cpu_cores)',
-  Memory: 'sum (container_memory_working_set_bytes{id="/"}) / sum (machine_memory_bytes)',
+  CPU: 'sum (rate (container_cpu_usage_seconds_total{image!=""}[5m])) / sum (machine_cpu_cores)',
+  Memory: 'sum (container_memory_working_set_bytes{image!=""}) / sum (machine_memory_bytes)',
   CPURequests: 'sum(kube_pod_container_resource_requests{resource="cpu"})',
   MemoryRequests: 'sum(kube_pod_container_resource_requests{resource="memory"})',
   CPULimits: 'sum(kube_pod_container_resource_limits{resource="cpu"})',
   MemoryLimits: 'sum(kube_pod_container_resource_limits{resource="memory"})',
   Pods: 'count(kube_pod_info)',
-  CPUUsage: 'sum(rate (container_cpu_usage_seconds_total{id="/"}[5m]))',
-  MemUsage: 'sum(container_memory_working_set_bytes{id="/"})',
+  CPUUsage: 'sum(rate (container_cpu_usage_seconds_total{image!=""}[5m]))',
+  MemUsage: 'sum(container_memory_working_set_bytes{image!=""})',
 }
 
 export const NodeMetrics = {
-  CPU: 'sum (rate (container_cpu_usage_seconds_total{id="/", node="{instance}"}[5m])) / sum (machine_cpu_cores{node="{instance}"})',
-  Memory: 'sum (container_memory_working_set_bytes{id="/", node="{instance}"}) / sum (machine_memory_bytes{node="{instance}"})',
-  CPUUsage: 'sum(rate (container_cpu_usage_seconds_total{id="/", node="{instance}"}[5m]))',
-  MemUsage: 'sum(container_memory_working_set_bytes{id="/", node="{instance}"})',
+  CPU: 'sum (rate (container_cpu_usage_seconds_total{image!="", node="{instance}"}[5m])) / sum (machine_cpu_cores{node="{instance}"})',
+  Memory: 'sum (container_memory_working_set_bytes{image!="", node="{instance}"}) / sum (machine_memory_bytes{node="{instance}"})',
+  CPUUsage: 'sum(rate (container_cpu_usage_seconds_total{image!="", node="{instance}"}[5m]))',
+  MemUsage: 'sum(container_memory_working_set_bytes{image!="", node="{instance}"})',
 }