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

Fixed slicing to frames in groupBy() function.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-28 21:26:30 +03:00
parent 35e6ad8df5
commit 1b58e42d73
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/datasource-zabbix/dataProcessingService.js
View File

@@ -69,9 +69,16 @@ function (angular, _, moment, utils) {
*/ */
this.groupBy = function(interval, groupByCallback, datapoints) { this.groupBy = function(interval, groupByCallback, datapoints) {
var ms_interval = utils.parseInterval(interval); var ms_interval = utils.parseInterval(interval);
// Calculate frame timestamps
var min_timestamp = datapoints[0][1];
var frames = _.groupBy(datapoints, function(point) { var frames = _.groupBy(datapoints, function(point) {
var group_time = Number(moment.utc(point[1]).startOf('minute').valueOf()); var group_time = Math.floor(point[1] / ms_interval) * ms_interval;
group_time = Math.ceil(point[1] / ms_interval) * ms_interval;
// Prevent points outside of time range
if (group_time < min_timestamp) {
group_time = min_timestamp;
}
return group_time; return group_time;
}); });