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

fix templating

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2015-11-16 16:47:28 +09:00
parent add5bb47d5
commit 1bbd056797
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,12 @@ function (angular, _) {
.filter(function(dimension) { .filter(function(dimension) {
return dimension.Name === dimensionKey; return dimension.Name === dimensionKey;
}) })
.pluck('Value').uniq().sortBy().value(); .pluck('Value')
.uniq()
.sortBy()
.map(function(value) {
return {value: value, text: value};
}).value();
}); });
}; };
@ -204,11 +209,7 @@ function (angular, _) {
dimensionPart = templateSrv.replace(dimensionValuesQuery[6]); dimensionPart = templateSrv.replace(dimensionValuesQuery[6]);
dimensions = parseDimensions(dimensionPart); dimensions = parseDimensions(dimensionPart);
return this.getDimensionValues(region, namespace, metricName, dimensionKey, dimensions).then(function(result) { return this.getDimensionValues(region, namespace, metricName, dimensionKey, dimensions);
return _.map(result, function(dimension_value) {
return { text: dimension_value };
});
});
} }
var dimensionsQuery = query.match(/^dimensions\(([^,]+?),\s?([^,]+?),\s?([^,]+?)(,\s?([^)]*))?\)/); var dimensionsQuery = query.match(/^dimensions\(([^,]+?),\s?([^,]+?),\s?([^,]+?)(,\s?([^)]*))?\)/);