From a511fd33e9141888d0d8f9521e56586ba472236a Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Fri, 25 Feb 2022 19:14:21 -0500
Subject: [PATCH 1/2] Ensure correct formatting for destination override

---
 .../so/pb-override-destination-mappings.json  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/salt/elasticsearch/templates/component/so/pb-override-destination-mappings.json b/salt/elasticsearch/templates/component/so/pb-override-destination-mappings.json
index 6314f5e2d..8e3ab45f3 100644
--- a/salt/elasticsearch/templates/component/so/pb-override-destination-mappings.json
+++ b/salt/elasticsearch/templates/component/so/pb-override-destination-mappings.json
@@ -7,19 +7,21 @@
     "mappings": {
       "properties": {
         "destination": {
-          "ip": {
-            "type": "ip",
-            "fields": {
-              "keyword": {
-                "type": "keyword"
+          "properties": {
+            "ip": {
+              "type": "ip",
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
               }
-            }
-          },
-          "port": {
-            "type": "long",
-            "fields": {
-              "keyword": {
-                "type": "keyword"
+            },
+            "port": {
+              "type": "long",
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
               }
             }
           }

From e942d81433da13457e871df95c1663800ab524ad Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Fri, 25 Feb 2022 19:14:58 -0500
Subject: [PATCH 2/2] Ensure correct formatting for source override

---
 .../so/pb-override-source-mappings.json       | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/salt/elasticsearch/templates/component/so/pb-override-source-mappings.json b/salt/elasticsearch/templates/component/so/pb-override-source-mappings.json
index e7c4fbc62..55f105b8c 100644
--- a/salt/elasticsearch/templates/component/so/pb-override-source-mappings.json
+++ b/salt/elasticsearch/templates/component/so/pb-override-source-mappings.json
@@ -7,23 +7,25 @@
     "mappings": {
       "properties": {
         "source": {
-	  "ip": {
-            "type": "ip",
-	    "fields": {
-              "keyword": {
-                "type": "keyword"
-	      }
-	    }
-	  },
-          "port": {
-            "type": "long",
-	    "fields": {
-              "keyword": {
-                "type": "keyword"
+          "properties": {
+            "ip": {
+              "type": "ip",
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "port": {
+              "type": "long",
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
               }
             }
-          }	  
-	}
+          }
+        }
       }
     }
   }