diff --git a/salt/grafana/panels/io_wait_stat.json.jinja b/salt/grafana/panels/io_wait_stat.json.jinja
index 5b816bdfd..baaf462d8 100644
--- a/salt/grafana/panels/io_wait_stat.json.jinja
+++ b/salt/grafana/panels/io_wait_stat.json.jinja
@@ -105,7 +105,7 @@
     "reduceOptions": {
       "values": false,
       "calcs": [
-        "last"
+        "lastNotNull"
       ],
       "fields": ""
     },
diff --git a/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja b/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja
index 49dc48a4a..c983521a4 100644
--- a/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja
+++ b/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja
@@ -95,7 +95,7 @@
     "reduceOptions": {
       "values": false,
       "calcs": [
-        "last"
+        "lastNotNull"
       ],
       "fields": ""
     },
diff --git a/salt/grafana/panels/pcap_retention_stat.json.jinja b/salt/grafana/panels/pcap_retention_stat.json.jinja
index 1fa39dec2..29b81902d 100644
--- a/salt/grafana/panels/pcap_retention_stat.json.jinja
+++ b/salt/grafana/panels/pcap_retention_stat.json.jinja
@@ -95,7 +95,7 @@
     "reduceOptions": {
       "values": false,
       "calcs": [
-        "last"
+        "lastNotNull"
       ],
       "fields": ""
     },
diff --git a/salt/grafana/panels/redis_queue_stat.json.jinja b/salt/grafana/panels/redis_queue_stat.json.jinja
index 631616e02..b0b3d8946 100644
--- a/salt/grafana/panels/redis_queue_stat.json.jinja
+++ b/salt/grafana/panels/redis_queue_stat.json.jinja
@@ -1,73 +1,5 @@
 {
-  "type": "stat",
-  "title": "Redis Unparsed Queue",
-  "gridPos": {
-    "x": {{ PANELS.redis_queue_stat.gridPos.x }},
-    "y": {{ PANELS.redis_queue_stat.gridPos.y }},
-    "w": {{ PANELS.redis_queue_stat.gridPos.w }},
-    "h": {{ PANELS.redis_queue_stat.gridPos.h }}
-  },
-  "id": 68894,
-  "targets": [
-    {
-      "refId": "A",
-      "queryType": "randomWalk",
-      "policy": "default",
-      "resultFormat": "time_series",
-      "orderByTime": "ASC",
-      "tags": [
-        {
-          "key": "host",
-          "operator": "=~",
-          "value": "/^$servername$/"
-        }
-      ],
-      "groupBy": [
-        {
-          "type": "time",
-          "params": [
-            "$__interval"
-          ]
-        },
-        {
-          "type": "fill",
-          "params": [
-            "null"
-          ]
-        }
-      ],
-      "select": [
-        [
-          {
-            "type": "field",
-            "params": [
-              "unparsed"
-            ]
-          },
-          {
-            "type": "mean",
-            "params": []
-          }
-        ]
-      ],
-      "measurement": "redisqueue"
-    }
-  ],
-  "options": {
-    "reduceOptions": {
-      "values": false,
-      "calcs": [
-        "last"
-      ],
-      "fields": ""
-    },
-    "orientation": "auto",
-    "text": {},
-    "textMode": "auto",
-    "colorMode": "value",
-    "graphMode": "area",
-    "justifyMode": "auto"
-  },
+  "datasource": "InfluxDB",
   "fieldConfig": {
     "defaults": {
       "thresholds": {
@@ -87,8 +19,77 @@
     },
     "overrides": []
   },
+  "gridPos": {
+    "x": {{ PANELS.redis_queue_stat.gridPos.x }},
+    "y": {{ PANELS.redis_queue_stat.gridPos.y }},
+    "w": {{ PANELS.redis_queue_stat.gridPos.w }},
+    "h": {{ PANELS.redis_queue_stat.gridPos.h }}
+  },
+  "id": 68894,
+  "options": {
+    "reduceOptions": {
+      "values": false,
+      "calcs": [
+        "lastNotNull"
+      ],
+      "fields": ""
+    },
+    "orientation": "auto",
+    "text": {},
+    "textMode": "auto",
+    "colorMode": "value",
+    "graphMode": "area",
+    "justifyMode": "auto"
+  },
   "pluginVersion": "7.5.4",
-  "datasource": "InfluxDB",
+  "targets": [
+    {
+      "groupBy": [
+        {
+          "params": [
+            "$__interval"
+          ],
+          "type": "time"
+        },
+        {
+          "params": [
+            "null"
+          ],
+          "type": "fill"
+        }
+      ],
+      "measurement": "redisqueue",
+      "orderByTime": "ASC",
+      "policy": "default",
+      "queryType": "randomWalk",
+      "refId": "A",
+      "resultFormat": "time_series",
+      "select": [
+        [
+          {
+            "type": "field",
+            "params": [
+              "unparsed"
+            ]
+          },
+          {
+            "type": "last",
+            "params": []
+          }
+        ]
+      ],
+      "tags": [
+        {
+          "key": "host",
+          "operator": "=~",
+          "value": "/^$servername$/"
+        }
+      ]
+    }
+  ],
+  "title": "Redis Unparsed Queue",
+  "type": "stat",
   "timeFrom": null,
-  "timeShift": null
+  "timeShift": null,
+  "interval": "30s"
 }
diff --git a/salt/grafana/panels/stenographer_packet_loss_stat.json.jinja b/salt/grafana/panels/stenographer_packet_loss_stat.json.jinja
index 0a4770c4b..863772fcd 100644
--- a/salt/grafana/panels/stenographer_packet_loss_stat.json.jinja
+++ b/salt/grafana/panels/stenographer_packet_loss_stat.json.jinja
@@ -97,7 +97,7 @@
     "reduceOptions": {
       "values": false,
       "calcs": [
-        "last"
+        "lastNotNull"
       ],
       "fields": ""
     },
diff --git a/salt/grafana/panels/suricata_packet_loss_stat.json.jinja b/salt/grafana/panels/suricata_packet_loss_stat.json.jinja
index cd17c1c36..87a3f48e5 100644
--- a/salt/grafana/panels/suricata_packet_loss_stat.json.jinja
+++ b/salt/grafana/panels/suricata_packet_loss_stat.json.jinja
@@ -103,7 +103,7 @@
     "reduceOptions": {
       "values": false,
       "calcs": [
-        "last"
+        "lastNotNull"
       ],
       "fields": ""
     },
diff --git a/salt/grafana/panels/zeek_packet_loss_stat.json.jinja b/salt/grafana/panels/zeek_packet_loss_stat.json.jinja
index e508485c7..9d43f5a76 100644
--- a/salt/grafana/panels/zeek_packet_loss_stat.json.jinja
+++ b/salt/grafana/panels/zeek_packet_loss_stat.json.jinja
@@ -103,7 +103,7 @@
     "reduceOptions": {
       "values": false,
       "calcs": [
-        "last"
+        "lastNotNull"
       ],
       "fields": ""
     },