From ce598f8e6933ddc7a89adf2de7484a619d5d3771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Sevilla?= Date: Wed, 13 Dec 2023 14:23:54 +0100 Subject: [PATCH] Fix node CPU query and remove round (#65) Signed-off-by: Raul Sevilla --- pkg/config/types.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/config/types.go b/pkg/config/types.go index 6d37927..b2c9020 100644 --- a/pkg/config/types.go +++ b/pkg/config/types.go @@ -51,8 +51,8 @@ type Config struct { } var prometheusQueries = map[string]string{ - "avg_cpu_usage_router_pods": "round(avg(avg_over_time(sum(irate(container_cpu_usage_seconds_total{name!='', namespace='openshift-ingress', pod=~'router-default.+'}[2m])) by (pod)[ELAPSED:]))*100, 1)/100", - "avg_memory_usage_router_pods_bytes": "round(avg(avg_over_time(sum(container_memory_working_set_bytes{name!='', namespace='openshift-ingress', pod=~'router-default.+'}) by (pod)[ELAPSED:]))*100,1)/100", - "avg_cpu_usage_router_nodes": `round(avg(avg_over_time(sum(irate(node_cpu_seconds_total{mode!~'idle|steal'}[2m]) and on (instance) label_replace(kube_pod_info{namespace='openshift-ingress'},'instance', '$1', 'node', '(.+)')) by (instance,mode)[ELAPSED:]))*100,1)/100`, - "avg_memory_usage_router_nodes_bytes": `round(avg(avg_over_time(sum(node_memory_MemTotal_bytes-node_memory_MemAvailable_bytes{mode!~'idle|steal'} and on (instance) label_replace(kube_pod_info{namespace='openshift-ingress'},'instance', '$1', 'node', '(.+)')) by (instance,mode)[ELAPSED:]))*100,1)/100`, + "avg_cpu_usage_router_pods": "avg(avg_over_time(sum(irate(container_cpu_usage_seconds_total{name!='', namespace='openshift-ingress', pod=~'router-default.+'}[2m])) by (pod)[ELAPSED:]))", + "avg_memory_usage_router_pods_bytes": "avg(avg_over_time(sum(container_memory_working_set_bytes{name!='', namespace='openshift-ingress', pod=~'router-default.+'}) by (pod)[ELAPSED:]))", + "avg_cpu_usage_router_nodes": "avg(avg_over_time(sum(irate(node_cpu_seconds_total{mode!~'idle|steal'}[2m]) and on (instance) label_replace(kube_pod_info{namespace='openshift-ingress'},'instance', '$1', 'node', '(.+)')) by (instance)[ELAPSED:]))", + "avg_memory_usage_router_nodes_bytes": "avg(avg_over_time(sum(node_memory_MemTotal_bytes-node_memory_MemAvailable_bytes and on (instance) label_replace(kube_pod_info{namespace='openshift-ingress'},'instance', '$1', 'node', '(.+)')) by (instance)[ELAPSED:]))", }