Explorar o código

Merge pull request #3288 from replay/fix_time_format

specify date format in elastic search query
Torkel Ödegaard %!s(int64=10) %!d(string=hai) anos
pai
achega
924ecce2c3

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

@@ -10,7 +10,7 @@ function (angular) {
 
   ElasticQueryBuilder.prototype.getRangeFilter = function() {
     var filter = {};
-    filter[this.timeField] = {"gte": "$timeFrom", "lte": "$timeTo"};
+    filter[this.timeField] = {"gte": "$timeFrom", "lte": "$timeTo", "format": "epoch_millis"};
     return filter;
   };
 
@@ -127,6 +127,7 @@ function (angular) {
             "interval": this.getInterval(aggDef),
             "field": this.timeField,
             "min_doc_count": 0,
+            "format": "epoch_millis",
             "extended_bounds": { "min": "$timeFrom", "max": "$timeTo" }
           };
           break;