diff --git a/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja
index aec992a91..cea753c84 100644
--- a/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE (host =~ /$servername$/ AND role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }
diff --git a/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja
index a8eb777b3..098a02542 100644
--- a/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE (host =~ /$servername$/ AND role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }
diff --git a/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja
index 1cc63be59..d01a78168 100644
--- a/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(running) as running FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(running) as running FROM \"processes\" WHERE (host =~ /$servername$/ AND role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }
diff --git a/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja
index 89227a20d..80faf0037 100644
--- a/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE (host =~ /$servername$/ AND role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }
diff --git a/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja
index fcd94eae1..f7a7e0bfe 100644
--- a/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE (host =~ /$servername$/ AND role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }
diff --git a/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja
index efd53cdf4..910012b00 100644
--- a/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE (host =~ /$servername$/ AND role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }
diff --git a/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja
index 2a6af6b73..e4776b42f 100644
--- a/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE (host =~ /$servername$/ AND role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }
diff --git a/salt/grafana/panels/io_wait_stat.json.jinja b/salt/grafana/panels/io_wait_stat.json.jinja
index baaf462d8..840d282cc 100644
--- a/salt/grafana/panels/io_wait_stat.json.jinja
+++ b/salt/grafana/panels/io_wait_stat.json.jinja
@@ -65,7 +65,7 @@
       ],
       "measurement": "cpu",
       "policy": "default",
-      "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE \"host\" =~ /^$servername$/ AND \"cpu\" = 'cpu-total' AND $timeFilter GROUP BY time($interval) fill(null)",
+      "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE (host =~ /$servername$/ AND role =~ /$role$/ AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "A",
       "resultFormat": "time_series",