Fix template for support elasticsearch v7 #3041

diff --git a/contrib/elastic/rspamd_template.json b/contrib/elastic/rspamd_template.json
index 9119af4c709af50c1792d52a208e17801f12c345..94f54f1c91bd2021e1c811d9131f2254e29e37d0 100644 (file)
--- a/contrib/elastic/rspamd_template.json
+++ b/contrib/elastic/rspamd_template.json
@@ -1,143 +1,138 @@
 {
   "mappings": {
-    "_default_": {
-      "_all": {
-        "norms": false
-      },
-      "_meta": {
-        "version": "5.5.2"
-      },
-      "date_detection": false,
-      "dynamic_templates": [
-        {
-          "strings_as_keyword": {
-            "mapping": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "match_mapping_type": "string"
-          }
+    "_meta": {
+      "version": "5.5.2"
+    },
+    "date_detection": false,
+    "dynamic_templates": [
+      {
+        "strings_as_keyword": {
+          "mapping": {
+            "ignore_above": 1024,
+            "type": "keyword"
+          },
+          "match_mapping_type": "string"
         }
-      ],
-      "properties": {
-        "@timestamp": {
-          "type": "date"
-        },
-        "meta": {
-          "properties": {
-            "cloud": {
-              "properties": {
-                "availability_zone": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "instance_id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "machine_type": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "project_id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "provider": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "region": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
+      }
+    ],
+    "properties": {
+      "@timestamp": {
+        "type": "date"
+      },
+      "meta": {
+        "properties": {
+          "cloud": {
+            "properties": {
+              "availability_zone": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "instance_id": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "machine_type": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "project_id": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "provider": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "region": {
+                "ignore_above": 1024,
+                "type": "keyword"
               }
             }
           }
-        },
-        "rspamd_meta": {
-          "properties": {
-            "action": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "direction": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "asn": {
-              "properties": {
-                "asn": {
-                  "type": "long"
-                },
-                "country_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "ipnet": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "registrant": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
+        }
+      },
+      "rspamd_meta": {
+        "properties": {
+          "action": {
+            "ignore_above": 1024,
+            "type": "keyword"
+          },
+          "direction": {
+            "ignore_above": 1024,
+            "type": "keyword"
+          },
+          "asn": {
+            "properties": {
+              "asn": {
+                "type": "long"
+              },
+              "country_code": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "ipnet": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "registrant": {
+                "ignore_above": 1024,
+                "type": "keyword"
               }
-            },
-            "from": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "is_local": {
-              "type": "boolean"
-            },
-            "webmail": {
-              "type": "boolean"
-            },
-            "geoip": {
-              "properties": {
-                "city_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "continent_name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "country_iso_code": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                },
-                "location": {
-                  "type": "geo_point"
-                }
+            }
+          },
+          "from": {
+            "ignore_above": 1024,
+            "type": "keyword"
+          },
+          "is_local": {
+            "type": "boolean"
+          },
+          "webmail": {
+            "type": "boolean"
+          },
+          "geoip": {
+            "properties": {
+              "city_name": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "continent_name": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "country_iso_code": {
+                "ignore_above": 1024,
+                "type": "keyword"
+              },
+              "location": {
+                "type": "geo_point"
               }
-            },
-            "ip": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "qid": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "hostname": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "score": {
-              "type": "float"
-            },
-            "user": {
-              "ignore_above": 1024,
-              "type": "keyword"
             }
+          },
+          "ip": {
+            "ignore_above": 1024,
+            "type": "keyword"
+          },
+          "qid": {
+            "ignore_above": 1024,
+            "type": "keyword"
+          },
+          "hostname": {
+            "ignore_above": 1024,
+            "type": "keyword"
+          },
+          "score": {
+            "type": "float"
+          },
+          "user": {
+            "ignore_above": 1024,
+            "type": "keyword"
           }
-        },
-        "tags": {
-          "ignore_above": 1024,
-          "type": "keyword"
         }
+      },
+      "tags": {
+        "ignore_above": 1024,
+        "type": "keyword"
       }
     }
   },
@@ -146,5 +141,5 @@
     "index.mapping.total_fields.limit": 10000,
     "index.refresh_interval": "5s"
   },
-  "index_patterns" : ["rspamd-*"]
+  "index_patterns" : ["rspamd-*", "*-rspamd-*"]
 }