From ed515d70639d8251e0644b0ad58350e9cb8cc632 Mon Sep 17 00:00:00 2001
From: DESPRES Damien <ddespres@neogeo.fr>
Date: Mon, 14 Feb 2022 16:45:37 +0100
Subject: [PATCH] retour a ES6
---
lib/elasticsearch_template.py | 4 ++--
main.py | 9 +++++----
requirements.txt | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/elasticsearch_template.py b/lib/elasticsearch_template.py
index 564f16f..ecb67fb 100644
--- a/lib/elasticsearch_template.py
+++ b/lib/elasticsearch_template.py
@@ -101,7 +101,7 @@ template = {
}
},
"mappings" : {
- # "_doc" : {
+ "_doc" : {
"dynamic_templates": [ # priority is given by order!
{
"geoshape-template" : {
@@ -293,6 +293,6 @@ template = {
}
}
]
- # }
+ }
}
}
diff --git a/main.py b/main.py
index 5efc7e2..48f98bc 100644
--- a/main.py
+++ b/main.py
@@ -26,7 +26,7 @@ def setup_indices(cfg):
"refresh_interval": "30s"
},
"mappings": {
- # "_doc": {
+ "_doc": {
"dynamic_templates": [ # priority is given by order!
{
"uuid" : {
@@ -46,13 +46,13 @@ def setup_indices(cfg):
"default" : {
"path_match": "*",
"mapping": {
- "enabled": False
+ "enabled": "false"
}
}
}
]
}
- #}
+ }
}
try:
@@ -78,7 +78,8 @@ def setup_indices(cfg):
try:
logging.info('Create index %s'% cfg['reindexer']['template_name'])
- rep = destin_es.indices.put_template(cfg['reindexer']['template_name'], template)
+ rep = destin_es.indices.create(cfg['reindexer']['template_name'], template)
+ # ES7 rep = destin_es.indices.put_template(cfg['reindexer']['template_name'], template)
logging.info(rep)
except Exception as e:
logging.warning(e)
diff --git a/requirements.txt b/requirements.txt
index 66e047f..5d38e78 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ pytz
pymongo
#tqdm
# Elasticsearch 6.x
-elasticsearch>=7.0.0,<8.0.0
+elasticsearch>=6.0.0,<7.0.0
# N.B.: GeoAlchemy2 0.6.1 does not accept POINTZ, MULTILINESTRINGZ, ... geometries
GeoAlchemy2==0.5.0
psycopg2-binary>=2.7.0
--
GitLab