refactor: move history calls to zabbix module

src/datasource-zabbix/zabbix/connectors/sql/zabbixDBConnector.js

@@ -95,7 +95,7 @@ export class ZabbixDBConnector {
   }
 
   getTrends(items, timeFrom, timeTill, options) {
-    let {intervalMs, consolidateBy} = options;
+    let { intervalMs, consolidateBy } = options;
     let intervalSec = Math.ceil(intervalMs / 1000);
 
     consolidateBy = consolidateBy || 'avg';

src/datasource-zabbix/zabbix/connectors/zabbix_api/zabbixAPIConnector.js

@@ -8,8 +8,6 @@ import { ZabbixAPICore } from './zabbixAPICore';
  * Wraps API calls and provides high-level methods.
  */
 export class ZabbixAPIConnector {
-
-  /** @ngInject */
   constructor(api_url, username, password, basicAuth, withCredentials, backendSrv) {
     this.url              = api_url;
     this.username         = username;

src/datasource-zabbix/zabbix/zabbix.js

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import * as utils from '../utils';
+import responseHandler from '../responseHandler';
 import { ZabbixAPIConnector } from './connectors/zabbix_api/zabbixAPIConnector';
 import { ZabbixDBConnector } from './connectors/sql/zabbixDBConnector';
 import { CachingProxy } from './proxy/cachingProxy';
@@ -15,7 +16,7 @@ const REQUESTS_TO_CACHE = [
 
 const REQUESTS_TO_BIND = [
   'getHistory', 'getTrend', 'getMacros', 'getItemsByIDs', 'getEvents', 'getAlerts', 'getHostAlerts',
-  'getAcknowledges', 'getITService', 'getSLA', 'getVersion', 'login'
+  'getAcknowledges', 'getITService', 'getVersion', 'login'
 ];
 
 export class Zabbix {
@@ -33,6 +34,8 @@ export class Zabbix {
       sqlDatasourceId
     } = options;
 
+    this.enableDirectDBConnection = enableDirectDBConnection;
+
     // Initialize caching proxy for requests
     let cacheOptions = {
       enabled: true,
@@ -219,6 +222,61 @@ export class Zabbix {
       return this.zabbixAPI.getTriggers(query.groupids, query.hostids, query.applicationids, options);
     });
   }
+
+  getHistoryTS(items, timeRange, options) {
+    let [timeFrom, timeTo] = timeRange;
+    if (this.enableDirectDBConnection) {
+      return this.getHistoryDB(items, timeFrom, timeTo, options)
+      .then(history => this.dbConnector.handleGrafanaTSResponse(history, items));
+    } else {
+      return this.zabbixAPI.getHistory(items, timeFrom, timeTo)
+      .then(history => responseHandler.handleHistory(history, items));
+    }
+  }
+
+  getTrends(items, timeRange, options) {
+    let [timeFrom, timeTo] = timeRange;
+    if (this.enableDirectDBConnection) {
+      return this.getTrendsDB(items, timeFrom, timeTo, options)
+      .then(history => this.dbConnector.handleGrafanaTSResponse(history, items));
+    } else {
+      let valueType = options.consolidateBy || options.valueType;
+      return this.zabbixAPI.getTrend(items, timeFrom, timeTo)
+      .then(history => responseHandler.handleTrends(history, items, valueType))
+      .then(responseHandler.sortTimeseries); // Sort trend data, issue #202
+    }
+  }
+
+  getHistoryText(items, timeRange, target) {
+    let [timeFrom, timeTo] = timeRange;
+    if (items.length) {
+      return this.zabbixAPI.getHistory(items, timeFrom, timeTo)
+      .then(history => {
+        if (target.resultFormat === 'table') {
+          return responseHandler.handleHistoryAsTable(history, items, target);
+        } else {
+          return responseHandler.handleText(history, items, target);
+        }
+      });
+    } else {
+      return Promise.resolve([]);
+    }
+  }
+
+  getSLA(itservices, timeRange, target, options) {
+    let itServices = itservices;
+    if (options.isOldVersion) {
+      itServices = _.filter(itServices, {'serviceid': target.itservice.serviceid});
+    }
+    let itServiceIds = _.map(itServices, 'serviceid');
+    return this.zabbixAPI.getSLA(itServiceIds, timeRange)
+    .then(slaResponse => {
+      return _.map(itServiceIds, serviceid => {
+        let itservice = _.find(itServices, {'serviceid': serviceid});
+        return responseHandler.handleSLAResponse(itservice, target.slaProperty, slaResponse);
+      });
+    });
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////