mysql-connector: aggregate values by time interval on server side

dist/datasource-zabbix/datasource.js

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

dist/datasource-zabbix/zabbixDBConnector.js

@@ -43,16 +43,19 @@ System.register(['angular', 'lodash'], function (_export, _context) {
         }
       }, {
         key: 'getHistory',
-        value: function getHistory(items, timeFrom, timeTill) {
+        value: function getHistory(items, timeFrom, timeTill, intervalMs) {
           var _this = this;
 
+          var intervalSec = Math.ceil(intervalMs / 1000);
+          var aggFunction = 'AVG';
+
           // Group items by value type and perform request for each value type
           var grouped_items = _.groupBy(items, 'value_type');
           var promises = _.map(grouped_items, function (items, value_type) {
             var itemids = _.map(items, 'itemid').join(', ');
             var table = HISTORY_TO_TABLE_MAP[value_type];
 
-            var query = '\n          SELECT itemid AS metric, clock AS time_sec, value\n            FROM ' + table + '\n            WHERE itemid IN (' + itemids + ')\n              AND clock > ' + timeFrom + ' AND clock < ' + timeTill + '\n        ';
+            var query = '\n          SELECT itemid AS metric, clock AS time_sec, ' + aggFunction + '(value) as value\n            FROM ' + table + '\n            WHERE itemid IN (' + itemids + ')\n              AND clock > ' + timeFrom + ' AND clock < ' + timeTill + '\n            GROUP BY time_sec DIV ' + intervalSec + ', metric\n        ';
 
             return _this.invokeSQLQuery(query);
           });

dist/test/datasource-zabbix/datasource.js

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

dist/test/datasource-zabbix/zabbixDBConnector.js

@@ -55,16 +55,19 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
       }
     }, {
       key: 'getHistory',
-      value: function getHistory(items, timeFrom, timeTill) {
+      value: function getHistory(items, timeFrom, timeTill, intervalMs) {
         var _this = this;
 
+        var intervalSec = Math.ceil(intervalMs / 1000);
+        var aggFunction = 'AVG';
+
         // Group items by value type and perform request for each value type
         var grouped_items = _lodash2.default.groupBy(items, 'value_type');
         var promises = _lodash2.default.map(grouped_items, function (items, value_type) {
           var itemids = _lodash2.default.map(items, 'itemid').join(', ');
           var table = HISTORY_TO_TABLE_MAP[value_type];
 
-          var query = '\n          SELECT itemid AS metric, clock AS time_sec, value\n            FROM ' + table + '\n            WHERE itemid IN (' + itemids + ')\n              AND clock > ' + timeFrom + ' AND clock < ' + timeTill + '\n        ';
+          var query = '\n          SELECT itemid AS metric, clock AS time_sec, ' + aggFunction + '(value) as value\n            FROM ' + table + '\n            WHERE itemid IN (' + itemids + ')\n              AND clock > ' + timeFrom + ' AND clock < ' + timeTill + '\n            GROUP BY time_sec DIV ' + intervalSec + ', metric\n        ';
 
           return _this.invokeSQLQuery(query);
         });

src/datasource-zabbix/datasource.js

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

src/datasource-zabbix/zabbixDBConnector.js

@@ -37,7 +37,10 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
       }
     }
 
-    getHistory(items, timeFrom, timeTill) {
+    getHistory(items, timeFrom, timeTill, intervalMs) {
+      let intervalSec = Math.ceil(intervalMs / 1000);
+      let aggFunction = 'AVG';
+
       // Group items by value type and perform request for each value type
       let grouped_items = _.groupBy(items, 'value_type');
       let promises = _.map(grouped_items, (items, value_type) => {
@@ -45,10 +48,11 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
         let table = HISTORY_TO_TABLE_MAP[value_type];
 
         let query = `
-          SELECT itemid AS metric, clock AS time_sec, value
+          SELECT itemid AS metric, clock AS time_sec, ${aggFunction}(value) as value
             FROM ${table}
             WHERE itemid IN (${itemids})
               AND clock > ${timeFrom} AND clock < ${timeTill}
+            GROUP BY time_sec DIV ${intervalSec}, metric
         `;
 
         return this.invokeSQLQuery(query);