From: Mario Jansen <mario@hosting2go.nl>
Date: Fri, 23 Jun 2023 11:59:50 +0000 (+0200)
Subject: if elasticsearch_version >= 7 we should not send the _type to elasticsearch, deprecat... 
X-Git-Tag: 3.6~59^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4520%2Fhead;p=thirdparty%2Frspamd.git

if elasticsearch_version >= 7 we should not send the _type to elasticsearch, deprecated in es 7, obsolete in es 8
---

diff --git a/src/plugins/lua/elastic.lua b/src/plugins/lua/elastic.lua
index b93186f9a9..ce2d01b80a 100644
--- a/src/plugins/lua/elastic.lua
+++ b/src/plugins/lua/elastic.lua
@@ -57,6 +57,7 @@ local settings = {
   no_ssl_verify = false,
   max_fail = 3,
   ingest_module = false,
+  elasticsearch_version = 6,
 }
 
 local function read_file(path)
@@ -71,8 +72,13 @@ local function elastic_send_data(task)
   local es_index = os.date(settings['index_pattern'])
   local tbl = {}
   for _,value in pairs(rows) do
-    table.insert(tbl, '{ "index" : { "_index" : "'..es_index..
-        '", "_type" : "_doc" ,"pipeline": "rspamd-geoip"} }')
+    if settings.elasticsearch_version >= 7 then
+        table.insert(tbl, '{ "index" : { "_index" : "'..es_index..
+            '","pipeline": "rspamd-geoip"} }')
+    else
+        table.insert(tbl, '{ "index" : { "_index" : "'..es_index..
+            '", "_type" : "_doc" ,"pipeline": "rspamd-geoip"} }')
+    end
     table.insert(tbl, ucl.to_format(value, 'json-compact'))
   end