From 5a46c2397b5a0b8c4cd507a33031eba9d9b08e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 17 Dec 2014 13:34:52 +0100 Subject: [PATCH] OpenTSDB: Downsample query field now supports interval template variable, Closes #1242 --- CHANGELOG.md | 1 + src/app/services/opentsdb/opentsdbDatasource.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b860b20c42c..e451b7bf50a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ **Enhancements** - [Issue #1028](https://github.com/grafana/grafana/issues/1028). Graph: New legend option ``hideEmtpy`` to hide series with only null values from legend +- [Issue #1242](https://github.com/grafana/grafana/issues/1242). OpenTSDB: Downsample query field now supports interval template variable **Fixes** - [Issue #1199](https://github.com/grafana/grafana/issues/1199). Graph: fix for series tooltip when one series is hidden/disabled diff --git a/src/app/services/opentsdb/opentsdbDatasource.js b/src/app/services/opentsdb/opentsdbDatasource.js index 96784cbc992..976f5c84cba 100644 --- a/src/app/services/opentsdb/opentsdbDatasource.js +++ b/src/app/services/opentsdb/opentsdbDatasource.js @@ -148,7 +148,7 @@ function (angular, _, kbn) { } if (target.shouldDownsample) { - query.downsample = target.downsampleInterval + "-" + target.downsampleAggregator; + query.downsample = templateSrv.replace(target.downsampleInterval) + "-" + target.downsampleAggregator; } query.tags = angular.copy(target.tags);