Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Downsample panel data after all transformations.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-24 19:17:56 +03:00
parent 69bee3db0b
commit efeb69084a
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/datasource-zabbix/datasource.js
View File

@@ -145,10 +145,11 @@ function (angular, _, dateMath, utils) {
var groupBuInterval = utils.parseInterval(options.interval); var groupBuInterval = utils.parseInterval(options.interval);
// Series downsampling // Series downsampling
if (timeseries.datapoints.length > options.maxDataPoints) { var dp = timeseries.datapoints;
timeseries.datapoints = DataProcessingService.groupBy(timeseries.datapoints, if (false) {
groupBuInterval, dp = DataProcessingService.groupBy(dp, groupBuInterval,
DataProcessingService.AVERAGE); DataProcessingService.AVERAGE);
timeseries.datapoints = dp;
} }
return timeseries; return timeseries;
@@ -204,10 +205,22 @@ function (angular, _, dateMath, utils) {
} }
}, this); }, this);
// Data for panel (all targets)
return $q.all(_.flatten(promises)) return $q.all(_.flatten(promises))
.then(_.flatten) .then(_.flatten)
.then(function (timeseries_data) { .then(function (timeseries_data) {
return { data: timeseries_data }; var data = _.map(timeseries_data, function(timeseries) {
// Series downsampling
var DPS = DataProcessingService;
var groupBuInterval = utils.parseInterval(options.interval);
if (timeseries.datapoints.length > options.maxDataPoints) {
timeseries.datapoints = DPS.groupBy(timeseries.datapoints, groupBuInterval,
DPS.AVERAGE);
}
return timeseries;
});
return { data: data };
}); });
}; };