opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 16:04:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: InfluxQL: always apply time interval end (#34308)

Browse Source
This commit is contained in:
Gábor Farkas
2021-05-19 16:24:14 +02:00
committed by GitHub
parent de95bf2c04
commit f48708bb9e
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -530,11 +530,6 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
getTimeFilter(options: any) { getTimeFilter(options: any) {
const from = this.getInfluxTime(options.rangeRaw.from, false, options.timezone); const from = this.getInfluxTime(options.rangeRaw.from, false, options.timezone);
const until = this.getInfluxTime(options.rangeRaw.to, true, options.timezone); const until = this.getInfluxTime(options.rangeRaw.to, true, options.timezone);
const fromIsAbsolute = from[from.length - 1] === 'ms';
if (until === 'now()' && !fromIsAbsolute) {
return 'time >= ' + from;
}
return 'time >= ' + from + ' and time <= ' + until; return 'time >= ' + from + ' and time <= ' + until;
} }