anobre/openshift-resource-governance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Prometheus queries for pod name matching

Browse Source 
- 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
This commit is contained in:
Anderson
2025-10-01 14:53:40 -03:00
parent 3df8d6bd42
commit 35fed5eb01
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/services/historical_analysis.py
View File

@@ -94,7 +94,7 @@ class HistoricalAnalysisService:
# Query for CPU usage rate # Query for CPU usage rate
cpu_query = f''' cpu_query = f'''
rate(container_cpu_usage_seconds_total{{ rate(container_cpu_usage_seconds_total{{
pod="{pod.name}", pod=~"{pod.name}.*",
namespace="{pod.namespace}", namespace="{pod.namespace}",
container="{container_name}", container="{container_name}",
container!="POD", container!="POD",
@@ -105,7 +105,7 @@ class HistoricalAnalysisService:
# Query for CPU requests # Query for CPU requests
cpu_requests_query = f''' cpu_requests_query = f'''
kube_pod_container_resource_requests{{ kube_pod_container_resource_requests{{
pod="{pod.name}", pod=~"{pod.name}.*",
namespace="{pod.namespace}", namespace="{pod.namespace}",
resource="cpu" resource="cpu"
}} }}
@@ -114,7 +114,7 @@ class HistoricalAnalysisService:
# Query for CPU limits # Query for CPU limits
cpu_limits_query = f''' cpu_limits_query = f'''
kube_pod_container_resource_limits{{ kube_pod_container_resource_limits{{
pod="{pod.name}", pod=~"{pod.name}.*",
namespace="{pod.namespace}", namespace="{pod.namespace}",
resource="cpu" resource="cpu"
}} }}
@@ -154,7 +154,7 @@ class HistoricalAnalysisService:
# Query for memory usage # Query for memory usage
memory_query = f''' memory_query = f'''
container_memory_working_set_bytes{{ container_memory_working_set_bytes{{
pod="{pod.name}", pod=~"{pod.name}.*",
namespace="{pod.namespace}", namespace="{pod.namespace}",
container="{container_name}", container="{container_name}",
container!="POD", container!="POD",
@@ -165,7 +165,7 @@ class HistoricalAnalysisService:
# Query for memory requests # Query for memory requests
memory_requests_query = f''' memory_requests_query = f'''
kube_pod_container_resource_requests{{ kube_pod_container_resource_requests{{
pod="{pod.name}", pod=~"{pod.name}.*",
namespace="{pod.namespace}", namespace="{pod.namespace}",
resource="memory" resource="memory"
}} }}
@@ -174,7 +174,7 @@ class HistoricalAnalysisService:
# Query for memory limits # Query for memory limits
memory_limits_query = f''' memory_limits_query = f'''
kube_pod_container_resource_limits{{ kube_pod_container_resource_limits{{
pod="{pod.name}", pod=~"{pod.name}.*",
namespace="{pod.namespace}", namespace="{pod.namespace}",
resource="memory" resource="memory"
}} }}