|
@@ -103,8 +103,24 @@ function (angular, _, dateMath) {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
this.targetContainsTemplate = function(target) {
|
|
this.targetContainsTemplate = function(target) {
|
|
|
- console.log(target);
|
|
|
|
|
- return false;
|
|
|
|
|
|
|
+ // Checking for template variables in filters
|
|
|
|
|
+ if (target.filters.length > 0) {
|
|
|
|
|
+ for (var i = 0; i < target.filters.length; i++) {
|
|
|
|
|
+ if (templateSrv.variableExists(target.filters[i].filter)) {
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ // Checking for template variables in tags
|
|
|
|
|
+ else if (Object.keys(target.tags).length > 0) {
|
|
|
|
|
+ for (var tagKey in target.tags) {
|
|
|
|
|
+ if (templateSrv.variableExists(target.tags[tagKey])) {
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
this.performTimeSeriesQuery = function(queries, start, end) {
|
|
this.performTimeSeriesQuery = function(queries, start, end) {
|