Merge branch 'master' into metric-functions

src/datasource-zabbix/metricFunctions.js

@@ -8,7 +8,8 @@ var categories = {
   Filter: [],
   Trends: [],
   Time: [],
-  Alias: []
+  Alias: [],
+  Special: []
 };
 
 function addFuncDef(funcDef) {
@@ -222,6 +223,16 @@ addFuncDef({
   defaultParams: ['/(.*)/', '$1']
 });
 
+// Special
+addFuncDef({
+  name: 'consolidateBy',
+  category: 'Special',
+  params: [
+    { name: 'type', type: 'string', options: ['avg', 'min', 'max', 'sum', 'count'] }
+  ],
+  defaultParams: ['avg'],
+});
+
 _.each(categories, function(funcList, catName) {
   categories[catName] = _.sortBy(funcList, 'name');
 });