From d2a74c80e2aaa309d3660232fcbd28490b4dc50a Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Wed, 17 Feb 2021 16:37:31 -0500
Subject: [PATCH] Update .security analyzer

---
 .../templates/so/so-common-template.json      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/salt/elasticsearch/templates/so/so-common-template.json b/salt/elasticsearch/templates/so/so-common-template.json
index 74ff3748a..062838670 100644
--- a/salt/elasticsearch/templates/so/so-common-template.json
+++ b/salt/elasticsearch/templates/so/so-common-template.json
@@ -12,20 +12,18 @@
       "analyzer": {
         "es_security_analyzer": {
           "type": "custom",
-          "filter": [ "path_hierarchy_pattern_filter", "lowercase" ],
-          "tokenizer": "whitespace"
-        },
-        "es_security_search_analyzer": {
-          "type": "custom",
-          "filter": [ "lowercase" ],
-          "tokenizer": "whitespace"
-        },
-        "es_security_search_quote_analyzer": {
-          "type": "custom",
-          "filter": [ "lowercase" ],
-          "tokenizer": "whitespace"
+          "char_filter": [ "whitespace_no_way" ],
+          "filter": [ "lowercase", "trim" ],
+          "tokenizer": "keyword"
         }
       },
+      "char_filter": {
+        "whitespace_no_way": {
+          "type": "pattern_replace",
+          "pattern": "(\\s)+",
+          "replacement": "$1"
+        }
+      },  
       "filter" : {
         "path_hierarchy_pattern_filter": {
           "type" : "pattern_capture",
@@ -35,6 +33,12 @@
             "((?:[^/]*/)*)(.*)"
           ]
         }
+      },  
+      "tokenizer": {
+        "path_tokenizer": {
+          "type": "path_hierarchy",
+          "delimiter": "\\"
+        }
       }
     }
   },
@@ -67,13 +71,12 @@
               "type": "text",
               "fields": {
                 "keyword": {
+                "ignore_above": 32765,
                  "type": "keyword"
                },
                "security": {
                  "type": "text",
-                 "analyzer": "es_security_analyzer",
-                 "search_analyzer": "es_security_search_analyzer",
-                 "search_quote_analyzer": "es_security_search_quote_analyzer"
+                 "analyzer": "es_security_analyzer"
                }
              }
             }