[grafana] Update Dashboard for CPU Usage

[barometer.git] / docker / barometer-grafana / dashboards / cpu_usage_dashboard.json

diff --git a/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json b/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json
index 0b8ab73..bab2742 100644 (file)
--- a/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json
+++ b/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json
@@ -582,7 +582,7 @@
                 "measurement": "cpu_value",
                 "orderByTime": "ASC",
                 "policy": "default",
-                "query": "select derivative(mean(value),1s) AS idle from \"cpu_value\" WHERE \"type\" = 'cpu' AND \"host\" =~ /^$host$/ AND $timeFilter GROUP BY time($interval), instance, type_instance fill(null)",
+                "query": "select derivative(mean(value),1s) AS idle from \"cpu_value\" WHERE \"host\" =~ /^$host$/ AND $timeFilter GROUP BY time($interval), instance, type_instance fill(null)",
                 "rawQuery": true,
                 "refId": "A",
                 "resultFormat": "time_series",
@@ -710,7 +710,7 @@
                 "measurement": "cpu_value",
                 "orderByTime": "ASC",
                 "policy": "default",
-                "query": "SELECT mean(\"value\") FROM \"cpu_value\" WHERE (\"host\" =~ /^$host$/ AND \"type\" = 'cpu' AND \"type_instance\" != 'idle') AND $timeFilter GROUP BY time($__interval), \"instance\", \"type_instance\" fill(none)",
+                "query": "SELECT mean(\"value\") FROM \"cpu_value\" WHERE (\"host\" =~ /^$host$/ AND \"type_instance\" != 'idle') AND $timeFilter GROUP BY time($__interval), \"instance\", \"type_instance\" fill(none)",
                 "rawQuery": true,
                 "refId": "A",
                 "resultFormat": "time_series",