From 87e75150e7314ade907fdd0615282dfffb254ca4 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Wed, 1 Nov 2023 23:56:45 +0100
Subject: [PATCH] Modified resource queries

---
 .../test/argocd_values.yaml                   | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/argocd/prometheus-adapter/test/argocd_values.yaml b/argocd/prometheus-adapter/test/argocd_values.yaml
index 197e705..b5e07ad 100644
--- a/argocd/prometheus-adapter/test/argocd_values.yaml
+++ b/argocd/prometheus-adapter/test/argocd_values.yaml
@@ -5,18 +5,9 @@ prometheus-adapter:
   rules:
     resource:
       cpu:
-        containerQuery: |
-          sum by (<<.GroupBy>>) (
-            irate (
-                container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""}[4m]
-            )
-          )
-        nodeQuery: |
-          sum by (<<.GroupBy>>) (
-            irate(
-                node_cpu_usage_seconds_total{<<.LabelMatchers>>}[4m]
-            )
-          )
+        containerLabel: container
+        containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!=""}[3m])) by (<<.GroupBy>>)
+        nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) by (<<.GroupBy>>)
         resources:
           overrides:
             node:
@@ -25,23 +16,16 @@ prometheus-adapter:
               resource: namespace
             pod:
               resource: pod
-        containerLabel: container
       memory:
-        containerQuery: |
-          sum by (<<.GroupBy>>) (
-            container_memory_working_set_bytes{<<.LabelMatchers>>,container!="",pod!=""}
-          )
-        nodeQuery: |
-          sum by (<<.GroupBy>>) (
-            node_memory_working_set_bytes{<<.LabelMatchers>>}
-          )
+        containerLabel: container
+        containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>, container!=""}) by (<<.GroupBy>>)
+        nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
         resources:
           overrides:
-            node:
-              resource: node
-            namespace:
-              resource: namespace
-            pod:
-              resource: pod
-        containerLabel: container
+          node:
+            resource: node
+          namespace:
+            resource: namespace
+          pod:
+            resource: pod
       window: 5m
\ No newline at end of file