From 35fed5eb011585212e5dbd6f46c1f41f8200330a Mon Sep 17 00:00:00 2001
From: andersonid <nobre.it@gmail.com>
Date: Wed, 1 Oct 2025 14:53:40 -0300
Subject: [PATCH] Fix Prometheus queries for pod name matching

- Use regex pattern pod=~"{pod.name}.*" instead of exact match
- This allows matching pods with suffixes like resource-governance-78b77cc868-gchx7
- Apply fix to both CPU and Memory queries for usage, requests, and limits
- Should resolve issue where resource-governance pod data was not being retrieved
---
 app/services/historical_analysis.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/services/historical_analysis.py b/app/services/historical_analysis.py
index bc1545d..18973d7 100644
--- a/app/services/historical_analysis.py
+++ b/app/services/historical_analysis.py
@@ -94,7 +94,7 @@ class HistoricalAnalysisService:
                 # Query for CPU usage rate
                 cpu_query = f'''
                 rate(container_cpu_usage_seconds_total{{
-                    pod="{pod.name}",
+                    pod=~"{pod.name}.*",
                     namespace="{pod.namespace}",
                     container="{container_name}",
                     container!="POD",
@@ -105,7 +105,7 @@ class HistoricalAnalysisService:
                 # Query for CPU requests
                 cpu_requests_query = f'''
                 kube_pod_container_resource_requests{{
-                    pod="{pod.name}",
+                    pod=~"{pod.name}.*",
                     namespace="{pod.namespace}",
                     resource="cpu"
                 }}
@@ -114,7 +114,7 @@ class HistoricalAnalysisService:
                 # Query for CPU limits
                 cpu_limits_query = f'''
                 kube_pod_container_resource_limits{{
-                    pod="{pod.name}",
+                    pod=~"{pod.name}.*",
                     namespace="{pod.namespace}",
                     resource="cpu"
                 }}
@@ -154,7 +154,7 @@ class HistoricalAnalysisService:
                 # Query for memory usage
                 memory_query = f'''
                 container_memory_working_set_bytes{{
-                    pod="{pod.name}",
+                    pod=~"{pod.name}.*",
                     namespace="{pod.namespace}",
                     container="{container_name}",
                     container!="POD",
@@ -165,7 +165,7 @@ class HistoricalAnalysisService:
                 # Query for memory requests
                 memory_requests_query = f'''
                 kube_pod_container_resource_requests{{
-                    pod="{pod.name}",
+                    pod=~"{pod.name}.*",
                     namespace="{pod.namespace}",
                     resource="memory"
                 }}
@@ -174,7 +174,7 @@ class HistoricalAnalysisService:
                 # Query for memory limits
                 memory_limits_query = f'''
                 kube_pod_container_resource_limits{{
-                    pod="{pod.name}",
+                    pod=~"{pod.name}.*",
                     namespace="{pod.namespace}",
                     resource="memory"
                 }}