From 6881cacaf255ad838ba198a0b2cfd994d0cb6ff5 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Thu, 2 Nov 2023 09:00:35 +0100
Subject: [PATCH] Change queries

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

diff --git a/argocd/prometheus-adapter/test/argocd_values.yaml b/argocd/prometheus-adapter/test/argocd_values.yaml
index 4d8175c..d7bac31 100644
--- a/argocd/prometheus-adapter/test/argocd_values.yaml
+++ b/argocd/prometheus-adapter/test/argocd_values.yaml
@@ -6,9 +6,14 @@ prometheus-adapter:
   rules:
     resource:
       cpu:
-        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>>)
+        containerQuery: |
+          sum by (<<.GroupBy>>) (
+            rate(container_cpu_usage_seconds_total{container!="",<<.LabelMatchers>>}[3m])
+          )
+        nodeQuery: |
+          sum  by (<<.GroupBy>>) (
+            rate(node_cpu_seconds_total{mode!="idle",mode!="iowait",mode!="steal",<<.LabelMatchers>>}[3m])
+          )
         resources:
           overrides:
             node:
@@ -17,10 +22,18 @@ prometheus-adapter:
               resource: namespace
             pod:
               resource: pod
+        containerLabel: container
       memory:
-        containerLabel: container
-        containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>, container!=""}) by (<<.GroupBy>>)
-        nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
+        containerQuery: |
+          sum by (<<.GroupBy>>) (
+            avg_over_time(container_memory_working_set_bytes{container!="",<<.LabelMatchers>>}[3m])
+          )
+        nodeQuery: |
+          sum by (<<.GroupBy>>) (
+            avg_over_time(node_memory_MemTotal_bytes{<<.LabelMatchers>>}[3m])
+            -
+            avg_over_time(node_memory_MemAvailable_bytes{<<.LabelMatchers>>}[3m])
+          )
         resources:
           overrides:
             node:
@@ -29,4 +42,5 @@ prometheus-adapter:
               resource: namespace
             pod:
               resource: pod
-      window: 5m
\ No newline at end of file
+        containerLabel: container
+      window: 3m
\ No newline at end of file