|
@@ -372,8 +372,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
|
|
|
function getTimeFilter(options) {
|
|
function getTimeFilter(options) {
|
|
|
var from = getInfluxTime(options.range.from);
|
|
var from = getInfluxTime(options.range.from);
|
|
|
var until = getInfluxTime(options.range.to);
|
|
var until = getInfluxTime(options.range.to);
|
|
|
|
|
+ var fromIsAbsolute = from[from.length-1] === 's';
|
|
|
|
|
|
|
|
- if (until === 'now()') {
|
|
|
|
|
|
|
+ if (until === 'now()' && !fromIsAbsolute) {
|
|
|
return 'time > now() - ' + from;
|
|
return 'time > now() - ' + from;
|
|
|
}
|
|
}
|
|
|
|
|
|