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

opentsdb: apply templating on filters (#4594)

Browse Source
This commit is contained in:
Mathieu Payeur Levallois 2016-05-04 07:47:05 -04:00 committed by Torkel Ödegaard
parent bd15534360
commit c86cdb1805
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/plugins/datasource/opentsdb/datasource.js
View File

@ -376,11 +376,16 @@ function (angular, _, dateMath) {
if (target.filters && target.filters.length > 0) { if (target.filters && target.filters.length > 0) {
query.filters = angular.copy(target.filters); query.filters = angular.copy(target.filters);
if(query.filters){
for(var filter_key in query.filters){
query.filters[filter_key].filter = templateSrv.replace(query.filters[filter_key].filter, options.scopedVars, 'pipe');
}
}
} else { } else {
query.tags = angular.copy(target.tags); query.tags = angular.copy(target.tags);
if(query.tags){ if(query.tags){
for(var key in query.tags){ for(var tag_key in query.tags){
query.tags[key] = templateSrv.replace(query.tags[key], options.scopedVars, 'pipe'); query.tags[tag_key] = templateSrv.replace(query.tags[tag_key], options.scopedVars, 'pipe');
} }
} }
} }