percentil: refactor

src/datasource-zabbix/dataProcessor.js

@@ -18,6 +18,7 @@ let AVERAGE = ts.AVERAGE;
 let MIN = ts.MIN;
 let MAX = ts.MAX;
 let MEDIAN = ts.MEDIAN;
+let PERCENTIL = ts.PERCENTIL;
 
 function limit(order, n, orderByFunc, timeseries) {
   let orderByCallback = aggregationFunctions[orderByFunc];
@@ -82,6 +83,12 @@ function aggregateWrapper(groupByCallback, interval, datapoints) {
   return groupBy(flattenedPoints, interval, groupByCallback);
 }
 
+function percentil(interval, n, datapoints) {
+  var flattenedPoints = _.flatten(datapoints, true);
+  var groupByCallback = _.partial(PERCENTIL, n);
+  return groupBy(flattenedPoints, interval, groupByCallback);
+}
+
 function timeShift(interval, range) {
   let shift = utils.parseTimeShiftInterval(interval) / 1000;
   return _.map(range, time => {
@@ -108,6 +115,7 @@ let metricFunctions = {
   exponentialMovingAverage: expMovingAverage,
   aggregateBy: aggregateByWrapper,
   // Predefined aggs
+  percentil: percentil,
   average: _.partial(aggregateWrapper, AVERAGE),
   min: _.partial(aggregateWrapper, MIN),
   max: _.partial(aggregateWrapper, MAX),

src/datasource-zabbix/metricFunctions.js

@@ -108,9 +108,9 @@ addFuncDef({
   category: 'Aggregate',
   params: [
     { name: 'interval', type: 'string' },
-    { name: 'percent', type: 'string' }
+    { name: 'percent', type: 'float', options: [25, 50, 75, 90, 95, 99, 99.9] }
   ],
-  defaultParams: ['1m','95'],
+  defaultParams: ['1m', 95],
 });
 
 addFuncDef({

src/datasource-zabbix/timeseries.js

@@ -322,6 +322,11 @@ function expMovingAverage(datapoints, n) {
   return ema;
 }
 
+function PERCENTIL(n, values) {
+  var sorted = _.sortBy(values);
+  return sorted[Math.floor(sorted.length * n / 100)];
+}
+
 function COUNT(values) {
   return values.length;
 }
@@ -482,7 +487,8 @@ const exportedFunctions = {
   AVERAGE,
   MIN,
   MAX,
-  MEDIAN
+  MEDIAN,
+  PERCENTIL
 };
 
 export default exportedFunctions;