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:51:10 +09:00
parent 07cce5f6bd
commit 71b5007ec7
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -354,17 +354,13 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
var self = this; var self = this;
return _.chain(targets) return _.chain(targets)
.map(function(target) { .map(function(target) {
var dimensionKey = null; var dimensionKey = _.findKey(target.dimensions, function(v) {
var variableName = null; return templateSrv.variableExists(v);
_.each(target.dimensions, function(v, k) {
if (templateSrv.variableExists(v)) {
dimensionKey = k;
variableName = v;
}
}); });
if (dimensionKey) { if (dimensionKey) {
var variable = _.find(templateSrv.variables, function(variable) { var variable = _.find(templateSrv.variables, function(variable) {
return templateSrv.containsVariable(variableName, variable.name); return templateSrv.containsVariable(target.dimensions[dimensionKey], variable.name);
}); });
return self.getExpandedVariables(target, dimensionKey, variable); return self.getExpandedVariables(target, dimensionKey, variable);
} else { } else {