remove role conditional from all panel queiries

salt/grafana/panels/cpu_usage_current_graph.json.jinja

@@ -108,12 +108,6 @@
           "key": "cpu",
           "operator": "=",
           "value": "cpu-total"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     }

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 role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }

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 role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }

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 role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(running) as running FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }

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 role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }

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 role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }

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 role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }

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 role =~ /$role$/) AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
+      "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc",
       "rawQuery": true,
       "alias": "$tag_host $tag_role"
     }

salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja

@@ -96,12 +96,6 @@
           "operator": "=~",
           "value": "/^$servername$/"
         },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
-        },
         {
           "condition": "AND",
           "key": "path",

salt/grafana/panels/disk_usage_root_percent_graph.json.jinja

@@ -96,12 +96,6 @@
           "operator": "=~",
           "value": "/^$servername$/"
         },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
-        },
         {
           "condition": "AND",
           "key": "path",

salt/grafana/panels/io_wait_graph.json.jinja

@@ -26,12 +26,6 @@
           "key": "cpu",
           "operator": "=",
           "value": "cpu-total"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ],
       "groupBy": [

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 role =~ /$role$/ 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 \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($interval) fill(null)",
       "rawQuery": false,
       "refId": "A",
       "resultFormat": "time_series",

salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja

@@ -65,7 +65,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND role =~ /$role/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)",
+      "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "A",

salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja

@@ -66,7 +66,7 @@
       "hide": false,
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND role =~ /$role/  AND $timeFilter GROUP BY time($__interval), host,role fill(none)",
+      "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)",
       "rawQuery": true,
       "refId": "B",
       "resultFormat": "time_series",

salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja

@@ -122,12 +122,6 @@
           "key": "interface",
           "operator": "=~",
           "value": "/^$manint$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     }

salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja

@@ -120,12 +120,6 @@
           "key": "interface",
           "operator": "=~",
           "value": "/^$manint$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     }

salt/grafana/panels/memory_usage_percent_graph.json.jinja

@@ -20,12 +20,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ],
       "groupBy": [

salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja

@@ -63,7 +63,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND role =~ /$role/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)",
+      "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "A",

salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja

@@ -122,12 +122,6 @@
           "key": "interface",
           "operator": "=~",
           "value": "/^$monint$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     }

salt/grafana/panels/stenographer_packet_loss_graph.json.jinja

@@ -106,12 +106,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     },
@@ -169,12 +163,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     }

salt/grafana/panels/suricata_packet_loss_graph.json.jinja

@@ -112,12 +112,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     },
@@ -181,12 +175,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     }

salt/grafana/panels/swap_usage_percent_graph.json.jinja

@@ -20,12 +20,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ],
       "groupBy": [

salt/grafana/panels/system_uptime_graph.json.jinja

@@ -20,12 +20,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ],
       "groupBy": [

salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja

@@ -76,7 +76,7 @@
       "measurement": "docker_container_status",
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT last(\"uptime_ns\") FROM \"docker_container_status\" WHERE (\"host\" =~ /^$servername$/ AND \"container_name\" =~ /^$containers$/ AND \"role\" =~ /^$role$/) AND $timeFilter GROUP BY time($__interval), \"container_name\", \"host\", \"role\" fill(null)",
+      "query": "SELECT last(\"uptime_ns\") FROM \"docker_container_status\" WHERE (\"host\" =~ /^$servername$/ AND \"container_name\" =~ /^$containers$/) AND $timeFilter GROUP BY time($__interval), \"container_name\", \"host\", \"role\" fill(null)",
       "queryType": "randomWalk",
       "rawQuery": false,
       "refId": "A",
@@ -106,12 +106,6 @@
           "key": "container_name",
           "operator": "=~",
           "value": "/^$containers$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ],
       "slimit": "",

salt/grafana/panels/zeek_packet_loss_graph.json.jinja

@@ -112,12 +112,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     },
@@ -181,12 +175,6 @@
           "key": "host",
           "operator": "=~",
           "value": "/^$servername$/"
-        },
-        {
-          "condition": "AND",
-          "key": "role",
-          "operator": "=~",
-          "value": "/^$role$/"
         }
       ]
     }