mysql-connector: use consolidateBy in SQL queries as agg func

dist/datasource-zabbix/datasource.js

@@ -371,7 +371,7 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
               } else {
                 // Use history
                 if (_this2.enableDirectDBConnection) {
-                  getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options.intervalMs).then(function (history) {
+                  getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options).then(function (history) {
                     return _this2.zabbix.dbConnector.handleHistory(history, items);
                   });
                 } else {

dist/datasource-zabbix/zabbixDBConnector.js

@@ -3,7 +3,7 @@
 System.register(['angular', 'lodash'], function (_export, _context) {
   "use strict";
 
-  var angular, _, _createClass, DEFAULT_QUERY_LIMIT, HISTORY_TO_TABLE_MAP;
+  var angular, _, _createClass, DEFAULT_QUERY_LIMIT, HISTORY_TO_TABLE_MAP, consolidateByFunc;
 
   function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -43,11 +43,16 @@ System.register(['angular', 'lodash'], function (_export, _context) {
         }
       }, {
         key: 'getHistory',
-        value: function getHistory(items, timeFrom, timeTill, intervalMs) {
+        value: function getHistory(items, timeFrom, timeTill, options) {
           var _this = this;
 
+          var intervalMs = options.intervalMs,
+              consolidateBy = options.consolidateBy;
+
           var intervalSec = Math.ceil(intervalMs / 1000);
-          var aggFunction = 'AVG';
+
+          consolidateBy = consolidateBy || 'avg';
+          var aggFunction = consolidateByFunc[consolidateBy];
 
           // Group items by value type and perform request for each value type
           var grouped_items = _.groupBy(items, 'value_type');
@@ -160,6 +165,13 @@ System.register(['angular', 'lodash'], function (_export, _context) {
         '3': 'history_uint',
         '4': 'history_text'
       };
+      consolidateByFunc = {
+        'avg': 'AVG',
+        'min': 'MIN',
+        'max': 'MAX',
+        'sum': 'SUM',
+        'count': 'COUNT'
+      };
       angular.module('grafana.services').factory('ZabbixDBConnector', ZabbixDBConnectorFactory);
     }
   };

dist/test/datasource-zabbix/datasource.js

@@ -231,7 +231,7 @@ var ZabbixAPIDatasource = function () {
         } else {
           // Use history
           if (_this2.enableDirectDBConnection) {
-            getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options.intervalMs).then(function (history) {
+            getHistoryPromise = _this2.zabbix.getHistory(items, timeFrom, timeTo, options).then(function (history) {
               return _this2.zabbix.dbConnector.handleHistory(history, items);
             });
           } else {

dist/test/datasource-zabbix/zabbixDBConnector.js

@@ -23,6 +23,14 @@ var HISTORY_TO_TABLE_MAP = {
   '4': 'history_text'
 };
 
+var consolidateByFunc = {
+  'avg': 'AVG',
+  'min': 'MIN',
+  'max': 'MAX',
+  'sum': 'SUM',
+  'count': 'COUNT'
+};
+
 /** @ngInject */
 function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
   var ZabbixDBConnector = function () {
@@ -55,11 +63,16 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
       }
     }, {
       key: 'getHistory',
-      value: function getHistory(items, timeFrom, timeTill, intervalMs) {
+      value: function getHistory(items, timeFrom, timeTill, options) {
         var _this = this;
 
+        var intervalMs = options.intervalMs,
+            consolidateBy = options.consolidateBy;
+
         var intervalSec = Math.ceil(intervalMs / 1000);
-        var aggFunction = 'AVG';
+
+        consolidateBy = consolidateBy || 'avg';
+        var aggFunction = consolidateByFunc[consolidateBy];
 
         // Group items by value type and perform request for each value type
         var grouped_items = _lodash2.default.groupBy(items, 'value_type');

src/datasource-zabbix/datasource.js

@@ -174,7 +174,7 @@ class ZabbixAPIDatasource {
       } else {
         // Use history
         if (this.enableDirectDBConnection) {
-          getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo, options.intervalMs)
+          getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo, options)
           .then(history => this.zabbix.dbConnector.handleHistory(history, items));
         } else {
           getHistoryPromise = this.zabbix.getHistory(items, timeFrom, timeTo)

src/datasource-zabbix/zabbixDBConnector.js

@@ -10,6 +10,14 @@ const HISTORY_TO_TABLE_MAP = {
   '4': 'history_text'
 };
 
+const consolidateByFunc = {
+  'avg': 'AVG',
+  'min': 'MIN',
+  'max': 'MAX',
+  'sum': 'SUM',
+  'count': 'COUNT'
+};
+
 /** @ngInject */
 function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
 
@@ -37,9 +45,12 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
       }
     }
 
-    getHistory(items, timeFrom, timeTill, intervalMs) {
+    getHistory(items, timeFrom, timeTill, options) {
+      let {intervalMs, consolidateBy} = options;
       let intervalSec = Math.ceil(intervalMs / 1000);
-      let aggFunction = 'AVG';
+
+      consolidateBy = consolidateBy || 'avg';
+      let aggFunction = consolidateByFunc[consolidateBy];
 
       // Group items by value type and perform request for each value type
       let grouped_items = _.groupBy(items, 'value_type');