diff --git a/grafana/Grafana-DMARC_Reports.json b/grafana/Grafana-DMARC_Reports.json
index 6061644..6789563 100644
--- a/grafana/Grafana-DMARC_Reports.json
+++ b/grafana/Grafana-DMARC_Reports.json
@@ -5,19 +5,19 @@
       "type": "datasource",
       "id": "elasticsearch",
       "name": "Elasticsearch",
-      "version": "1.0.0"
+      "version": "7.11.2"
     },
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "7.1.1"
+      "version": "7.4.5"
     },
     {
       "type": "panel",
       "id": "grafana-piechart-panel",
       "name": "Pie Chart",
-      "version": "1.5.0"
+      "version": "1.6.1"
     },
     {
       "type": "panel",
@@ -47,7 +47,7 @@
       "type": "panel",
       "id": "text",
       "name": "Text",
-      "version": "7.1.0"
+      "version": "7.4.5"
     }
   ],
   "annotations": {
@@ -68,7 +68,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1596560916058,
+  "iteration": 1616327630073,
   "links": [],
   "panels": [
     {
@@ -460,14 +460,17 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": true,
+      "stack": false,
       "steppedLine": false,
       "targets": [
         {
@@ -604,8 +607,11 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -741,8 +747,11 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -880,8 +889,11 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1019,8 +1031,11 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1156,8 +1171,11 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
       "percentage": false,
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1264,7 +1282,6 @@
               "value": "null"
             }
           ],
-          "nullValueMode": "connected",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1299,9 +1316,10 @@
           "fields": "",
           "values": false
         },
+        "text": {},
         "textMode": "value_and_name"
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -1345,7 +1363,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [
             {
@@ -1418,7 +1437,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -1476,7 +1495,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -1553,7 +1573,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -1658,7 +1678,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -1741,7 +1762,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -1897,7 +1918,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -1974,7 +1996,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -2032,7 +2054,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -2202,7 +2225,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -2427,7 +2450,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [
             {
@@ -2610,7 +2634,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -2784,7 +2808,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -2904,7 +2929,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -3007,7 +3032,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -3116,7 +3142,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -3234,7 +3260,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -3347,7 +3374,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -3496,7 +3523,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -3517,16 +3545,12 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Arrival_Date(UTC)"
+              "options": "Arrival Date (UTC)"
             },
             "properties": [
               {
                 "id": "unit",
-                "value": "dateTimeAsIso"
-              },
-              {
-                "id": "custom.width",
-                "value": 147
+                "value": "dateTimeAsSystem"
               }
             ]
           },
@@ -3592,14 +3616,14 @@
         "showHeader": true,
         "sortBy": []
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
             {
               "$$hashKey": "object:340",
               "fake": true,
-              "field": "arrival_date",
+              "field": "Arrival Date (UTC)",
               "id": "6",
               "settings": {
                 "interval": "auto",
@@ -3744,7 +3768,7 @@
             "indexByName": {},
             "renameByName": {
               "Count": "Count",
-              "arrival_date": "Arrival_Date(UTC)",
+              "arrival_date_utc": "Arrival_Date(UTC)",
               "auth_failure.keyword": "AuthFailure",
               "authentication_results.keyword": "Auth Results",
               "delivery_results.keyword": "DeliveryResult",
@@ -3862,7 +3886,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [
             {
@@ -3942,7 +3967,7 @@
         "showHeader": true,
         "sortBy": []
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -3999,7 +4024,8 @@
       "fieldConfig": {
         "defaults": {
           "custom": {
-            "align": null
+            "align": null,
+            "filterable": false
           },
           "mappings": [],
           "thresholds": {
@@ -4094,7 +4120,7 @@
           }
         ]
       },
-      "pluginVersion": "7.1.1",
+      "pluginVersion": "7.4.5",
       "targets": [
         {
           "bucketAggs": [
@@ -4193,8 +4219,8 @@
       "type": "table"
     }
   ],
-  "refresh": false,
-  "schemaVersion": 26,
+  "refresh": "10s",
+  "schemaVersion": 27,
   "style": "dark",
   "tags": [
     "DKIM",
@@ -4207,9 +4233,11 @@
       {
         "current": {
           "selected": false,
-          "text": "Elasticsearch-dmarc-ag",
-          "value": "Elasticsearch-dmarc-ag"
+          "text": "dmarc-ag",
+          "value": "dmarc-ag"
         },
+        "description": null,
+        "error": null,
         "hide": 2,
         "includeAll": false,
         "label": "Datasource: Aggregate",
@@ -4225,9 +4253,11 @@
       {
         "current": {
           "selected": false,
-          "text": "Elasticsearch-dmarc-fo",
-          "value": "Elasticsearch-dmarc-fo"
+          "text": "dmarc-fo",
+          "value": "dmarc-fo"
         },
+        "description": null,
+        "error": null,
         "hide": 2,
         "includeAll": false,
         "label": "Datasource: Forensic",
@@ -4242,9 +4272,15 @@
       },
       {
         "allValue": null,
-        "current": {},
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
         "datasource": "$datasourceag",
         "definition": "{\"find\":\"terms\",\"field\":\"header_from.keyword\"}",
+        "description": null,
+        "error": null,
         "hide": 0,
         "includeAll": true,
         "label": "From Domain",
@@ -4267,10 +4303,12 @@
         "auto_count": 30,
         "auto_min": "10s",
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "1d",
           "value": "1d"
         },
+        "description": null,
+        "error": null,
         "hide": 2,
         "label": "Interval",
         "name": "interval",