diff --git a/dashboards/k8s-views-global.json b/dashboards/k8s-views-global.json index 2915dd0..7b92e9f 100644 --- a/dashboards/k8s-views-global.json +++ b/dashboards/k8s-views-global.json @@ -150,7 +150,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\", cluster=\"$cluster\"}[$__rate_interval]))", + "expr": "avg(sum by (cpu) (rate(node_cpu_seconds_total{mode!~\"idle|iowait|steal\", cluster=\"$cluster\"}[$__rate_interval])))", "interval": "", "legendFormat": "Real", "range": true, @@ -701,7 +701,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "sum(1-rate(node_cpu_seconds_total{mode=\"idle\", cluster=\"$cluster\"}[$__rate_interval]))", + "expr": "sum(rate(node_cpu_seconds_total{mode!~\"idle|iowait|steal\", cluster=\"$cluster\"}[$__rate_interval]))", "interval": "", "legendFormat": "Real", "range": true, @@ -1020,7 +1020,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\", cluster=\"$cluster\"}[$__rate_interval]))", + "expr": "avg(sum by (cpu) (rate(node_cpu_seconds_total{mode!~\"idle|iowait|steal\", cluster=\"$cluster\"}[$__rate_interval])))", "interval": "$resolution", "legendFormat": "CPU usage in %", "refId": "A" @@ -1435,7 +1435,7 @@ "uid": "${datasource}" }, "exemplar": true, - "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\", cluster=\"$cluster\"}[$__rate_interval])) by (instance)", + "expr": "avg(sum by (cpu, instance) (rate(node_cpu_seconds_total{mode!~\"idle|iowait|steal\", cluster=\"$cluster\"}[$__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 49a90d2..86773be 100644 --- a/dashboards/k8s-views-nodes.json +++ b/dashboards/k8s-views-nodes.json @@ -156,7 +156,7 @@ "uid": "${datasource}" }, "exemplar": false, - "expr": "avg(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\", cluster=\"$cluster\"}[$__rate_interval]))", + "expr": "avg(sum by (cpu) (rate(node_cpu_seconds_total{mode!~\"idle|iowait|steal\", instance=\"$instance\", cluster=\"$cluster\"}[$__rate_interval])))", "instant": true, "interval": "$resolution", "legendFormat": "", @@ -576,7 +576,7 @@ "uid": "${datasource}" }, "exemplar": false, - "expr": "sum(1-rate(node_cpu_seconds_total{mode=\"idle\", instance=\"$instance\", cluster=\"$cluster\"}[$__rate_interval]))", + "expr": "sum(rate(node_cpu_seconds_total{mode!~\"idle|iowait|steal\", instance=\"$instance\", cluster=\"$cluster\"}[$__rate_interval]))", "instant": true, "interval": "$resolution", "legendFormat": "",