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