From 7d387be532e52f05554943de3a3b8a253e0ac04c Mon Sep 17 00:00:00 2001
From: Thomas Way <thomas@6f.io>
Date: Mon, 18 Dec 2023 13:08:05 +0000
Subject: [PATCH] fix: match all non-idle cpu modes when calculating total cpu
 usage

Fixes: #80
---
 dashboards/k8s-views-global.json | 8 ++++----
 dashboards/k8s-views-nodes.json  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dashboards/k8s-views-global.json b/dashboards/k8s-views-global.json
index d0ec298..f29362b 100644
--- a/dashboards/k8s-views-global.json
+++ b/dashboards/k8s-views-global.json
@@ -149,7 +149,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\"}[$__rate_interval]))",
+          "expr": "avg(rate(node_cpu_seconds_total{mode!=\"idle\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Real",
           "range": true,
@@ -694,7 +694,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(1-rate(node_cpu_seconds_total{mode=\"idle\"}[$__rate_interval]))",
+          "expr": "sum(rate(node_cpu_seconds_total{mode!=\"idle\"}[$__rate_interval]))",
           "interval": "",
           "legendFormat": "Real",
           "range": true,
@@ -1009,7 +1009,7 @@
             "uid": "${datasource}"
           },
           "exemplar": true,
-          "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\"}[$__rate_interval]))",
+          "expr": "avg(rate(node_cpu_seconds_total{mode!=\"idle\"}[$__rate_interval]))",
           "interval": "$resolution",
           "legendFormat": "CPU usage in %",
           "refId": "A"
@@ -1419,7 +1419,7 @@
             "uid": "${datasource}"
           },
           "exemplar": true,
-          "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\"}[$__rate_interval])) by (instance)",
+          "expr": "avg(rate(node_cpu_seconds_total{mode!=\"idle\"}[$__rate_interval])) by (instance)",
           "interval": "$resolution",
           "legendFormat": "{{ node }}",
           "refId": "A"
diff --git a/dashboards/k8s-views-nodes.json b/dashboards/k8s-views-nodes.json
index 1287f08..cde632f 100644
--- a/dashboards/k8s-views-nodes.json
+++ b/dashboards/k8s-views-nodes.json
@@ -154,7 +154,7 @@
             "uid": "${datasource}"
           },
           "exemplar": false,
-          "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\"}[$__rate_interval]))",
+          "expr": "avg(rate(node_cpu_seconds_total{mode!=\"idle\", instance=\"$instance\"}[$__rate_interval]))",
           "instant": true,
           "interval": "$resolution",
           "legendFormat": "",
@@ -570,7 +570,7 @@
             "uid": "${datasource}"
           },
           "exemplar": false,
-          "expr": "sum(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\"}[$__rate_interval]))",
+          "expr": "sum(rate(node_cpu_seconds_total{mode!=\"idle\", instance=\"$instance\"}[$__rate_interval]))",
           "instant": true,
           "interval": "$resolution",
           "legendFormat": "",