Fix resource usage estimation (#1183)

giantswarm · May 15, 2024 · 61327fc · 61327fc
1 parent d691d5e
commit 61327fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix resource estimation recording rules for clusters that have more than 1 prometheus.
+
 ## [3.14.0] - 2024-05-15
 
 ### Added

diff --git a/...rometheus-rules/templates/recording-rules/monitoring.resource-usage-estimation.rules.yaml b/...rometheus-rules/templates/recording-rules/monitoring.resource-usage-estimation.rules.yaml
@@ -9,7 +9,7 @@ spec:
   groups:
   - name: monitoring.resource-usage-estimation.recording
     rules:
-    - expr: (count({__name__=~".+"}) by (cluster_id, job) / on(cluster_id) group_left prometheus_tsdb_head_series) * on(cluster_id) group_left sum(container_memory_usage_bytes{container="prometheus"}) by (cluster_id)
+    - expr: (count({__name__=~".+"}) by (cluster_id, job) / on(cluster_id) group_left prometheus_tsdb_head_series{instance="localhost:9090"}) * on(cluster_id) group_left sum(container_memory_usage_bytes{container="prometheus", namespace="kube-system"}) by (cluster_id)
       record: giantswarm:observability:monitoring:resource_usage_estimation:memory_usage_bytes
-    - expr: (count({__name__=~".+"}) by (cluster_id, job) / on(cluster_id) group_left prometheus_tsdb_head_series) * on(cluster_id) group_left sum(container_memory_working_set_bytes{container="prometheus"}) by (cluster_id)
+    - expr: (count({__name__=~".+"}) by (cluster_id, job) / on(cluster_id) group_left prometheus_tsdb_head_series{instance="localhost:9090"}) * on(cluster_id) group_left sum(container_memory_working_set_bytes{container="prometheus", namespace="kube-system"}) by (cluster_id)
       record: giantswarm:observability:monitoring:resource_usage_estimation:memory_working_set_bytes