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

Fixed dashboard saving error due recursive target.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-27 23:30:05 +03:00
parent 0680f65370
commit 865d5f1777
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/datasource-zabbix/metricFunctions.js
View File

@@ -17,7 +17,7 @@ function (_, $) {
funcDef.defaultParams = funcDef.defaultParams || []; funcDef.defaultParams = funcDef.defaultParams || [];
if (funcDef.category) { if (funcDef.category) {
funcDef.category.push(funcDef); categories[funcDef.category].push(funcDef);
} }
index[funcDef.name] = funcDef; index[funcDef.name] = funcDef;
index[funcDef.shortName || funcDef.name] = funcDef; index[funcDef.shortName || funcDef.name] = funcDef;
@@ -33,14 +33,14 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'scaleToSeconds', name: 'scaleToSeconds',
category: categories.Transform, category: 'Transform',
params: [{ name: 'seconds', type: 'int' }], params: [{ name: 'seconds', type: 'int' }],
defaultParams: [1], defaultParams: [1],
}); });
addFuncDef({ addFuncDef({
name: 'groupBy', name: 'groupBy',
category: categories.Transform, category: 'Transform',
params: [ params: [
{ name: 'interval', type: 'string'}, { name: 'interval', type: 'string'},
{ name: 'function', type: 'string', options: ['avg', 'min', 'max'] } { name: 'function', type: 'string', options: ['avg', 'min', 'max'] }
@@ -50,30 +50,21 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'perSecond', name: 'perSecond',
category: categories.Transform, category: 'Transform',
params: [{ name: "max value", type: "int", optional: true }], params: [{ name: "max value", type: "int", optional: true }],
defaultParams: [], defaultParams: [],
}); });
addFuncDef({
name: 'aggregate',
category: categories.Aggregate,
params: [
{ name: 'function', type: 'string', options: ['sum', 'avg', 'min', 'max'] }
],
defaultParams: ['sum'],
});
addFuncDef({ addFuncDef({
name: 'sum', name: 'sum',
category: categories.Aggregate, category: 'Aggregate',
params: [], params: [],
defaultParams: [], defaultParams: [],
}); });
addFuncDef({ addFuncDef({
name: 'average', name: 'average',
category: categories.Aggregate, category: 'Aggregate',
params: [ params: [
{ name: 'interval', type: 'string' } { name: 'interval', type: 'string' }
], ],
@@ -82,7 +73,7 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'min', name: 'min',
category: categories.Aggregate, category: 'Aggregate',
params: [ params: [
{ name: 'interval', type: 'string' } { name: 'interval', type: 'string' }
], ],
@@ -91,7 +82,7 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'max', name: 'max',
category: categories.Aggregate, category: 'Aggregate',
params: [ params: [
{ name: 'interval', type: 'string' } { name: 'interval', type: 'string' }
], ],
@@ -100,7 +91,7 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'alias', name: 'alias',
category: categories.Alias, category: 'Alias',
params: [ params: [
{ name: 'alias', type: 'string'} { name: 'alias', type: 'string'}
], ],
@@ -110,7 +101,7 @@ function (_, $) {
addFuncDef({ addFuncDef({
name: 'averageSeries', name: 'averageSeries',
shortName: 'avg', shortName: 'avg',
category: categories.Alias, category: 'Alias',
params: optionalSeriesRefArgs, params: optionalSeriesRefArgs,
defaultParams: [''], defaultParams: [''],
}); });