Fix: remove support for ES6 - resolves #5167

Author: rupozzi

src/DIRAC/Core/Utilities/ElasticSearchDB.py

@@ -11,13 +11,13 @@
 import functools
 import json
 
-try: 
+try:
     from opensearchpy import OpenSearch as Elasticsearch
     from opensearch_dsl import Search, Q, A
     from opensearchpy.exceptions import ConnectionError, TransportError, NotFoundError, RequestError
     from opensearchpy.helpers import BulkIndexError, bulk
-except ImportError: 
-    from elasticsearch import Elasticsearch 
+except ImportError:
+    from elasticsearch import Elasticsearch
     from elasticsearch_dsl import Search, Q, A
     from elasticsearch.exceptions import ConnectionError, TransportError, NotFoundError, RequestError
     from elasticsearch.helpers import BulkIndexError, bulk
@@ -53,8 +53,7 @@ def generateDocs(data, withTimeStamp=True):
     :return: doc
     """
     for doc in copy.deepcopy(data):
-        if "_type" not in doc:
-            doc["_type"] = "_doc"
+
         if withTimeStamp:
             if "timestamp" not in doc:
                 sLog.warn("timestamp is not given")
@@ -231,7 +230,7 @@ def update(self, index, query=None, updateByQuery=True, id=None):
             if updateByQuery:
                 esDSLQueryResult = self.client.update_by_query(index=index, body=query)
             else:
-                esDSLQueryResult = self.client.index(index=index, doc_type="_doc", body=query, id=id)
+                esDSLQueryResult = self.client.index(index=index, body=query, id=id)
             return S_OK(esDSLQueryResult)
         except RequestError as re:
             return S_ERROR(re)
@@ -343,11 +342,8 @@ def createIndex(self, indexPrefix, mapping=None, period="day"):
 
         try:
             sLog.info("Create index: ", fullIndex + str(mapping))
-            try:
-                self.client.indices.create(index=fullIndex, body={"mappings": mapping})  # ES7
-            except RequestError as re:
-                if re.error == "mapper_parsing_exception":
-                    self.client.indices.create(index=fullIndex, body={"mappings": {"_doc": mapping}})  # ES6
+            self.client.indices.create(index=fullIndex, body={"mappings": mapping})  # ES7
+
             return S_OK(fullIndex)
         except Exception as e:  # pylint: disable=broad-except
             sLog.error("Can not create the index:", repr(e))
@@ -388,7 +384,7 @@ def index(self, indexName, body=None, docID=None):
             return S_ERROR("Missing index or body")
 
         try:
-            res = self.client.index(index=indexName, doc_type="_doc", body=body, id=docID)
+            res = self.client.index(index=indexName, body=body, id=docID)
         except (RequestError, TransportError) as e:
             sLog.exception()
             return S_ERROR(e)

src/DIRAC/MonitoringSystem/DB/MonitoringDB.py

@@ -138,14 +138,7 @@ def getKeyValues(self, monitoringType):
         docs = retVal["Value"]
         self.log.debug("Doc types", docs)
         monfields = self.documentTypes[monitoringType]["monitoringFields"]
-
-        try:
-            properties = docs[monitoringType]["properties"]  # "old" way, with ES types == Monitoring types
-        except KeyError:
-            try:
-                properties = docs["_doc"]["properties"]  # "ES6" way, with ES types == '_doc'
-            except KeyError:
-                properties = docs["properties"]  # "ES7" way, no types
+        properties = docs["properties"]  # "ES7" way, no types
 
         for i in properties:
             if i not in monfields and not i.startswith("time") and i != "metric":