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

Fix tests after merging alerting

Browse Source
This commit is contained in:
Alexander Zobnin
2017-03-28 19:44:31 +03:00
parent 9162210fc7
commit 59fa345927
15 changed files with 96 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
addFuncDef({
name: 'groupBy',
category: 'Transform',
params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
defaultParams: ['1m', 'avg']
});
@@ -140,10 +140,24 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
defaultParams: ['1m']
});
addFuncDef({
name: 'sum',
category: 'Aggregate',
params: [{ name: 'interval', type: 'string' }],
defaultParams: ['1m']
});
addFuncDef({
name: 'count',
category: 'Aggregate',
params: [{ name: 'interval', type: 'string' }],
defaultParams: ['1m']
});
addFuncDef({
name: 'aggregateBy',
category: 'Aggregate',
params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
params: [{ name: 'interval', type: 'string' }, { name: 'function', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
defaultParams: ['1m', 'avg']
});
@@ -152,14 +166,14 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
addFuncDef({
name: 'top',
category: 'Filter',
params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
defaultParams: [5, 'avg']
});
addFuncDef({
name: 'bottom',
category: 'Filter',
params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'median'] }],
params: [{ name: 'number', type: 'int' }, { name: 'value', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count', 'median'] }],
defaultParams: [5, 'avg']
});
@@ -168,7 +182,7 @@ System.register(['lodash', 'jquery'], function (_export, _context) {
addFuncDef({
name: 'trendValue',
category: 'Trends',
params: [{ name: 'type', type: 'string', options: ['avg', 'min', 'max'] }],
params: [{ name: 'type', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count'] }],
defaultParams: ['avg']
});