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

functions: rename moving avg to graphite-like

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-04 10:16:03 +03:00
parent f3ee574619
commit 0b8cb0b23c
8 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,9 +125,10 @@ System.register(['lodash', './utils', './timeseries'], function (_export, _conte
scale: scale, scale: scale,
delta: delta, delta: delta,
rate: rate, rate: rate,
simpleMovingAverage: simpleMovingAverage, movingAverage: simpleMovingAverage,
expMovingAverage: expMovingAverage, exponentialMovingAverage: expMovingAverage,
aggregateBy: aggregateByWrapper, aggregateBy: aggregateByWrapper,
// Predefined aggs
average: _.partial(aggregateWrapper, AVERAGE), average: _.partial(aggregateWrapper, AVERAGE),
min: _.partial(aggregateWrapper, MIN), min: _.partial(aggregateWrapper, MIN),
max: _.partial(aggregateWrapper, MAX), max: _.partial(aggregateWrapper, MAX),

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

File diff suppressed because one or more lines are too long

8
dist/datasource-zabbix/metricFunctions.js vendored
View File

@@ -111,16 +111,16 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
}); });
addFuncDef({ addFuncDef({
name: 'simpleMovingAverage', name: 'movingAverage',
category: 'Transform', category: 'Transform',
params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 600] }], params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 100, 600] }],
defaultParams: [10] defaultParams: [10]
}); });
addFuncDef({ addFuncDef({
name: 'expMovingAverage', name: 'exponentialMovingAverage',
category: 'Transform', category: 'Transform',
params: [{ name: 'smoothing', type: 'float', options: [0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.5, 0.7, 0.9] }], params: [{ name: 'smoothing', type: 'float', options: [6, 10, 60, 100, 600] }],
defaultParams: [0.2] defaultParams: [0.2]
}); });

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

File diff suppressed because one or more lines are too long

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

@@ -127,9 +127,10 @@ var metricFunctions = {
scale: scale, scale: scale,
delta: delta, delta: delta,
rate: rate, rate: rate,
simpleMovingAverage: simpleMovingAverage, movingAverage: simpleMovingAverage,
expMovingAverage: expMovingAverage, exponentialMovingAverage: expMovingAverage,
aggregateBy: aggregateByWrapper, aggregateBy: aggregateByWrapper,
// Predefined aggs
average: _lodash2.default.partial(aggregateWrapper, AVERAGE), average: _lodash2.default.partial(aggregateWrapper, AVERAGE),
min: _lodash2.default.partial(aggregateWrapper, MIN), min: _lodash2.default.partial(aggregateWrapper, MIN),
max: _lodash2.default.partial(aggregateWrapper, MAX), max: _lodash2.default.partial(aggregateWrapper, MAX),

8
dist/test/datasource-zabbix/metricFunctions.js vendored
View File

@@ -74,16 +74,16 @@ addFuncDef({
}); });
addFuncDef({ addFuncDef({
name: 'simpleMovingAverage', name: 'movingAverage',
category: 'Transform', category: 'Transform',
params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 600] }], params: [{ name: 'factor', type: 'int', options: [6, 10, 60, 100, 600] }],
defaultParams: [10] defaultParams: [10]
}); });
addFuncDef({ addFuncDef({
name: 'expMovingAverage', name: 'exponentialMovingAverage',
category: 'Transform', category: 'Transform',
params: [{ name: 'smoothing', type: 'float', options: [0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.5, 0.7, 0.9] }], params: [{ name: 'smoothing', type: 'float', options: [6, 10, 60, 100, 600] }],
defaultParams: [0.2] defaultParams: [0.2]
}); });

5
src/datasource-zabbix/dataProcessor.js
View File

@@ -104,9 +104,10 @@ let metricFunctions = {
scale: scale, scale: scale,
delta: delta, delta: delta,
rate: rate, rate: rate,
simpleMovingAverage: simpleMovingAverage, movingAverage: simpleMovingAverage,
expMovingAverage: expMovingAverage, exponentialMovingAverage: expMovingAverage,
aggregateBy: aggregateByWrapper, aggregateBy: aggregateByWrapper,
// Predefined aggs
average: _.partial(aggregateWrapper, AVERAGE), average: _.partial(aggregateWrapper, AVERAGE),
min: _.partial(aggregateWrapper, MIN), min: _.partial(aggregateWrapper, MIN),
max: _.partial(aggregateWrapper, MAX), max: _.partial(aggregateWrapper, MAX),

8
src/datasource-zabbix/metricFunctions.js
View File

@@ -58,19 +58,19 @@ addFuncDef({
}); });
addFuncDef({ addFuncDef({
name: 'simpleMovingAverage', name: 'movingAverage',
category: 'Transform', category: 'Transform',
params: [ params: [
{ name: 'factor', type: 'int', options: [6, 10, 60, 600] } { name: 'factor', type: 'int', options: [6, 10, 60, 100, 600] }
], ],
defaultParams: [10], defaultParams: [10],
}); });
addFuncDef({ addFuncDef({
name: 'expMovingAverage', name: 'exponentialMovingAverage',
category: 'Transform', category: 'Transform',
params: [ params: [
{ name: 'smoothing', type: 'float', options: [0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.5, 0.7, 0.9] } { name: 'smoothing', type: 'float', options: [6, 10, 60, 100, 600] }
], ],
defaultParams: [0.2], defaultParams: [0.2],
}); });