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

refactor

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2016-09-06 01:22:39 +09:00
parent 481cc01242
commit 07cce5f6bd
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/plugins/datasource/cloudwatch/datasource.js
View File

@@ -338,7 +338,20 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
}); });
} }
this.getExpandedVariables = function(target, dimensionKey, variable) {
return _.chain(variable.options)
.filter(function(v) {
return v.selected;
})
.map(function(v) {
var t = angular.copy(target);
t.dimensions[dimensionKey] = v.value;
return t;
}).value();
};
this.expandTemplateVariable = function(targets, templateSrv) { this.expandTemplateVariable = function(targets, templateSrv) {
var self = this;
return _.chain(targets) return _.chain(targets)
.map(function(target) { .map(function(target) {
var dimensionKey = null; var dimensionKey = null;
@@ -353,15 +366,7 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
var variable = _.find(templateSrv.variables, function(variable) { var variable = _.find(templateSrv.variables, function(variable) {
return templateSrv.containsVariable(variableName, variable.name); return templateSrv.containsVariable(variableName, variable.name);
}); });
return _.chain(variable.options) return self.getExpandedVariables(target, dimensionKey, variable);
.filter(function(v) {
return v.selected;
})
.map(function(v) {
var t = angular.copy(target);
t.dimensions[dimensionKey] = v.value;
return t;
}).value();
} else { } else {
return [target]; return [target];
} }