Explorar o código

Add time extremity with InfluxDB (#8722)

Louis Ventre %!s(int64=8) %!d(string=hai) anos
pai
achega
97d1676fe8
Modificáronse 1 ficheiros con 2 adicións e 3 borrados
  1. 2 3
      public/app/plugins/datasource/influxdb/datasource.ts

+ 2 - 3
public/app/plugins/datasource/influxdb/datasource.ts

@@ -263,10 +263,10 @@ export default class InfluxDatasource {
     var fromIsAbsolute = from[from.length-1] === 'ms';
     var fromIsAbsolute = from[from.length-1] === 'ms';
 
 
     if (until === 'now()' && !fromIsAbsolute) {
     if (until === 'now()' && !fromIsAbsolute) {
-      return 'time > ' + from;
+      return 'time >= ' + from;
     }
     }
 
 
-    return 'time > ' + from + ' and time < ' + until;
+    return 'time >= ' + from + ' and time <= ' + until;
   }
   }
 
 
   getInfluxTime(date, roundUp) {
   getInfluxTime(date, roundUp) {
@@ -287,4 +287,3 @@ export default class InfluxDatasource {
     return date.valueOf() + 'ms';
     return date.valueOf() + 'ms';
   }
   }
 }
 }
-