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

remove getDimensions()

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2015-11-17 22:49:46 +09:00
parent 1bbd056797
commit ae7e7e9656
2 changed files with 4 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ function (angular, _) {
});
};
CloudWatchDatasource.prototype.getDimensions = function(region, namespace, metricName, filterDimensions) {
CloudWatchDatasource.prototype.getDimensionValues = function(region, namespace, metricName, dimensionKey, filterDimensions) {
var request = {
region: templateSrv.replace(region),
action: 'ListMetrics',
@@ -124,13 +124,8 @@ function (angular, _) {
};
return this.awsRequest(request).then(function(result) {
return _.pluck(result.Metrics, 'Dimensions');
});
};
CloudWatchDatasource.prototype.getDimensionValues = function(region, namespace, metricName, dimensionKey, filterDimensions) {
return this.getDimensions(region, namespace, metricName, filterDimensions).then(function(dimensions) {
return _.chain(dimensions)
return _.chain(result.Metrics)
.pluck('Dimensions')
.flatten()
.filter(function(dimension) {
return dimension.Name === dimensionKey;
@@ -212,30 +207,6 @@ function (angular, _) {
return this.getDimensionValues(region, namespace, metricName, dimensionKey, dimensions);
}
var dimensionsQuery = query.match(/^dimensions\(([^,]+?),\s?([^,]+?),\s?([^,]+?)(,\s?([^)]*))?\)/);
if (dimensionsQuery) {
region = templateSrv.replace(dimensionsQuery[1]);
namespace = templateSrv.replace(dimensionsQuery[2]);
metricName = templateSrv.replace(dimensionsQuery[3]);
dimensionPart = templateSrv.replace(dimensionsQuery[5]);
dimensions = parseDimensions(dimensionPart);
return this.getDimensions(region, namespace, metricName, dimensions).then(function(result) {
return _.map(result, function(dimensions) {
var values = _.chain(dimensions)
.sortBy(function(dimension) {
return dimension.Name;
})
.map(function(dimension) {
return dimension.Name + '=' + dimension.Value;
})
.value().join(',');
return { text: values };
});
});
}
var ebsVolumeIdsQuery = query.match(/^ebs_volume_ids\(([^,]+?),\s?([^,]+?)\)/);
if (ebsVolumeIdsQuery) {
region = templateSrv.replace(ebsVolumeIdsQuery[1]);
@@ -263,7 +234,7 @@ function (angular, _) {
var metricName = 'EstimatedCharges';
var dimensions = {};
return this.getDimensions(region, namespace, metricName, dimensions).then(function () {
return this.getDimensionValues(region, namespace, metricName, 'ServiceName', dimensions).then(function () {
return { status: 'success', message: 'Data source is working', title: 'Success' };
});
};

24
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
View File

@@ -146,30 +146,6 @@ describe('CloudWatchDatasource', function() {
});
});
describeMetricFindQuery('dimensions(us-east-1,AWS/EC2,CPUUtilization)', scenario => {
scenario.setup(() => {
scenario.requestResponse = {
Metrics: [
{
Namespace: 'AWS/EC2',
MetricName: 'CPUUtilization',
Dimensions: [
{
Name: 'InstanceId',
Value: 'i-12345678'
}
]
}
]
};
});
it('should call __ListMetrics and return result', () => {
expect(scenario.result[0].text).to.be('InstanceId=i-12345678');
expect(scenario.request.data.action).to.be('ListMetrics');
});
});
describeMetricFindQuery('dimension_values(us-east-1,AWS/EC2,CPUUtilization,InstanceId)', scenario => {
scenario.setup(() => {
scenario.requestResponse = {