From cb2dde70fe66ed96aa967832659efce78e92f80e 2019-04-07 13:06:19
From: Marcin Lulek <info@webreactor.eu>
Date: 2019-04-07 13:06:19
Subject: [PATCH] elasticsearch: bump to ES 6.x

---

diff --git a/.travis.yml b/.travis.yml
index 7b4bd21..1f1334a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,13 @@ notifications:
 matrix:
   include:
   - python: 3.5
-    env: TOXENV=py35
+    env: TOXENV=py35 ES_VERSION=6.6.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz
   - python: 3.6
-    env: TOXENV=py36
+    env: TOXENV=py36 ES_VERSION=6.6.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz
     addons:
       postgresql: "9.6"
   - python: 3.6
-    env: TOXENV=py36 PGPORT=5432
+    env: TOXENV=py36 PGPORT=5432 ES_VERSION=6.6.2 ES_DOWNLOAD_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz
     addons:
       postgresql: "10"
       apt:
@@ -24,6 +24,9 @@ matrix:
         - postgresql-client-10
 
 install:
+- wget ${ES_DOWNLOAD_URL}
+- tar -xzf elasticsearch-${ES_VERSION}.tar.gz
+- ./elasticsearch-${ES_VERSION}/bin/elasticsearch &
 - travis_retry pip install -U setuptools pip tox
 
 script:
diff --git a/backend/src/appenlight/scripts/reindex_elasticsearch.py b/backend/src/appenlight/scripts/reindex_elasticsearch.py
index 06eba8b..4bac808 100644
--- a/backend/src/appenlight/scripts/reindex_elasticsearch.py
+++ b/backend/src/appenlight/scripts/reindex_elasticsearch.py
@@ -215,8 +215,7 @@ def update_template():
         "settings": {
             "index": {
                 "refresh_interval": "5s",
-                "translog": {"sync_interval": "5s", "durability": "async"},
-                "mapping": {"single_type": True}
+                "translog": {"sync_interval": "5s", "durability": "async"}
             },
             "number_of_shards": 5,
             "analysis": shared_analysis,
@@ -298,7 +297,6 @@ def update_template():
             "index": {
                 "refresh_interval": "5s",
                 "translog": {"sync_interval": "5s", "durability": "async"},
-                "mapping": {"single_type": True}
             },
             "number_of_shards": 5,
             "analysis": shared_analysis,
@@ -320,7 +318,6 @@ def update_template():
             "index": {
                 "refresh_interval": "5s",
                 "translog": {"sync_interval": "5s", "durability": "async"},
-                "mapping": {"single_type": True}
             },
             "number_of_shards": 5,
             "analysis": shared_analysis,
@@ -342,7 +339,6 @@ def update_template():
             "index": {
                 "refresh_interval": "5s",
                 "translog": {"sync_interval": "5s", "durability": "async"},
-                "mapping": {"single_type": True}
             },
             "number_of_shards": 5,
             "analysis": shared_analysis,
@@ -364,7 +360,6 @@ def update_template():
             "index": {
                 "refresh_interval": "5s",
                 "translog": {"sync_interval": "5s", "durability": "async"},
-                "mapping": {"single_type": True}
             },
             "number_of_shards": 5,
             "analysis": shared_analysis,