Process all transform functions.

plugins/datasource-zabbix/addMetricFunction.js

@@ -92,6 +92,7 @@ function (angular, _, $, metricFunctions) {
   }
 
   function createFunctionDropDownMenu(categories) {
+    console.log(categories);
     return _.map(categories, function(list, category) {
       return {
         text: category,

plugins/datasource-zabbix/dataProcessingService.js

@@ -2,9 +2,10 @@ define([
   'angular',
   'lodash',
   'moment',
-  './utils'
+  './utils',
+  './metricFunctions'
 ],
-function (angular, _, moment, utils) {
+function (angular, _, moment, utils, metricFunctions) {
   'use strict';
 
   var module = angular.module('grafana.services');

plugins/datasource-zabbix/datasource.js

@@ -3,6 +3,7 @@ define([
   'lodash',
   'app/core/utils/datemath',
   './utils',
+  './metricFunctions',
   './queryProcessor',
   './directives',
   './zabbixAPI',
@@ -13,7 +14,7 @@ define([
   './addMetricFunction',
   './metricFunctionEditor'
 ],
-function (angular, _, dateMath, utils) {
+function (angular, _, dateMath, utils, metricFunctions) {
   'use strict';
 
   /** @ngInject */
@@ -145,22 +146,21 @@ function (angular, _, dateMath, utils) {
             return getHistory.then(function (timeseries_data) {
               return _.map(timeseries_data, function (timeseries) {
 
-                // Metric data processing
+                // Filter only transform functions
-                var dp = timeseries.datapoints;
+                var transformFunctions = _.map(metricFunctions.getCategories()['Transform'], 'name');
-                if (false) {
+                var transFuncDefs = _.filter(target.functions, function(func) {
-                  dp = DataProcessingService.groupBy(dp, options.interval,
+                  return _.contains(transformFunctions, func.def.name);
-                                                     DataProcessingService.AVERAGE);
+                });
-                  timeseries.datapoints = dp;
+                var functions = _.map(transFuncDefs, function(func) {
-                }
-
-                var functions = _.map(target.functions, function(func) {
                   return func.bindFunction(DataProcessingService.metricFunctions);
                 });
-                if (functions.length) {
+
-                  //console.log(functions);
+                // Metric data processing
-                  dp = functions[0](dp);
+                var dp = timeseries.datapoints;
-                  timeseries.datapoints = dp;
+                for (var i = 0; i < functions.length; i++) {
+                  dp = functions[i](dp);
                 }
+                timeseries.datapoints = dp;
 
                 return timeseries;
               });

plugins/datasource-zabbix/queryCtrl.js

@@ -261,7 +261,7 @@ define([
       };
 
       $scope.targetChanged = function() {
-        console.log($scope.target.functions);
+        //console.log($scope.target);
         $scope.get_data();
       };