IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 21:19:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

change(influxdb): always specify absolute time range in milliseconds, refactoring #6571

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-12-06 08:56:01 +01:00
parent c6bb86d833
commit 62269bb894
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,11 +250,9 @@ export default class InfluxDatasource {
};
getTimeFilter(options) {
var inMS = elapsed < (5 * 60000);
var from = this.getInfluxTime(options.rangeRaw.from, false, inMS);
var until = this.getInfluxTime(options.rangeRaw.to, true, inMS);
var fromIsAbsolute = from[from.length-1] === 's';
var from = this.getInfluxTime(options.rangeRaw.from, false);
var until = this.getInfluxTime(options.rangeRaw.to, true);
var fromIsAbsolute = from[from.length-1] === 'ms';
if (until === 'now()' && !fromIsAbsolute) {
return 'time > ' + from;
@ -263,7 +261,7 @@ export default class InfluxDatasource {
return 'time > ' + from + ' and time < ' + until;
}
getInfluxTime(date, roundUp, inMS) {
getInfluxTime(date, roundUp) {
if (_.isString(date)) {
if (date === 'now') {
return 'now()';
@ -278,10 +276,7 @@ export default class InfluxDatasource {
date = dateMath.parse(date, roundUp);
}
if (inMS) {
return date.valueOf() + 'ms';
}
return (date.valueOf() / 1000).toFixed(0) + 's';
return date.valueOf() + 'ms';
}
}