From 3588b9732f784b57908cd9276de6a3c051583799 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Mon, 14 Nov 2016 13:40:33 -0800 Subject: [PATCH 1/4] round the seconds --- public/app/plugins/datasource/influxdb/datasource.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 8e7175b0cdf..0f2f92f276c 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -275,7 +275,12 @@ export default class InfluxDatasource { } date = dateMath.parse(date, roundUp); } - return (date.valueOf() / 1000).toFixed(0) + 's'; + + var secs = date.valueOf() / 1000; + if(roundUp) { + secs += 1; + } + return secs.toFixed(0) + 's'; } } From 04356f31d23a8c3752a269154af490d541da15d7 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Mon, 14 Nov 2016 14:56:11 -0800 Subject: [PATCH 2/4] missing space --- public/app/plugins/datasource/influxdb/datasource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 0f2f92f276c..04be1894073 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -277,7 +277,7 @@ export default class InfluxDatasource { } var secs = date.valueOf() / 1000; - if(roundUp) { + if (roundUp) { secs += 1; } return secs.toFixed(0) + 's'; From 7958615097d79daa731700c94b984599a4b63aa7 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Thu, 17 Nov 2016 09:21:25 -0800 Subject: [PATCH 3/4] Use ms rather than second precision --- public/app/plugins/datasource/influxdb/datasource.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 04be1894073..a6d4459c7ff 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -275,12 +275,7 @@ export default class InfluxDatasource { } date = dateMath.parse(date, roundUp); } - - var secs = date.valueOf() / 1000; - if (roundUp) { - secs += 1; - } - return secs.toFixed(0) + 's'; + return date.valueOf() + 'ms'; } } From 0534d43a6eeaf94c359200ba8e3a0a18f8411e02 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Mon, 28 Nov 2016 14:57:36 -0800 Subject: [PATCH 4/4] use ms when query less then 5 mins --- .../app/plugins/datasource/influxdb/datasource.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index a6d4459c7ff..2fc3a945e57 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -250,8 +250,10 @@ export default class InfluxDatasource { }; getTimeFilter(options) { - var from = this.getInfluxTime(options.rangeRaw.from, false); - var until = this.getInfluxTime(options.rangeRaw.to, true); + 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'; if (until === 'now()' && !fromIsAbsolute) { @@ -261,7 +263,7 @@ export default class InfluxDatasource { return 'time > ' + from + ' and time < ' + until; } - getInfluxTime(date, roundUp) { + getInfluxTime(date, roundUp, inMS) { if (_.isString(date)) { if (date === 'now') { return 'now()'; @@ -275,7 +277,11 @@ export default class InfluxDatasource { } date = dateMath.parse(date, roundUp); } - return date.valueOf() + 'ms'; + + if (inMS) { + return date.valueOf() + 'ms'; + } + return (date.valueOf() / 1000).toFixed(0) + 's'; } }