From 850315dc2015407664d51e70ad9e50728c3386c5 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 27 Jul 2021 08:47:44 -0400 Subject: [PATCH] remove role conditional from all panel queiries --- .../panels/cpu_usage_current_graph.json.jinja | 6 ------ .../panels/cpu_usage_tasks_blocked_graph.json.jinja | 2 +- .../panels/cpu_usage_tasks_paging_graph.json.jinja | 2 +- .../panels/cpu_usage_tasks_running_graph.json.jinja | 2 +- .../panels/cpu_usage_tasks_sleeping_graph.json.jinja | 2 +- .../panels/cpu_usage_tasks_stopped_graph.json.jinja | 2 +- .../panels/cpu_usage_tasks_unknown_graph.json.jinja | 2 +- .../panels/cpu_usage_tasks_zombies_graph.json.jinja | 2 +- .../panels/disk_usage_nsm_percent_graph.json.jinja | 6 ------ .../panels/disk_usage_root_percent_graph.json.jinja | 6 ------ salt/grafana/panels/io_wait_graph.json.jinja | 6 ------ salt/grafana/panels/io_wait_stat.json.jinja | 2 +- ...nagement_interface_drops_inbound_graph.json.jinja | 2 +- ...agement_interface_drops_outbound_graph.json.jinja | 2 +- ...gement_interface_traffic_inbound_graph.json.jinja | 6 ------ ...ement_interface_traffic_outbound_graph.json.jinja | 6 ------ .../panels/memory_usage_percent_graph.json.jinja | 6 ------ .../monitor_interface_drops_inbound_graph.json.jinja | 2 +- ...onitor_interface_traffic_inbound_graph.json.jinja | 6 ------ .../panels/stenographer_packet_loss_graph.json.jinja | 12 ------------ .../panels/suricata_packet_loss_graph.json.jinja | 12 ------------ .../panels/swap_usage_percent_graph.json.jinja | 6 ------ salt/grafana/panels/system_uptime_graph.json.jinja | 6 ------ .../uptime_docker_combined_current_graph.json.jinja | 8 +------- .../grafana/panels/zeek_packet_loss_graph.json.jinja | 12 ------------ 25 files changed, 12 insertions(+), 114 deletions(-) diff --git a/salt/grafana/panels/cpu_usage_current_graph.json.jinja b/salt/grafana/panels/cpu_usage_current_graph.json.jinja index 555d23221..ff7517029 100644 --- a/salt/grafana/panels/cpu_usage_current_graph.json.jinja +++ b/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$/" } ] } 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 6e6d92331..7285d6430 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 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" } 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 392063f07..2af6c1bec 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 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" } 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 c6b9d4b58..c1148391f 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 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" } 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 bd58ca9ea..e23f5e0df 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 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" } 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 cc801ce9e..bbff2cd0f 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 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" } 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 f6e2062ca..1c194bcbc 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 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" } 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 712ea7c6b..2d3f90018 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 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" } diff --git a/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja index ff492bf52..19e5e0777 100644 --- a/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja +++ b/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", diff --git a/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja b/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja index 3aaa18f4d..25315a94c 100644 --- a/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja +++ b/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", diff --git a/salt/grafana/panels/io_wait_graph.json.jinja b/salt/grafana/panels/io_wait_graph.json.jinja index 73057830e..3a01467b0 100644 --- a/salt/grafana/panels/io_wait_graph.json.jinja +++ b/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": [ diff --git a/salt/grafana/panels/io_wait_stat.json.jinja b/salt/grafana/panels/io_wait_stat.json.jinja index 840d282cc..470d0008f 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 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", diff --git a/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja b/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja index 3ec958adc..f8aae9330 100644 --- a/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja +++ b/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", diff --git a/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja b/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja index 3e59e1136..8c65a251a 100644 --- a/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja +++ b/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", diff --git a/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja index 863644e58..0f34d8ee3 100644 --- a/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja +++ b/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$/" } ] } diff --git a/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja index 87ad16750..05f3cdb75 100644 --- a/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja +++ b/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$/" } ] } diff --git a/salt/grafana/panels/memory_usage_percent_graph.json.jinja b/salt/grafana/panels/memory_usage_percent_graph.json.jinja index dddfd73d6..9060a41f6 100644 --- a/salt/grafana/panels/memory_usage_percent_graph.json.jinja +++ b/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": [ diff --git a/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja index 42b274bbb..c784e8efc 100644 --- a/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja +++ b/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", diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja index 6ef26c5ee..f5fad1509 100644 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja +++ b/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$/" } ] } diff --git a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja b/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja index 351b2505f..5bd3f5a07 100644 --- a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja +++ b/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$/" } ] } diff --git a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja b/salt/grafana/panels/suricata_packet_loss_graph.json.jinja index e9ec68e31..39b53d166 100644 --- a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja +++ b/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$/" } ] } diff --git a/salt/grafana/panels/swap_usage_percent_graph.json.jinja b/salt/grafana/panels/swap_usage_percent_graph.json.jinja index ffd45e6fa..b40412994 100644 --- a/salt/grafana/panels/swap_usage_percent_graph.json.jinja +++ b/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": [ diff --git a/salt/grafana/panels/system_uptime_graph.json.jinja b/salt/grafana/panels/system_uptime_graph.json.jinja index 74073651c..bf26b520f 100644 --- a/salt/grafana/panels/system_uptime_graph.json.jinja +++ b/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": [ diff --git a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja index 2422cbbcc..ad4ff2805 100644 --- a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja +++ b/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": "", diff --git a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja index 89d1d57f1..7656cb575 100644 --- a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja +++ b/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$/" } ] }