From 45186255cfd5398f16d34b8a93b798e3b31519f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Thu, 24 Mar 2016 17:58:03 +0100 Subject: [PATCH] Solve issue 3728 Conditionally add a format element to ES annotation queries --- public/app/plugins/datasource/elasticsearch/datasource.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js index b048c206edb..c7c2351d0cc 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.js +++ b/public/app/plugins/datasource/elasticsearch/datasource.js @@ -74,6 +74,10 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes to: options.range.to.valueOf(), }; + if (this.esVersion >= 2) { + range[timeField]["format"] = "epoch_millis"; + } + var queryInterpolated = templateSrv.replace(queryString); var filter = { "bool": { "must": [{ "range": range }] } }; var query = { "bool": { "should": [{ "query_string": { "query": queryInterpolated } }] } };