IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: fixed issue with using custom/absolute from time to now(), Fixes #1113

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-11-21 10:06:42 +01:00
parent 88c2f18b20
commit d198057eaf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/services/influxdb/influxdbDatasource.js
View File

@ -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;
}