IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-18 04:23:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

OpenTSDB: Fixed issue with auto interval variable going below 1s, Fixes #1325

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-02-23 13:04:32 +01:00
parent 2c5f19253c
commit a5fd40ed80
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/features/opentsdb/datasource.js
View File

@ -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);