mysql-connector: imlement getTrends()

src/datasource-zabbix/datasource.js

@@ -158,19 +158,21 @@ class ZabbixAPIDatasource {
       options.consolidateBy = getConsolidateBy(target);
 
       if (useTrends) {
-        let valueType = this.getTrendValueType(target);
-        getHistoryPromise = this.zabbix.getTrend(items, timeFrom, timeTo)
-        .then(history => {
-          return responseHandler.handleTrends(history, items, valueType);
-        })
-        .then(timeseries => {
-          // Sort trend data, issue #202
-          _.forEach(timeseries, series => {
-            series.datapoints = _.sortBy(series.datapoints, point => point[c.DATAPOINT_TS]);
+        if (this.enableDirectDBConnection) {
+          getHistoryPromise = this.zabbix.getTrend(items, timeFrom, timeTo, options)
+          .then(history => this.zabbix.dbConnector.handleGrafanaTSResponse(history, items));
+        } else {
+          let valueType = this.getTrendValueType(target);
+          getHistoryPromise = this.zabbix.getTrend(items, timeFrom, timeTo)
+          .then(history => responseHandler.handleTrends(history, items, valueType))
+          .then(timeseries => {
+            // Sort trend data, issue #202
+            _.forEach(timeseries, series => {
+              series.datapoints = _.sortBy(series.datapoints, point => point[c.DATAPOINT_TS]);
+            });
+            return timeseries;
           });
-
-          return timeseries;
-        });
+        }
       } else {
         // Use history
         if (this.enableDirectDBConnection) {

src/datasource-zabbix/zabbix.js

@@ -45,6 +45,7 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy, ZabbixDBConnector)
       if (enableDirectDBConnection) {
         this.dbConnector = new ZabbixDBConnector(sqlDatasourceId);
         this.getHistory = this.dbConnector.getHistory.bind(this.dbConnector);
+        this.getTrend = this.dbConnector.getTrends.bind(this.dbConnector);
       }
     }
 

src/datasource-zabbix/zabbixDBConnector.js

@@ -10,6 +10,11 @@ const HISTORY_TO_TABLE_MAP = {
   '4': 'history_text'
 };
 
+const TREND_TO_TABLE_MAP = {
+  '0': 'trends',
+  '3': 'trends_uint'
+};
+
 const consolidateByFunc = {
   'avg': 'AVG',
   'min': 'MIN',
@@ -18,6 +23,12 @@ const consolidateByFunc = {
   'count': 'COUNT'
 };
 
+const consolidateByTrendColumns = {
+  'avg': 'value_avg',
+  'min': 'value_min',
+  'max': 'value_max'
+};
+
 /** @ngInject */
 function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
 
@@ -75,6 +86,38 @@ function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
       });
     }
 
+    getTrends(items, timeFrom, timeTill, options) {
+      let {intervalMs, consolidateBy} = options;
+      let intervalSec = Math.ceil(intervalMs / 1000);
+
+      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');
+      let promises = _.map(grouped_items, (items, value_type) => {
+        let itemids = _.map(items, 'itemid').join(', ');
+        let table = TREND_TO_TABLE_MAP[value_type];
+        let valueColumn = _.includes(['avg', 'min', 'max'], consolidateBy) ? consolidateBy : 'avg';
+        valueColumn = consolidateByTrendColumns[valueColumn];
+
+        let query = `
+          SELECT itemid AS metric, clock AS time_sec, ${aggFunction}(${valueColumn}) as value
+            FROM ${table}
+            WHERE itemid IN (${itemids})
+              AND clock > ${timeFrom} AND clock < ${timeTill}
+            GROUP BY time_sec DIV ${intervalSec}, metric
+        `;
+
+        query = compactSQLQuery(query);
+        return this.invokeSQLQuery(query);
+      });
+
+      return Promise.all(promises).then(results => {
+        return _.flatten(results);
+      });
+    }
+
     handleGrafanaTSResponse(history, items, addHostName = true) {
       return convertGrafanaTSResponse(history, items, addHostName);
     }