Merge pull request #443 from PanDAWMS/unify-es-index-config

Unify es index config
PanDAWMS · Jul 5, 2022 · 5af54ca · 5af54ca
2 parents 3860022 + 4212e36
commit 5af54ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/Utils/Dataflow/data4es/071_esConsistency/consistency.py b/Utils/Dataflow/data4es/071_esConsistency/consistency.py
@@ -61,7 +61,7 @@ def load_config(fname):
         'ES_USER': '',
         'ES_PASSWORD': '',
         'ES_CA_CERTS': '/etc/pki/tls/certs/CERN-bundle.pem',
-        'ES_INDEX': ''
+        'ES_INDEX_TASKS': ''
     }
     with open(fname) as f:
         lines = f.readlines()
@@ -76,7 +76,7 @@ def load_config(fname):
             if key in cfg:
                 cfg[key] = value
     global INDEX
-    INDEX = cfg['ES_INDEX']
+    INDEX = cfg['ES_INDEX_TASKS']
     return cfg
 
 

diff --git a/Utils/Elasticsearch/config/es.example b/Utils/Elasticsearch/config/es.example
@@ -15,10 +15,3 @@ ES_INDEX_PROGRESS=production_progress
                                  # avail: production_progress,
                                  #        analysis_progress
 
-
-# ---
-#
-# This variable is left for backwards compatibility:
-# some stages of the `data4es` dataflow rely on it.
-# TODO: replace with ES_INDEX_TASKS everywhere
-ES_INDEX=tasks_production        #default index to work with