diff --git a/salt/grafana/panels/cpu_usage_guage.json.jinja b/salt/grafana/panels/cpu_usage_guage.json.jinja
index e6b691be8..4a28c315c 100644
--- a/salt/grafana/panels/cpu_usage_guage.json.jinja
+++ b/salt/grafana/panels/cpu_usage_guage.json.jinja
@@ -66,7 +66,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
index f12d163c5..f0cf6f13b 100644
--- a/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
+++ b/salt/grafana/panels/cpu_usage_tasks_graph.json.jinja
@@ -65,7 +65,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT mean(usage_user) as \"user\", mean(usage_system) as \"system\", mean(usage_softirq) as \"softirq\", mean(usage_steal) as \"steal\", mean(usage_nice) as \"nice\", mean(usage_irq) as \"irq\", mean(usage_iowait) as \"iowait\", mean(usage_guest) as \"guest\", mean(usage_guest_nice) as \"guest_nice\"  FROM \"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($interval), *",
+      "query": "SELECT mean(usage_user) as \"user\", mean(usage_system) as \"system\", mean(usage_softirq) as \"softirq\", mean(usage_steal) as \"steal\", mean(usage_nice) as \"nice\", mean(usage_irq) as \"irq\", mean(usage_iowait) as \"iowait\", mean(usage_guest) as \"guest\", mean(usage_guest_nice) as \"guest_nice\"  FROM \"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), *",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "A",
@@ -104,7 +104,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\"  FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($interval), *",
+      "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\"  FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), *",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "B",
diff --git a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
index 2d9522d4f..b02559d1c 100644
--- a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($interval), \"host\", \"path\"",
+      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
       "rawQuery": true,
       "alias": "$tag_host: mountpoint $tag_path - $col"
     },
@@ -83,7 +83,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($interval), \"host\", \"path\"",
+      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
       "rawQuery": true,
       "alias": "$tag_host: mountpoint $tag_path - $col",
       "hide": false
diff --git a/salt/grafana/panels/disk_usage_root_graph.json.jinja b/salt/grafana/panels/disk_usage_root_graph.json.jinja
index 82c56cb5c..e3f4e5843 100644
--- a/salt/grafana/panels/disk_usage_root_graph.json.jinja
+++ b/salt/grafana/panels/disk_usage_root_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($interval), \"host\", \"path\"",
+      "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
       "rawQuery": true,
       "alias": "$tag_host: mountpoint $tag_path - $col"
     },
@@ -83,7 +83,7 @@
           }
         ]
       ],
-      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($interval), \"host\", \"path\"",
+      "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"",
       "rawQuery": true,
       "alias": "$tag_host: mountpoint $tag_path - $col",
       "hide": false
diff --git a/salt/grafana/panels/load_average_5_minute_singlestat.json.jinja b/salt/grafana/panels/load_average_5_minute_singlestat.json.jinja
index 97559c163..1b8f9ae80 100644
--- a/salt/grafana/panels/load_average_5_minute_singlestat.json.jinja
+++ b/salt/grafana/panels/load_average_5_minute_singlestat.json.jinja
@@ -51,7 +51,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja
index c137e8abe..38358ba40 100644
--- a/salt/grafana/panels/load_averages_graph.json.jinja
+++ b/salt/grafana/panels/load_averages_graph.json.jinja
@@ -62,7 +62,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT mean(load1) as \"1 minute\", mean(load5) as \"5 minutes\", mean(load15) as \"15 minutes\" FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), * ORDER BY asc",
+      "query": "SELECT mean(load1) as \"1 minute\", mean(load5) as \"5 minutes\", mean(load15) as \"15 minutes\" FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "A",
@@ -101,7 +101,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT mean(mean_load1) as \"trend_1 minute\", mean(mean_load5) as \"trend_5 minutes\", mean(mean_load15) as \"trend_15 minutes\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), * ORDER BY asc",
+      "query": "SELECT mean(mean_load1) as \"trend_1 minute\", mean(mean_load5) as \"trend_5 minutes\", mean(mean_load15) as \"trend_15 minutes\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "B",
diff --git a/salt/grafana/panels/management_interface_drops_graph.json.jinja b/salt/grafana/panels/management_interface_drops_graph.json.jinja
index a7abdac25..61497d07c 100644
--- a/salt/grafana/panels/management_interface_drops_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_drops_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "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,interface 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,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -83,7 +83,7 @@
           }
         ]
       ],
-      "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,interface 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,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -122,7 +122,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col",
       "hide": false
@@ -162,7 +162,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     }
diff --git a/salt/grafana/panels/management_interface_packets_graph.json.jinja b/salt/grafana/panels/management_interface_packets_graph.json.jinja
index 1c5305c9d..b5260aa3f 100644
--- a/salt/grafana/panels/management_interface_packets_graph.json.jinja
+++ b/salt/grafana/panels/management_interface_packets_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -83,7 +83,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -122,7 +122,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col",
       "hide": false
@@ -162,7 +162,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     }
diff --git a/salt/grafana/panels/memory_usage_graph.json.jinja b/salt/grafana/panels/memory_usage_graph.json.jinja
index 6d17db7e8..945796153 100644
--- a/salt/grafana/panels/memory_usage_graph.json.jinja
+++ b/salt/grafana/panels/memory_usage_graph.json.jinja
@@ -69,7 +69,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT mean(total) as total, mean(used) as used, mean(cached) as cached, mean(free) as free, mean(buffered) as buffered  FROM \"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc",
+      "query": "SELECT mean(total) as total, mean(used) as used, mean(cached) as cached, mean(free) as free, mean(buffered) as buffered  FROM \"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "A",
@@ -108,7 +108,7 @@
       ],
       "orderByTime": "ASC",
       "policy": "default",
-      "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trean_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered  FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc",
+      "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trean_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered  FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
       "queryType": "randomWalk",
       "rawQuery": true,
       "refId": "B",
diff --git a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
index 3c6035889..8db8092da 100644
--- a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "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,interface 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,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -83,7 +83,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)",
+      "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -122,7 +122,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col",
       "hide": false
@@ -162,7 +162,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($interval), host,interface fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     }
diff --git a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
index 14a93f16c..012e1edc0 100644
--- a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
+++ b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja
@@ -44,7 +44,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -83,7 +83,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     },
@@ -122,7 +122,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col",
       "hide": false
@@ -162,7 +162,7 @@
           }
         ]
       ],
-      "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($interval), * fill(none)",
+      "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)",
       "rawQuery": true,
       "alias": "$tag_host: $tag_interface: $col"
     }
diff --git a/salt/grafana/panels/monitor_traffic_singlestat.json.jinja b/salt/grafana/panels/monitor_traffic_singlestat.json.jinja
index 8a7985a59..704095b7d 100644
--- a/salt/grafana/panels/monitor_traffic_singlestat.json.jinja
+++ b/salt/grafana/panels/monitor_traffic_singlestat.json.jinja
@@ -61,7 +61,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/nsm_used_guage.json.jinja b/salt/grafana/panels/nsm_used_guage.json.jinja
index f939b67d6..d22a1b962 100644
--- a/salt/grafana/panels/nsm_used_guage.json.jinja
+++ b/salt/grafana/panels/nsm_used_guage.json.jinja
@@ -58,7 +58,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/pcap_packet_loss_singlestat.json.jinja b/salt/grafana/panels/pcap_packet_loss_singlestat.json.jinja
index 94f4b883f..8b1ada6c8 100644
--- a/salt/grafana/panels/pcap_packet_loss_singlestat.json.jinja
+++ b/salt/grafana/panels/pcap_packet_loss_singlestat.json.jinja
@@ -67,7 +67,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/pcap_retention_singlestat.json.jinja b/salt/grafana/panels/pcap_retention_singlestat.json.jinja
index 0bb908d76..1d8a1ef89 100644
--- a/salt/grafana/panels/pcap_retention_singlestat.json.jinja
+++ b/salt/grafana/panels/pcap_retention_singlestat.json.jinja
@@ -59,7 +59,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/process_status_graph.json.jinja b/salt/grafana/panels/process_status_graph.json.jinja
index b4ca1ff66..19b10bde5 100644
--- a/salt/grafana/panels/process_status_graph.json.jinja
+++ b/salt/grafana/panels/process_status_graph.json.jinja
@@ -59,7 +59,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
@@ -72,7 +72,7 @@
       ],
       "measurement": "processes",
       "policy": "default",
-      "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc",
+      "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
       "rawQuery": true,
       "refId": "B",
       "resultFormat": "time_series",
@@ -105,7 +105,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
@@ -118,7 +118,7 @@
       ],
       "measurement": "processes",
       "policy": "default",
-      "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc",
+      "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc",
       "rawQuery": true,
       "refId": "A",
       "resultFormat": "time_series",
diff --git a/salt/grafana/panels/ram_usage_guage.json.jinja b/salt/grafana/panels/ram_usage_guage.json.jinja
index c1d05ab5a..1a1bf04a1 100644
--- a/salt/grafana/panels/ram_usage_guage.json.jinja
+++ b/salt/grafana/panels/ram_usage_guage.json.jinja
@@ -66,7 +66,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/rootfs_used_guage.json.jinja b/salt/grafana/panels/rootfs_used_guage.json.jinja
index 25968299c..d67e80e4a 100644
--- a/salt/grafana/panels/rootfs_used_guage.json.jinja
+++ b/salt/grafana/panels/rootfs_used_guage.json.jinja
@@ -58,7 +58,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/suricata_packet_loss_singlestat.json.jinja b/salt/grafana/panels/suricata_packet_loss_singlestat.json.jinja
index 549899008..fa68557e4 100644
--- a/salt/grafana/panels/suricata_packet_loss_singlestat.json.jinja
+++ b/salt/grafana/panels/suricata_packet_loss_singlestat.json.jinja
@@ -67,7 +67,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/swap_usage_guage.json.jinja b/salt/grafana/panels/swap_usage_guage.json.jinja
index 6667a3445..895dd03f4 100644
--- a/salt/grafana/panels/swap_usage_guage.json.jinja
+++ b/salt/grafana/panels/swap_usage_guage.json.jinja
@@ -67,7 +67,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },
diff --git a/salt/grafana/panels/zeek_packet_loss_singlestat.json.jinja b/salt/grafana/panels/zeek_packet_loss_singlestat.json.jinja
index cbea2b6f2..095a15b3e 100644
--- a/salt/grafana/panels/zeek_packet_loss_singlestat.json.jinja
+++ b/salt/grafana/panels/zeek_packet_loss_singlestat.json.jinja
@@ -67,7 +67,7 @@
       "groupBy": [
         {
           "params": [
-            "$interval"
+            "$__interval"
           ],
           "type": "time"
         },