Merge branch 'feature/sortseries' of https://github.com/Verivox-GmbH/grafana-zabbix into Verivox-GmbH-feature/sortseries

src/datasource-zabbix/dataProcessor.js

@@ -36,6 +36,12 @@ function limit(order, n, orderByFunc, timeseries) {
   }
 }
 
+function sortSeries(direction, timeseries) {
+  return _.orderBy(timeseries, [function (ts) {
+    return ts.target.toLowerCase();
+  }], direction);
+}
+
 function setAlias(alias, timeseries) {
   timeseries.target = alias;
   return timeseries;
@@ -125,6 +131,7 @@ let metricFunctions = {
   sumSeries: sumSeries,
   top: _.partial(limit, 'top'),
   bottom: _.partial(limit, 'bottom'),
+  sortSeries: sortSeries,
   timeShift: timeShift,
   setAlias: setAlias,
   setAliasByRegex: setAliasByRegex,

src/datasource-zabbix/metricFunctions.js

@@ -181,6 +181,15 @@ addFuncDef({
   defaultParams: [5, 'avg'],
 });
 
+addFuncDef({
+  name: 'sortSeries',
+  category: 'Filter',
+  params: [
+    { name: 'direction', type: 'string', options: ['asc', 'desc'] }
+  ],
+  defaultParams: ['asc']
+});
+
 // Trends
 
 addFuncDef({