change(influxdb): always specify absolute time range in milliseconds, refactoring grafana#6571

torkelo · torkelo · commit 62269bb89412 · 2016-12-06T08:56:01.000+01:00
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -250,11 +250,9 @@ export default class InfluxDatasource {
   };
 
   getTimeFilter(options) {
-    var inMS = elapsed < (5 * 60000);
-
-    var from = this.getInfluxTime(options.rangeRaw.from, false, inMS);
-    var until = this.getInfluxTime(options.rangeRaw.to, true, inMS);
-    var fromIsAbsolute = from[from.length-1] === 's';
+    var from = this.getInfluxTime(options.rangeRaw.from, false);
+    var until = this.getInfluxTime(options.rangeRaw.to, true);
+    var fromIsAbsolute = from[from.length-1] === 'ms';
 
     if (until === 'now()' && !fromIsAbsolute) {
       return 'time > ' + from;
@@ -263,7 +261,7 @@ export default class InfluxDatasource {
     return 'time > ' + from + ' and time < ' + until;
   }
 
-  getInfluxTime(date, roundUp, inMS) {
+  getInfluxTime(date, roundUp) {
     if (_.isString(date)) {
       if (date === 'now') {
         return 'now()';
@@ -278,10 +276,7 @@ export default class InfluxDatasource {
       date = dateMath.parse(date, roundUp);
     }
 
-    if (inMS) {
-      return date.valueOf() + 'ms';
-    }
-    return (date.valueOf() / 1000).toFixed(0) + 's';
+    return date.valueOf() + 'ms';
   }
 }
 
