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

feat(cloudwatch): refactoring cloudwatch datasource code, #684

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-10-02 07:25:54 +02:00
parent af8d12124a
commit 875d80aa72
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,23 +246,20 @@ function (angular, _) {
return d.promise;
}
var allQueryPromise = _.map(queries, _.bind(function(query) {
var allQueryPromise = _.map(queries, function(query) {
return this.performTimeSeriesQuery(query, start, end);
}, this));
}, this);
return $q.all(allQueryPromise)
.then(function(allResponse) {
var result = [];
return $q.all(allQueryPromise).then(function(allResponse) {
var result = [];
_.each(allResponse, function(response, index) {
var metrics = transformMetricData(response, options.targets[index]);
_.each(metrics, function(m) {
result.push(m);
});
});
return { data: result };
_.each(allResponse, function(response, index) {
var metrics = transformMetricData(response.data, options.targets[index]);
result = result.concat(metrics);
});
return { data: result };
});
};
CloudWatchDatasource.prototype.performTimeSeriesQuery = function(query, start, end) {
@ -305,23 +302,18 @@ function (angular, _) {
metricName = templateSrv.replace(metricName);
var cloudwatch = this.getAwsClient(region, 'CloudWatch');
var params = {Namespace: namespace, MetricName: metricName};
var params = {
Namespace: namespace,
MetricName: metricName
};
if (!_.isEmpty(dimensions)) {
params.Dimensions = convertDimensionFormat(dimensions);
}
return cloudwatch.listMetrics(params).then(function(data) {
var suggestData = _.chain(data.Metrics).map(function(metric) {
return cloudwatch.listMetrics(params).then(function(result) {
return _.chain(result.data.Metrics).map(function(metric) {
return metric.Dimensions;
}).reject(function(metric) {
return _.isEmpty(metric);
}).value();
return suggestData;
});
};