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

feat: restore real PromQL queries for CPU and memory utilization with Thanos

Browse Source
This commit is contained in:
Anderson
2025-10-06 14:56:08 -03:00
parent bad79ac4b7
commit 2ca1d29976
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/core/thanos_client.py
View File

@@ -146,11 +146,11 @@ class ThanosClient:
end_time = datetime.now() end_time = datetime.now()
start_time = end_time - timedelta(days=days) start_time = end_time - timedelta(days=days)
# CPU utilization trend - simplified # CPU utilization trend - real cluster data
cpu_query = "up" cpu_query = "avg(rate(container_cpu_usage_seconds_total{container!=\"POD\",container!=\"\"}[5m])) by (cluster)"
# Memory utilization trend - simplified # Memory utilization trend - real cluster data
memory_query = "up" memory_query = "avg(container_memory_working_set_bytes{container!=\"POD\",container!=\"\"}) by (cluster)"
cpu_data = self.query_range( cpu_data = self.query_range(
query=cpu_query, query=cpu_query,
@@ -188,23 +188,23 @@ class ThanosClient:
end_time = datetime.now() end_time = datetime.now()
start_time = end_time - timedelta(days=days) start_time = end_time - timedelta(days=days)
# CPU requests trend # CPU requests trend - real data
cpu_requests_query = f"sum(kube_pod_container_resource_requests{{namespace=\"{namespace}\", resource=\"cpu\"}}) by (namespace)" cpu_requests_query = f"sum(kube_pod_container_resource_requests{{namespace=\"{namespace}\", resource=\"cpu\"}}) by (namespace)"
# Memory requests trend # Memory requests trend - real data
memory_requests_query = f"sum(kube_pod_container_resource_requests{{namespace=\"{namespace}\", resource=\"memory\"}}) by (namespace)" memory_requests_query = f"sum(kube_pod_container_resource_requests{{namespace=\"{namespace}\", resource=\"memory\"}}) by (namespace)"
cpu_requests = self.query_range( cpu_requests = self.query_range(
query=cpu_requests_query, query=cpu_requests_query,
start=start_time.isoformat(), start=int(start_time.timestamp()),
end=end_time.isoformat(), end=int(end_time.timestamp()),
step="1h" step="1h"
) )
memory_requests = self.query_range( memory_requests = self.query_range(
query=memory_requests_query, query=memory_requests_query,
start=start_time.isoformat(), start=int(start_time.timestamp()),
end=end_time.isoformat(), end=int(end_time.timestamp()),
step="1h" step="1h"
) )
@@ -236,15 +236,15 @@ class ThanosClient:
cpu_overcommit = self.query_range( cpu_overcommit = self.query_range(
query=cpu_overcommit_query, query=cpu_overcommit_query,
start=start_time.isoformat(), start=int(start_time.timestamp()),
end=end_time.isoformat(), end=int(end_time.timestamp()),
step="1h" step="1h"
) )
memory_overcommit = self.query_range( memory_overcommit = self.query_range(
query=memory_overcommit_query, query=memory_overcommit_query,
start=start_time.isoformat(), start=int(start_time.timestamp()),
end=end_time.isoformat(), end=int(end_time.timestamp()),
step="1h" step="1h"
) )
@@ -276,15 +276,15 @@ class ThanosClient:
cpu_workloads = self.query_range( cpu_workloads = self.query_range(
query=cpu_query, query=cpu_query,
start=start_time.isoformat(), start=int(start_time.timestamp()),
end=end_time.isoformat(), end=int(end_time.timestamp()),
step="1h" step="1h"
) )
memory_workloads = self.query_range( memory_workloads = self.query_range(
query=memory_query, query=memory_query,
start=start_time.isoformat(), start=int(start_time.timestamp()),
end=end_time.isoformat(), end=int(end_time.timestamp()),
step="1h" step="1h"
) )