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

fix downsampling function arguments order

Browse Source
This commit is contained in:
Alexander Zobnin
2017-06-26 10:06:35 +03:00
parent 2f6da44311
commit fa12b04650
5 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dist/datasource-zabbix/dataProcessor.js vendored
View File

@@ -3,7 +3,7 @@
System.register(['lodash', './utils', './timeseries'], function (_export, _context) {
"use strict";
var _, utils, ts, downsampleSeries, groupBy, sumSeries, delta, scale, SUM, COUNT, AVERAGE, MIN, MAX, MEDIAN, metricFunctions, aggregationFunctions;
var _, utils, ts, downsampleSeries, groupBy, groupBy_exported, sumSeries, delta, scale, SUM, COUNT, AVERAGE, MIN, MAX, MEDIAN, metricFunctions, aggregationFunctions;
function limit(order, n, orderByFunc, timeseries) {
var orderByCallback = aggregationFunctions[orderByFunc];
@@ -93,6 +93,11 @@ System.register(['lodash', './utils', './timeseries'], function (_export, _conte
execute: function () {
downsampleSeries = ts.downsample;
groupBy = ts.groupBy_perf;
groupBy_exported = function groupBy_exported(interval, groupFunc, datapoints) {
return groupBy(datapoints, interval, groupFunc);
};
sumSeries = ts.sumSeries;
delta = ts.delta;
@@ -136,7 +141,7 @@ System.register(['lodash', './utils', './timeseries'], function (_export, _conte
_export('default', {
downsampleSeries: downsampleSeries,
groupBy: groupBy,
groupBy: groupBy_exported,
AVERAGE: AVERAGE,
MIN: MIN,
MAX: MAX,

2
dist/datasource-zabbix/dataProcessor.js.map vendored
View File

File diff suppressed because one or more lines are too long

50
dist/test/benchmarks/timeseries_bench.js vendored Normal file
View File

@@ -0,0 +1,50 @@
'use strict';
var _lodash = require('lodash');
var _lodash2 = _interopRequireDefault(_lodash);
var _timeseries = require('../timeseries');
var _timeseries2 = _interopRequireDefault(_timeseries);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var datapoints = [[10.7104, 1498409636085], [10.578, 1498409651011], [10.5985, 1498409666628], [10.6877, 1498409681525], [10.5495, 1498409696586], [10.5981, 1498409711009], [10.5076, 1498409726949], [11.4807, 1498409741853], [11.6165, 1498409756165], [11.8575, 1498409771018], [11.9936, 1498409786056], [10.7566, 1498409801942], [10.7484, 1498409816010], [10.6038, 1498409831018], [10.2932, 1498409846010], [10.4912, 1498409861946], [10.4151, 1498409876871], [10.2401, 1498409891710], [10.4921, 1498409906143], [10.4413, 1498409921477], [10.6318, 1498409936147], [10.5277, 1498409951915], [10.6333, 1498409966052], [10.6417, 1498409981944], [10.4505, 1498409996867], [10.5812, 1498410011770], [10.4934, 1498410026573], [10.5731, 1498410041317], [10.5, 1498410056213], [10.6505, 1498410071013], [9.4035, 1498410086387]];
var series_set = [[[1.0247, 1498409631773], [0.9988, 1498409646697], [0.9817, 1498409661239], [0.9569, 1498409676045], [1.0331, 1498409691922], [1.0755, 1498409706546], [1.1862, 1498409721525], [1.2984, 1498409736175], [1.2389, 1498409751817], [1.1452, 1498409766783], [1.102, 1498409781699], [0.9647, 1498409796664], [1.0063, 1498409811627], [1.0318, 1498409826887], [1.065, 1498409841645], [1.0907, 1498409856647], [1.0229, 1498409871521], [1.0654, 1498409886031], [1.0568, 1498409901544], [1.0818, 1498409916194], [1.1335, 1498409931672], [1.057, 1498409946673], [1.0243, 1498409961669], [1.0329, 1498409976637], [1.1428, 1498409991563], [1.2198, 1498410006441], [1.2192, 1498410021230], [1.2615, 1498410036027], [1.1765, 1498410051907], [1.2352, 1498410066109], [1.0557, 1498410081043]], [[10.7104, 1498409636085], [10.578, 1498409651011], [10.5985, 1498409666628], [10.6877, 1498409681525], [10.5495, 1498409696586], [10.5981, 1498409711009], [10.5076, 1498409726949], [11.4807, 1498409741853], [11.6165, 1498409756165], [11.8575, 1498409771018], [11.9936, 1498409786056], [10.7566, 1498409801942], [10.7484, 1498409816010], [10.6038, 1498409831018], [10.2932, 1498409846010], [10.4912, 1498409861946], [10.4151, 1498409876871], [10.2401, 1498409891710], [10.4921, 1498409906143], [10.4413, 1498409921477], [10.6318, 1498409936147], [10.5277, 1498409951915], [10.6333, 1498409966052], [10.6417, 1498409981944], [10.4505, 1498409996867], [10.5812, 1498410011770], [10.4934, 1498410026573], [10.5731, 1498410041317], [10.5, 1498410056213], [10.6505, 1498410071013], [9.4035, 1498410086387]]];
module.exports = [{
name: 'groupBy',
tests: {
'groupBy(AVERAGE)': function groupByAVERAGE() {
_timeseries2.default.groupBy(datapoints, '5m', _timeseries2.default.AVERAGE);
},
'groupBy(MAX)': function groupByMAX() {
_timeseries2.default.groupBy(datapoints, '5m', _timeseries2.default.COUNT);
}
}
}, {
name: 'sumSeries',
tests: {
'sumSeries()': function sumSeries() {
_timeseries2.default.sumSeries(series_set);
},
'groupBy(MAX)->sumSeries()': function groupByMAXSumSeries() {
var prepeared_series = _lodash2.default.map(series_set, function (datapoints) {
return _timeseries2.default.groupBy(datapoints, '5m', _timeseries2.default.MAX);
});
_timeseries2.default.sumSeries(prepeared_series);
}
}
}, {
name: 'groupBy vs groupBy_perf',
tests: {
'groupBy()': function groupBy() {
_timeseries2.default.groupBy(datapoints, '5m', _timeseries2.default.AVERAGE);
},
'groupBy_perf()': function groupBy_perf() {
_timeseries2.default.groupBy_perf(datapoints, '5m', _timeseries2.default.AVERAGE);
}
}
}];

5
dist/test/datasource-zabbix/dataProcessor.js vendored
View File

@@ -22,6 +22,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
var downsampleSeries = _timeseries2.default.downsample;
var groupBy = _timeseries2.default.groupBy_perf;
var groupBy_exported = function groupBy_exported(interval, groupFunc, datapoints) {
return groupBy(datapoints, interval, groupFunc);
};
var sumSeries = _timeseries2.default.sumSeries;
var delta = _timeseries2.default.delta;
var scale = function scale(factor, datapoints) {
@@ -143,7 +146,7 @@ var aggregationFunctions = {
exports.default = {
downsampleSeries: downsampleSeries,
groupBy: groupBy,
groupBy: groupBy_exported,
AVERAGE: AVERAGE,
MIN: MIN,
MAX: MAX,