From a5fd40ed8045e4072f58ded23e811204285482b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 23 Feb 2015 13:04:32 +0100 Subject: [PATCH] OpenTSDB: Fixed issue with auto interval variable going below 1s, Fixes #1325 --- src/app/features/opentsdb/datasource.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/features/opentsdb/datasource.js b/src/app/features/opentsdb/datasource.js index 17b98ba9dca..4dc639ce45f 100644 --- a/src/app/features/opentsdb/datasource.js +++ b/src/app/features/opentsdb/datasource.js @@ -26,9 +26,6 @@ function (angular, _, kbn) { var end = convertToTSDBTime(options.range.to); var qs = []; - if (options.interval.match(/\.[0-9]+s/)) { - options.interval = parseFloat(options.interval)*1000 + "ms"; - } _.each(options.targets, function(target) { qs.push(convertTargetToQuery(target, options.interval)); }); @@ -158,8 +155,13 @@ function (angular, _, kbn) { } if (!target.disableDownsampling) { - var buf = target.downsampleInterval || interval; - query.downsample = templateSrv.replace(buf) + "-" + target.downsampleAggregator; + interval = templateSrv.replace(target.downsampleInterval || interval); + + if (interval.match(/\.[0-9]+s/)) { + interval = parseFloat(interval)*1000 + "ms"; + } + + query.downsample = interval + "-" + target.downsampleAggregator; } query.tags = angular.copy(target.tags);