public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tsdb_downsample' of https://github.com/frogmaster/grafana into frogmaster-tsdb_downsample

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-02-23 11:45:30 +01:00
parent 9c8134f8bc a0a4b04007
commit 2ae0ef94de
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/features/opentsdb/datasource.js
+11 -3
View File
@@ -24,7 +24,14 @@ 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 = [];
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 +126,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 +156,8 @@ function (angular, _, kbn) {
} }
if (target.shouldDownsample) { if (target.shouldDownsample) {
query.downsample = templateSrv.replace(target.downsampleInterval) + "-" + target.downsampleAggregator; var buf = target.downsampleInterval || interval;
query.downsample = templateSrv.replace(buf) + "-" + target.downsampleAggregator;
} }
query.tags = angular.copy(target.tags); query.tags = angular.copy(target.tags);