IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2015-09-18 20:00:11 +09:00
parent 9600b1f103
commit 5dd64b97d2
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,6 +353,30 @@ function (angular, _, dateMath) {
return d.promise;
};
CloudWatchDatasource.prototype.performEC2DescribeInstances = function(region, filters, instanceIds) {
var ec2 = this.getAwsClient(region, 'EC2');
var params = {};
if (filters.length > 0) {
params.Filters = filters;
}
if (instanceIds.length > 0) {
params.InstanceIds = instanceIds;
}
var d = $q.defer();
ec2.describeInstances(params, function(err, data) {
if (err) {
return d.reject(err);
}
return d.resolve(data);
});
return d.promise;
};
CloudWatchDatasource.prototype.getTemplateVariableNames = function() {
var variables = [];
templateSrv.fillVariableValuesForUrl(variables);
@ -440,27 +464,18 @@ function (angular, _, dateMath) {
if (ebsVolumeIdsQuery) {
region = templateSrv.replace(ebsVolumeIdsQuery[1]);
var instanceId = templateSrv.replace(ebsVolumeIdsQuery[2]);
var ec2 = this.getAwsClient(region, 'EC2');
var params = {
InstanceIds: [
var instanceIds = [
instanceId
]
};
ec2.describeInstances(params, function(err, data) {
if (err) {
throw err;
}
];
var volumeIds = _.map(data.Reservations[0].Instances[0].BlockDeviceMappings, function(mapping) {
return this.performEC2DescribeInstances(region, [], instanceIds)
.then(function(result) {
var volumeIds = _.map(result.Reservations[0].Instances[0].BlockDeviceMappings, function(mapping) {
return mapping.EBS.VolumeID;
});
d.resolve(transformSuggestData(volumeIds));
return transformSuggestData(volumeIds);
});
return d.promise;
}
return $q.when([]);