Browse Source

use fielddata_fields in elasticsearch 2.x queries

Resolves issue #8467
Victor Azevedo 8 years ago
parent
commit
0a1c2a7024
1 changed files with 6 additions and 2 deletions
  1. 6 2
      public/app/plugins/datasource/elasticsearch/query_builder.js

+ 6 - 2
public/app/plugins/datasource/elasticsearch/query_builder.js

@@ -119,8 +119,12 @@ function (queryDef) {
       query.fields = ["*", "_source"];
     }
 
-    query.script_fields = {},
-    query.docvalue_fields = [this.timeField];
+    query.script_fields = {};
+    if (this.esVersion < 5) {
+      query.fielddata_fields = [this.timeField];
+    } else {
+      query.docvalue_fields = [this.timeField];
+    }
     return query;
   };