mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Solve issue 3728
Conditionally add a format element to ES annotation queries
This commit is contained in:
parent
a531a1709e
commit
45186255cf
@ -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 } }] } };
|
||||
|
Loading…
Reference in New Issue
Block a user