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

minor fix

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2016-03-11 17:04:42 +09:00
parent 25f08ddd39
commit b989e2ce37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
if (ec2InstanceAttributeQuery) { if (ec2InstanceAttributeQuery) {
region = templateSrv.replace(ec2InstanceAttributeQuery[1]); region = templateSrv.replace(ec2InstanceAttributeQuery[1]);
var filterJson = JSON.parse(templateSrv.replace(ec2InstanceAttributeQuery[3])); var filterJson = JSON.parse(templateSrv.replace(ec2InstanceAttributeQuery[3]));
var filter = _.map(filterJson, function(values, name) { var filters = _.map(filterJson, function(values, name) {
return { return {
Name: name, Name: name,
Values: values Values: values
@ -217,7 +217,7 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
}); });
var targetAttributeName = templateSrv.replace(ec2InstanceAttributeQuery[2]); var targetAttributeName = templateSrv.replace(ec2InstanceAttributeQuery[2]);
return this.performEC2DescribeInstances(region, filter, null).then(function(result) { return this.performEC2DescribeInstances(region, filters, null).then(function(result) {
var attributes = _.chain(result.Reservations) var attributes = _.chain(result.Reservations)
.map(function(reservations) { .map(function(reservations) {
return _.pluck(reservations.Instances, targetAttributeName); return _.pluck(reservations.Instances, targetAttributeName);