add consolidateBy() function

src/datasource-zabbix/datasource.js

@@ -155,6 +155,7 @@ class ZabbixAPIDatasource {
     return this.zabbix.getItemsFromTarget(target, getItemOptions)
     .then(items => {
       let getHistoryPromise;
+      options.consolidateBy = getConsolidateBy(target);
 
       if (useTrends) {
         let valueType = this.getTrendValueType(target);
@@ -529,11 +530,24 @@ function bindFunctionDefs(functionDefs, category) {
   });
 }
 
+function getConsolidateBy(target) {
+  let consolidateBy = 'avg';
+  let funcDef = _.find(target.functions, func => {
+    return func.def.name === 'consolidateBy';
+  });
+  if (funcDef && funcDef.params && funcDef.params.length) {
+    consolidateBy = funcDef.params[0];
+  }
+  return consolidateBy;
+}
+
 function downsampleSeries(timeseries_data, options) {
+  let defaultAgg = dataProcessor.aggregationFunctions['avg'];
+  let consolidateByFunc = dataProcessor.aggregationFunctions[options.consolidateBy] || defaultAgg;
   return _.map(timeseries_data, timeseries => {
     if (timeseries.datapoints.length > options.maxDataPoints) {
       timeseries.datapoints = dataProcessor
-        .groupBy(options.interval, dataProcessor.AVERAGE, timeseries.datapoints);
+        .groupBy(options.interval, consolidateByFunc, timeseries.datapoints);
     }
     return timeseries;
   });

src/datasource-zabbix/metricFunctions.js

@@ -8,7 +8,8 @@ var categories = {
   Filter: [],
   Trends: [],
   Time: [],
-  Alias: []
+  Alias: [],
+  Special: []
 };
 
 function addFuncDef(funcDef) {
@@ -204,6 +205,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');
 });