Просмотр исходного кода

OpenTSDB: Downsample query field now supports interval template variable, Closes #1242

Torkel Ödegaard 11 лет назад
Родитель
Сommit
5a46c2397b
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      CHANGELOG.md
  2. 1 1
      src/app/services/opentsdb/opentsdbDatasource.js

+ 1 - 0
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

+ 1 - 1
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);