From f844cd844badb41d3c1e271e4551ae902bee29dc Mon Sep 17 00:00:00 2001 From: Leandro Piccilli Date: Thu, 11 Aug 2016 22:24:58 +0200 Subject: [PATCH] Fix for annotations query on ES 5.x --- public/app/plugins/datasource/elasticsearch/datasource.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js index 8484e5aa258..2f8249f00a7 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.js +++ b/public/app/plugins/datasource/elasticsearch/datasource.js @@ -82,11 +82,15 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes var query = { "bool": { "must": [{ "range": range }, { "query_string": { "query": queryInterpolated } }] }}; var data = { - "fields": [timeField, "_source"], "query" : query, "size": 10000 }; + // fields field not supported on ES 5.x + if (this.esVersion < 5) { + data["fields"] = [timeField, "_source"]; + } + var header = {search_type: "query_then_fetch", "ignore_unavailable": true}; // old elastic annotations had index specified on them