PR for #562: fix merge conflicts

2019-02-13 13:44:12 +03:00
parent 10601fc9e8 e78387fcb0
commit 78f6a93ed5
2 changed files with 57 additions and 0 deletions
--- a/src/datasource-zabbix/metricFunctions.js
+++ b/src/datasource-zabbix/metricFunctions.js
@@ -85,6 +85,15 @@ addFuncDef({
  defaultParams: [0.2],
 });

+addFuncDef({
+  name: 'transformNull',
+  category: 'Transform',
+  params: [
+    {name: 'number', type: 'float'}
+  ],
+  defaultParams: [0],
+});
+
 // Aggregate

 addFuncDef({
@@ -170,6 +179,24 @@ addFuncDef({

 // Filter

+addFuncDef({
+  name: 'removeAboveValue',
+  category: 'Filter',
+  params: [
+    {name: 'number', type: 'float'},
+  ],
+  defaultParams: [0],
+});
+
+addFuncDef({
+  name: 'removeBelowValue',
+  category: 'Filter',
+  params: [
+    {name: 'number', type: 'float'},
+  ],
+  defaultParams: [0],
+});
+
 addFuncDef({
  name: 'top',
  category: 'Filter',