diff --git a/generated/elasticsearch/6/template.json b/generated/elasticsearch/6/template.json
index 9ea2b983cc..87f9408ce6 100644
--- a/generated/elasticsearch/6/template.json
+++ b/generated/elasticsearch/6/template.json
@@ -28,7 +28,8 @@
             "build": {
               "properties": {
                 "original": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -74,7 +75,8 @@
                           "type": "text"
                         }
                       },
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 }
@@ -84,7 +86,8 @@
               "type": "long"
             },
             "domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "geo": {
               "properties": {
@@ -108,7 +111,8 @@
                   "type": "geo_point"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "region_iso_code": {
                   "ignore_above": 1024,
@@ -144,7 +148,8 @@
               "type": "long"
             },
             "registered_domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "subdomain": {
               "ignore_above": 1024,
@@ -161,7 +166,8 @@
                   "type": "keyword"
                 },
                 "email": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "full_name": {
                   "fields": {
@@ -170,7 +176,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "group": {
                   "properties": {
@@ -203,7 +210,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "roles": {
                   "ignore_above": 1024,
@@ -324,7 +332,8 @@
                           "type": "text"
                         }
                       },
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 }
@@ -334,7 +343,8 @@
               "type": "long"
             },
             "domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "geo": {
               "properties": {
@@ -358,7 +368,8 @@
                   "type": "geo_point"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "region_iso_code": {
                   "ignore_above": 1024,
@@ -394,7 +405,8 @@
               "type": "long"
             },
             "registered_domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "subdomain": {
               "ignore_above": 1024,
@@ -411,7 +423,8 @@
                   "type": "keyword"
                 },
                 "email": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "full_name": {
                   "fields": {
@@ -420,7 +433,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "group": {
                   "properties": {
@@ -453,7 +467,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "roles": {
                   "ignore_above": 1024,
@@ -537,7 +552,8 @@
                   "type": "keyword"
                 },
                 "original_file_name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "product": {
                   "ignore_above": 1024,
@@ -556,7 +572,8 @@
                   "type": "keyword"
                 },
                 "data": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -591,7 +608,8 @@
                   "type": "keyword"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "registered_domain": {
                   "ignore_above": 1024,
@@ -653,10 +671,12 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "type": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -798,7 +818,8 @@
               "type": "keyword"
             },
             "directory": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "drive_letter": {
               "ignore_above": 1,
@@ -866,7 +887,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "pe": {
               "properties": {
@@ -891,7 +913,8 @@
                   "type": "keyword"
                 },
                 "original_file_name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "product": {
                   "ignore_above": 1024,
@@ -909,7 +932,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "type": {
               "ignore_above": 1024,
@@ -936,7 +960,8 @@
                       "type": "keyword"
                     },
                     "distinguished_name": {
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     },
                     "locality": {
                       "ignore_above": 1024,
@@ -997,7 +1022,8 @@
                       "type": "keyword"
                     },
                     "distinguished_name": {
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     },
                     "locality": {
                       "ignore_above": 1024,
@@ -1073,7 +1099,8 @@
                   "type": "geo_point"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "region_iso_code": {
                   "ignore_above": 1024,
@@ -1086,7 +1113,8 @@
               }
             },
             "hostname": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "id": {
               "ignore_above": 1024,
@@ -1116,7 +1144,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "kernel": {
                   "ignore_above": 1024,
@@ -1129,7 +1158,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "platform": {
                   "ignore_above": 1024,
@@ -1159,7 +1189,8 @@
                   "type": "keyword"
                 },
                 "email": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "full_name": {
                   "fields": {
@@ -1168,7 +1199,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "group": {
                   "properties": {
@@ -1201,7 +1233,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "roles": {
                   "ignore_above": 1024,
@@ -1227,7 +1260,8 @@
                           "type": "text"
                         }
                       },
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -1243,7 +1277,8 @@
                   "type": "keyword"
                 },
                 "referrer": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -1261,7 +1296,8 @@
                           "type": "text"
                         }
                       },
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -1291,7 +1327,8 @@
             "file": {
               "properties": {
                 "path": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -1300,7 +1337,8 @@
               "type": "keyword"
             },
             "logger": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "origin": {
               "properties": {
@@ -1498,7 +1536,8 @@
                   "type": "geo_point"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "region_iso_code": {
                   "ignore_above": 1024,
@@ -1575,7 +1614,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "kernel": {
                   "ignore_above": 1024,
@@ -1588,7 +1628,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "platform": {
                   "ignore_above": 1024,
@@ -1639,7 +1680,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -1734,7 +1776,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "entity_id": {
               "ignore_above": 1024,
@@ -1747,7 +1790,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "exit_code": {
               "type": "long"
@@ -1779,7 +1823,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "parent": {
               "properties": {
@@ -1818,7 +1863,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "entity_id": {
                   "ignore_above": 1024,
@@ -1831,7 +1877,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "exit_code": {
                   "type": "long"
@@ -1863,7 +1910,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "pe": {
                   "properties": {
@@ -1888,7 +1936,8 @@
                       "type": "keyword"
                     },
                     "original_file_name": {
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     },
                     "product": {
                       "ignore_above": 1024,
@@ -1914,7 +1963,8 @@
                       "type": "long"
                     },
                     "name": {
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -1925,7 +1975,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "uptime": {
                   "type": "long"
@@ -1937,7 +1988,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -1964,7 +2016,8 @@
                   "type": "keyword"
                 },
                 "original_file_name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "product": {
                   "ignore_above": 1024,
@@ -1990,7 +2043,8 @@
                   "type": "long"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -2001,7 +2055,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "uptime": {
               "type": "long"
@@ -2013,7 +2068,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -2026,7 +2082,8 @@
                   "type": "keyword"
                 },
                 "strings": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "type": {
                   "ignore_above": 1024,
@@ -2039,10 +2096,12 @@
               "type": "keyword"
             },
             "key": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "path": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "value": {
               "ignore_above": 1024,
@@ -2133,7 +2192,8 @@
                           "type": "text"
                         }
                       },
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 }
@@ -2143,7 +2203,8 @@
               "type": "long"
             },
             "domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "geo": {
               "properties": {
@@ -2167,7 +2228,8 @@
                   "type": "geo_point"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "region_iso_code": {
                   "ignore_above": 1024,
@@ -2203,7 +2265,8 @@
               "type": "long"
             },
             "registered_domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "subdomain": {
               "ignore_above": 1024,
@@ -2220,7 +2283,8 @@
                   "type": "keyword"
                 },
                 "email": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "full_name": {
                   "fields": {
@@ -2229,7 +2293,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "group": {
                   "properties": {
@@ -2262,7 +2327,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "roles": {
                   "ignore_above": 1024,
@@ -2328,7 +2394,8 @@
                           "type": "text"
                         }
                       },
-                      "type": "wildcard"
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 }
@@ -2338,7 +2405,8 @@
               "type": "long"
             },
             "domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "geo": {
               "properties": {
@@ -2362,7 +2430,8 @@
                   "type": "geo_point"
                 },
                 "name": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "region_iso_code": {
                   "ignore_above": 1024,
@@ -2398,7 +2467,8 @@
               "type": "long"
             },
             "registered_domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "subdomain": {
               "ignore_above": 1024,
@@ -2415,7 +2485,8 @@
                   "type": "keyword"
                 },
                 "email": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "full_name": {
                   "fields": {
@@ -2424,7 +2495,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "group": {
                   "properties": {
@@ -2457,7 +2529,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "roles": {
                   "ignore_above": 1024,
@@ -2580,7 +2653,8 @@
                   }
                 },
                 "issuer": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "ja3": {
                   "ignore_above": 1024,
@@ -2597,7 +2671,8 @@
                   "type": "keyword"
                 },
                 "subject": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "supported_ciphers": {
                   "ignore_above": 1024,
@@ -2620,7 +2695,8 @@
                           "type": "keyword"
                         },
                         "distinguished_name": {
-                          "type": "wildcard"
+                          "ignore_above": 1024,
+                          "type": "keyword"
                         },
                         "locality": {
                           "ignore_above": 1024,
@@ -2681,7 +2757,8 @@
                           "type": "keyword"
                         },
                         "distinguished_name": {
-                          "type": "wildcard"
+                          "ignore_above": 1024,
+                          "type": "keyword"
                         },
                         "locality": {
                           "ignore_above": 1024,
@@ -2750,7 +2827,8 @@
                   }
                 },
                 "issuer": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "ja3s": {
                   "ignore_above": 1024,
@@ -2763,7 +2841,8 @@
                   "type": "date"
                 },
                 "subject": {
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "x509": {
                   "properties": {
@@ -2782,7 +2861,8 @@
                           "type": "keyword"
                         },
                         "distinguished_name": {
-                          "type": "wildcard"
+                          "ignore_above": 1024,
+                          "type": "keyword"
                         },
                         "locality": {
                           "ignore_above": 1024,
@@ -2843,7 +2923,8 @@
                           "type": "keyword"
                         },
                         "distinguished_name": {
-                          "type": "wildcard"
+                          "ignore_above": 1024,
+                          "type": "keyword"
                         },
                         "locality": {
                           "ignore_above": 1024,
@@ -2900,7 +2981,8 @@
         "url": {
           "properties": {
             "domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "extension": {
               "ignore_above": 1024,
@@ -2917,7 +2999,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "original": {
               "fields": {
@@ -2926,14 +3009,16 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "password": {
               "ignore_above": 1024,
               "type": "keyword"
             },
             "path": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "port": {
               "type": "long"
@@ -2943,7 +3028,8 @@
               "type": "keyword"
             },
             "registered_domain": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "scheme": {
               "ignore_above": 1024,
@@ -2970,7 +3056,8 @@
               "type": "keyword"
             },
             "email": {
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "full_name": {
               "fields": {
@@ -2979,7 +3066,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "group": {
               "properties": {
@@ -3012,7 +3100,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "roles": {
               "ignore_above": 1024,
@@ -3041,7 +3130,8 @@
                   "type": "text"
                 }
               },
-              "type": "wildcard"
+              "ignore_above": 1024,
+              "type": "keyword"
             },
             "os": {
               "properties": {
@@ -3056,7 +3146,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "kernel": {
                   "ignore_above": 1024,
@@ -3069,7 +3160,8 @@
                       "type": "text"
                     }
                   },
-                  "type": "wildcard"
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 },
                 "platform": {
                   "ignore_above": 1024,