X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fbarometer-grafana%2Fdashboards%2Fcpu_usage_dashboard.json;fp=docker%2Fbarometer-grafana%2Fdashboards%2Fcpu_usage_dashboard.json;h=bab2742dbca0eee2254e69671b0fd550db8a1ad1;hb=3d043b231d91aa27449635a25d2f416b3ab38a2f;hp=0b8ab73e51acbf18811674b5e6441abd53671698;hpb=e21e1e13a29189b024801cb344093688f772890a;p=barometer.git

diff --git a/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json b/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json
index 0b8ab73e..bab2742d 100644
--- 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",