IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

enable sending calculated interval to opentsdb downsample

Browse Source
This commit is contained in:
Teet Talviste 2015-02-06 18:15:27 +02:00
parent 2cc9515fd6
commit 72f6dc1e0c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,15 @@ function (angular, _, kbn) {
OpenTSDBDatasource.prototype.query = function(options) { OpenTSDBDatasource.prototype.query = function(options) {
var start = convertToTSDBTime(options.range.from); var start = convertToTSDBTime(options.range.from);
var end = convertToTSDBTime(options.range.to); var end = convertToTSDBTime(options.range.to);
var queries = _.compact(_.map(options.targets, convertTargetToQuery)); var qs = Array();
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));
}
);
var queries = _.compact(qs);
// No valid targets, return the empty result to save a round trip. // No valid targets, return the empty result to save a round trip.
if (_.isEmpty(queries)) { if (_.isEmpty(queries)) {
@ -119,7 +127,7 @@ function (angular, _, kbn) {
return metric; return metric;
} }
function convertTargetToQuery(target) { function convertTargetToQuery(target, interval) {
if (!target.metric) { if (!target.metric) {
return null; return null;
} }
@ -149,7 +157,7 @@ function (angular, _, kbn) {
} }
if (target.shouldDownsample) { if (target.shouldDownsample) {
query.downsample = templateSrv.replace(target.downsampleInterval) + "-" + target.downsampleAggregator; query.downsample = templateSrv.replace(target.downsampleInterval ? target.downsampleInterval : interval ) + "-" + target.downsampleAggregator;
} }
query.tags = angular.copy(target.tags); query.tags = angular.copy(target.tags);