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

Replaced old downsampleSeries() method by new

Browse Source 
DataProcessingService.groupBy()
This commit is contained in:
Alexander Zobnin
2016-01-24 12:59:17 +03:00
parent 3ded90efec
commit c64dd1d874
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ define([
'angular', 'angular',
'lodash', 'lodash',
'app/core/utils/datemath', 'app/core/utils/datemath',
'./utils',
'./queryProcessor', './queryProcessor',
'./directives', './directives',
'./zabbixAPI', './zabbixAPI',
@@ -10,7 +11,7 @@ define([
'./zabbixCache', './zabbixCache',
'./queryCtrl' './queryCtrl'
], ],
function (angular, _, dateMath) { function (angular, _, dateMath, utils) {
'use strict'; 'use strict';
/** @ngInject */ /** @ngInject */
@@ -141,15 +142,15 @@ function (angular, _, dateMath) {
return getHistory.then(function (timeseries_data) { return getHistory.then(function (timeseries_data) {
return _.map(timeseries_data, function (timeseries) { return _.map(timeseries_data, function (timeseries) {
var groupBuInterval = utils.parseInterval(options.interval);
// Series downsampling // Series downsampling
if (timeseries.datapoints.length > options.maxDataPoints) { if (timeseries.datapoints.length > options.maxDataPoints) {
var ms_interval = Math.floor((to - from) / options.maxDataPoints) * 1000; timeseries.datapoints = DataProcessingService.groupBy(timeseries.datapoints,
var downsampleFunc = target.downsampleFunction ? target.downsampleFunction.value : "avg"; groupBuInterval,
timeseries.datapoints = zabbixHelperSrv.downsampleSeries(timeseries.datapoints, to, ms_interval, downsampleFunc); DataProcessingService.AVERAGE);
} }
var groupBuInterval = 60000;
timeseries.datapoints = DataProcessingService.groupBy(timeseries.datapoints, groupBuInterval, DataProcessingService.AVERAGE);
return timeseries; return timeseries;
}); });
}); });

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

@@ -1,7 +1,8 @@
define([ define([
'lodash' 'lodash',
'moment'
], ],
function () { function (_, moment) {
'use strict'; 'use strict';
function utils() { function utils() {
@@ -40,6 +41,12 @@ function () {
return new RegExp(pattern, flags); return new RegExp(pattern, flags);
}; };
this.parseInterval = function(interval) {
var intervalPattern = /(^[\d]+)(y|M|w|d|h|m|s)/g;
var momentInterval = intervalPattern.exec(interval);
return moment.duration(Number(momentInterval[1]), momentInterval[2]).valueOf();
};
} }
return new utils(); return new utils();