..F.....S. [ZBXNEXT-5825,ZBXNEXT-5826] fixed support of Elasticsearch version 7.x

* commit '78c362d4262ddc5f0d5af94e5240628a4a68f15c':
  ........S. [ZBXNEXT-5825] fixed ChangeLog entry
  ........S. [ZBXNEXT-5825] added ChangeLog entry
  A......... [ZBXNEXT-5825,ZBXNEXT-5826] fixed value retrival for line graphs
  ........S. [ZBXNEXT-5825] fixed support of Elasticsearch version 7.x
  ..F....... [ZBXNEXT-5825,ZBXNEXT-5826] updated endpoint for elasticsearch

1 files changed, 74 insertions, 84 deletions

diff --git a/database/elasticsearch/elasticsearch.map b/database/elasticsearch/elasticsearch.map
index 32ea9ea9244..d494468cbaf 100644
--- a/database/elasticsearch/elasticsearch.map
+++ b/database/elasticsearch/elasticsearch.map
@@ -1,25 +1,23 @@
 # uint mapping
 
 {
-   "settings" : {
-      "index" : {
-         "number_of_replicas" : 1,
-         "number_of_shards" : 5
+   "settings": {
+      "index": {
+         "number_of_replicas": 1,
+         "number_of_shards": 5
       }
    },
-   "mappings" : {
-      "values" : {
-         "properties" : {
-            "itemid" : {
-               "type" : "long"
-            },
-            "clock" : {
-               "format" : "epoch_second",
-               "type" : "date"
-            },
-            "value" : {
-               "type" : "long"
-            }
+   "mappings": {
+      "properties": {
+         "itemid": {
+            "type": "long"
+         },
+         "clock": {
+            "format": "epoch_second",
+            "type": "date"
+         },
+         "value": {
+            "type": "long"
          }
       }
    }
@@ -29,25 +27,23 @@
 # dbl mapping
 
 {
-   "settings" : {
-      "index" : {
-         "number_of_replicas" : 1,
-         "number_of_shards" : 5
+   "settings": {
+      "index": {
+         "number_of_replicas": 1,
+         "number_of_shards": 5
       }
    },
-   "mappings" : {
-      "values" : {
-         "properties" : {
-            "itemid" : {
-               "type" : "long"
-            },
-            "clock" : {
-               "format" : "epoch_second",
-               "type" : "date"
-            },
-            "value" : {
-               "type" : "double"
-            }
+   "mappings": {
+      "properties": {
+         "itemid": {
+            "type": "long"
+         },
+         "clock": {
+            "format": "epoch_second",
+            "type": "date"
+         },
+         "value": {
+            "type": "double"
          }
       }
    }
@@ -57,33 +53,31 @@
 # str mapping
 
 {
-   "settings" : {
-      "index" : {
-         "number_of_replicas" : 1,
-         "number_of_shards" : 5
+   "settings": {
+      "index": {
+         "number_of_replicas": 1,
+         "number_of_shards": 5
       }
    },
-   "mappings" : {
-      "values" : {
-         "properties" : {
-            "itemid" : {
-               "type" : "long"
+   "mappings": {
+      "properties": {
+         "itemid": {
+            "type": "long"
+         },
+         "clock": {
+            "format": "epoch_second",
+            "type": "date"
+         },
+         "value": {
+            "fields": {
+               "analyzed": {
+                  "index": true,
+                  "type": "text",
+                  "analyzer": "standard"
+               }
             },
-            "clock" : {
-               "format" : "epoch_second",
-               "type" : "date"
-            },
-            "value" : {
-               "fields" : {
-                  "analyzed" : {
-                     "index" : true,
-                     "type" : "text",
-                     "analyzer" : "standard"
-                  }
-               },
-               "index" : false,
-               "type" : "text"
-            }
+            "index": false,
+            "type": "text"
          }
       }
    }
@@ -100,7 +94,6 @@
       }
    },
    "mappings" : {
-      "values" : {
          "properties" : {
             "itemid" : {
                "type" : "long"
@@ -121,7 +114,6 @@
                "type" : "text"
             }
          }
-      }
    }
 }
 
@@ -129,33 +121,31 @@
 # log mapping
 
 {
-   "settings" : {
-      "index" : {
-         "number_of_replicas" : 1,
-         "number_of_shards" : 5
+   "settings": {
+      "index": {
+         "number_of_replicas": 1,
+         "number_of_shards": 5
       }
    },
-   "mappings" : {
-      "values" : {
-         "properties" : {
-            "itemid" : {
-               "type" : "long"
-            },
-            "clock" : {
-               "format" : "epoch_second",
-               "type" : "date"
+   "mappings": {
+      "properties": {
+         "itemid": {
+            "type": "long"
+         },
+         "clock": {
+            "format": "epoch_second",
+            "type": "date"
+         },
+         "value": {
+            "fields": {
+               "analyzed": {
+                  "index": true,
+                  "type": "text",
+                  "analyzer": "standard"
+               }
             },
-            "value" : {
-               "fields" : {
-                  "analyzed" : {
-                     "index" : true,
-                     "type" : "text",
-                     "analyzer" : "standard"
-                  }
-               },
-               "index" : false,
-               "type" : "text"
-            }
+            "index": false,
+            "type": "text"
          }
       }
    }