From 6700a5d8626618a64e0cb9cb3ee718a5cc585b6c Mon Sep 17 00:00:00 2001 From: Tyson Moyes Date: Tue, 25 Mar 2025 18:07:54 -0400 Subject: [PATCH 1/3] Updated memory_query and cpu_query to not use deprecated version, which no longer works in Azure Monitored Prometheus --- .../metrics_service/prometheus_metrics_service.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py index 9edc5fcc..39e1f93c 100644 --- a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py +++ b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py @@ -237,11 +237,13 @@ async def get_cluster_summary(self) -> Dict[str, Any]: # use this for queries with no labels. turn ', cluster="xxx"' to 'cluster="xxx"' single_cluster_label = cluster_label.replace(",", "") + memory_query = f""" - sum(max by (instance) (machine_memory_bytes{{ {single_cluster_label} }})) + sum(kube_node_status_capacity{{ resource='memory' {single_cluster_label} }}) """ + cpu_query = f""" - sum(max by (instance) (machine_cpu_cores{{ {single_cluster_label} }})) + sum(kube_node_status_capacity{{ resource='cpu' {single_cluster_label} }}) """ kube_system_requests_mem = f""" sum(max(kube_pod_container_resource_requests{{ namespace='kube-system', resource='memory' {cluster_label} }}) by (job, pod, container) ) From 8284b08b36d99d03b3cadcc9043efa0b331e8e53 Mon Sep 17 00:00:00 2001 From: Tyson Moyes Date: Thu, 26 Mar 2026 12:32:52 -0400 Subject: [PATCH 2/3] Fixing single quotes to double quotes per Coderabbit recommendation --- .../metrics_service/prometheus_metrics_service.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py index 68f596dc..a4e98980 100644 --- a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py +++ b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py @@ -254,17 +254,17 @@ async def get_cluster_summary(self) -> Dict[str, Any]: single_cluster_label = cluster_label.replace(",", "") memory_query = f""" - sum(kube_node_status_capacity{{ resource='memory' {single_cluster_label} }}) + sum(kube_node_status_capacity{{ resource="memory" {single_cluster_label} }}) """ cpu_query = f""" - sum(kube_node_status_capacity{{ resource='cpu' {single_cluster_label} }}) + sum(kube_node_status_capacity{{ resource="cpu" {single_cluster_label} }}) """ kube_system_requests_mem = f""" - sum(max(kube_pod_container_resource_requests{{ namespace='kube-system', resource='memory' {cluster_label} }}) by (job, pod, container) ) + sum(max(kube_pod_container_resource_requests{{ namespace="kube-system", resource="memory" {cluster_label} }}) by (job, pod, container) ) """ kube_system_requests_cpu = f""" - sum(max(kube_pod_container_resource_requests{{ namespace='kube-system', resource='cpu' {cluster_label} }}) by (job, pod, container) ) + sum(max(kube_pod_container_resource_requests{{ namespace="kube-system", resource="cpu" {cluster_label} }}) by (job, pod, container) ) """ try: cluster_memory_result = await self.query_and_validate(memory_query) From 433fca853ba47bb93f514e605435e906e273632b Mon Sep 17 00:00:00 2001 From: Tyson Moyes Date: Thu, 26 Mar 2026 12:44:42 -0400 Subject: [PATCH 3/3] Remove single_cluster_label, Coderabbit recommendation --- .../metrics_service/prometheus_metrics_service.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py index a4e98980..23a5b22f 100644 --- a/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py +++ b/robusta_krr/core/integrations/prometheus/metrics_service/prometheus_metrics_service.py @@ -250,15 +250,12 @@ async def query_and_validate(self, prom_query) -> Any: async def get_cluster_summary(self) -> Dict[str, Any]: cluster_label = self.get_prometheus_cluster_label() - # use this for queries with no labels. turn ', cluster="xxx"' to 'cluster="xxx"' - single_cluster_label = cluster_label.replace(",", "") - memory_query = f""" - sum(kube_node_status_capacity{{ resource="memory" {single_cluster_label} }}) + sum(kube_node_status_capacity{{ resource="memory" {cluster_label} }}) """ cpu_query = f""" - sum(kube_node_status_capacity{{ resource="cpu" {single_cluster_label} }}) + sum(kube_node_status_capacity{{ resource="cpu" {cluster_label} }}) """ kube_system_requests_mem = f""" sum(max(kube_pod_container_resource_requests{{ namespace="kube-system", resource="memory" {cluster_label} }}) by (job, pod, container) )