IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 12:14:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3059 from mtanda/cloudwatch_template_fix

Browse Source 
fix panel repeat for cloudwatch
This commit is contained in:
Torkel Ödegaard 2015-10-29 12:38:22 +01:00
commit 603ec65e91
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ function (angular, _) {
query.region = templateSrv.replace(target.region, options.scopedVars);
query.namespace = templateSrv.replace(target.namespace, options.scopedVars);
query.metricName = templateSrv.replace(target.metricName, options.scopedVars);
query.dimensions = convertDimensionFormat(target.dimensions);
query.dimensions = convertDimensionFormat(target.dimensions, options.scopedVars);
query.statistics = target.statistics;
query.period = parseInt(target.period, 10);
@ -119,7 +119,7 @@ function (angular, _) {
parameters: {
namespace: templateSrv.replace(namespace),
metricName: templateSrv.replace(metricName),
dimensions: convertDimensionFormat(dimensions),
dimensions: convertDimensionFormat(dimensions, {}),
}
};
@ -276,11 +276,11 @@ function (angular, _) {
return Math.round(date.valueOf() / 1000);
}
function convertDimensionFormat(dimensions) {
function convertDimensionFormat(dimensions, scopedVars) {
return _.map(dimensions, function(value, key) {
return {
Name: templateSrv.replace(key),
Value: templateSrv.replace(value)
Name: templateSrv.replace(key, scopedVars),
Value: templateSrv.replace(value, scopedVars)
};
});
}