|
@@ -151,8 +151,6 @@ function (angular, _) {
|
|
|
var region;
|
|
var region;
|
|
|
var namespace;
|
|
var namespace;
|
|
|
var metricName;
|
|
var metricName;
|
|
|
- var dimensionPart;
|
|
|
|
|
- var dimensions;
|
|
|
|
|
|
|
|
|
|
var transformSuggestData = function(suggestData) {
|
|
var transformSuggestData = function(suggestData) {
|
|
|
return _.map(suggestData, function(v) {
|
|
return _.map(suggestData, function(v) {
|
|
@@ -160,21 +158,6 @@ function (angular, _) {
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- var parseDimensions = function(dimensionPart) {
|
|
|
|
|
- if (_.isEmpty(dimensionPart)) {
|
|
|
|
|
- return {};
|
|
|
|
|
- }
|
|
|
|
|
- var dimensions = {};
|
|
|
|
|
- _.each(dimensionPart.split(','), function(v) {
|
|
|
|
|
- var t = v.split('=');
|
|
|
|
|
- if (t.length !== 2) {
|
|
|
|
|
- throw new Error('Invalid query format');
|
|
|
|
|
- }
|
|
|
|
|
- dimensions[t[0]] = t[1];
|
|
|
|
|
- });
|
|
|
|
|
- return dimensions;
|
|
|
|
|
- };
|
|
|
|
|
-
|
|
|
|
|
var regionQuery = query.match(/^regions\(\)/);
|
|
var regionQuery = query.match(/^regions\(\)/);
|
|
|
if (regionQuery) {
|
|
if (regionQuery) {
|
|
|
return this.getRegions();
|
|
return this.getRegions();
|
|
@@ -195,16 +178,14 @@ function (angular, _) {
|
|
|
return this.getDimensionKeys(dimensionKeysQuery[1]);
|
|
return this.getDimensionKeys(dimensionKeysQuery[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- var dimensionValuesQuery = query.match(/^dimension_values\(([^,]+?),\s?([^,]+?),\s?([^,]+?),\s?([^,]+?)(,\s?([^)]*))?\)/);
|
|
|
|
|
|
|
+ var dimensionValuesQuery = query.match(/^dimension_values\(([^,]+?),\s?([^,]+?),\s?([^,]+?),\s?([^,]+?)\)/);
|
|
|
if (dimensionValuesQuery) {
|
|
if (dimensionValuesQuery) {
|
|
|
region = templateSrv.replace(dimensionValuesQuery[1]);
|
|
region = templateSrv.replace(dimensionValuesQuery[1]);
|
|
|
namespace = templateSrv.replace(dimensionValuesQuery[2]);
|
|
namespace = templateSrv.replace(dimensionValuesQuery[2]);
|
|
|
metricName = templateSrv.replace(dimensionValuesQuery[3]);
|
|
metricName = templateSrv.replace(dimensionValuesQuery[3]);
|
|
|
var dimensionKey = templateSrv.replace(dimensionValuesQuery[4]);
|
|
var dimensionKey = templateSrv.replace(dimensionValuesQuery[4]);
|
|
|
- dimensionPart = templateSrv.replace(dimensionValuesQuery[6]);
|
|
|
|
|
|
|
|
|
|
- dimensions = parseDimensions(dimensionPart);
|
|
|
|
|
- return this.getDimensionValues(region, namespace, metricName, dimensionKey, dimensions);
|
|
|
|
|
|
|
+ return this.getDimensionValues(region, namespace, metricName, dimensionKey, {});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var ebsVolumeIdsQuery = query.match(/^ebs_volume_ids\(([^,]+?),\s?([^,]+?)\)/);
|
|
var ebsVolumeIdsQuery = query.match(/^ebs_volume_ids\(([^,]+?),\s?([^,]+?)\)/);
|