From d198057eaf86cdee57ab91fabfcd6770ed20c6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 21 Nov 2014 10:06:42 +0100 Subject: [PATCH] InfluxDB: fixed issue with using custom/absolute from time to now(), Fixes #1113 --- src/app/services/influxdb/influxdbDatasource.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js index 43e245bfc4c..c30f950e51b 100644 --- a/src/app/services/influxdb/influxdbDatasource.js +++ b/src/app/services/influxdb/influxdbDatasource.js @@ -372,8 +372,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { function getTimeFilter(options) { var from = getInfluxTime(options.range.from); var until = getInfluxTime(options.range.to); + var fromIsAbsolute = from[from.length-1] === 's'; - if (until === 'now()') { + if (until === 'now()' && !fromIsAbsolute) { return 'time > now() - ' + from; }