Merge branch 'master' of github.com:grafana/grafana

2016-03-28 11:16:03 +02:00
parent 6ab1937ff5 576a490435
commit 91c5515d5b
1 changed files with 4 additions and 0 deletions
@@ -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 } }] } };