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 deactivating statistics bug

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2015-08-06 14:41:06 +09:00
parent 134819cb45
commit 6a697eed2f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ function (angular, _, kbn) {
Value: target.dimensions[key]
};
});
query.statistics = _.keys(target.statistics);
query.statistics = getActivatedStatistics(target.statistics);
query.period = target.period;
var range = (end.getTime() - start.getTime()) / 1000;
@@ -130,7 +130,7 @@ function (angular, _, kbn) {
var result = [];
var dimensionPart = JSON.stringify(options.dimensions);
_.each(_.keys(options.statistics), function(s) {
_.each(getActivatedStatistics(options.statistics), function(s) {
var metricLabel = md.Label + '_' + s + dimensionPart;
var dps = _.map(md.Datapoints, function(value) {
@@ -144,6 +144,16 @@ function (angular, _, kbn) {
return result;
}
function getActivatedStatistics(statistics) {
var activatedStatistics = [];
_.each(statistics, function(v, k) {
if (v) {
activatedStatistics.push(k);
}
});
return activatedStatistics;
}
function convertToCloudWatchTime(date) {
return kbn.parseDate(date);
}