mysql-connector: deduplicate requests

dist/datasource-zabbix/zabbix.js

@@ -45,17 +45,26 @@ System.register(['angular', 'lodash', './utils', './zabbixAPI.service.js', './za
         var ZabbixAPI = zabbixAPIService;
         this.zabbixAPI = new ZabbixAPI(url, username, password, basicAuth, withCredentials);
 
+        if (enableDirectDBConnection) {
+          this.dbConnector = new ZabbixDBConnector(sqlDatasourceId);
+        }
+
         // Initialize caching proxy for requests
         var cacheOptions = {
           enabled: true,
           ttl: cacheTTL
         };
-        this.cachingProxy = new ZabbixCachingProxy(this.zabbixAPI, cacheOptions);
+        this.cachingProxy = new ZabbixCachingProxy(this.zabbixAPI, this.dbConnector, cacheOptions);
 
         // Proxy methods
         this.getHistory = this.cachingProxy.getHistory.bind(this.cachingProxy);
         this.getMacros = this.cachingProxy.getMacros.bind(this.cachingProxy);
 
+        if (enableDirectDBConnection) {
+          this.getHistoryDB = this.cachingProxy.getHistoryDB.bind(this.cachingProxy);
+          this.getTrendsDB = this.cachingProxy.getTrendsDB.bind(this.cachingProxy);
+        }
+
         this.getTrend = this.zabbixAPI.getTrend.bind(this.zabbixAPI);
         this.getEvents = this.zabbixAPI.getEvents.bind(this.zabbixAPI);
         this.getAlerts = this.zabbixAPI.getAlerts.bind(this.zabbixAPI);
@@ -64,12 +73,6 @@ System.register(['angular', 'lodash', './utils', './zabbixAPI.service.js', './za
         this.getSLA = this.zabbixAPI.getSLA.bind(this.zabbixAPI);
         this.getVersion = this.zabbixAPI.getVersion.bind(this.zabbixAPI);
         this.login = this.zabbixAPI.login.bind(this.zabbixAPI);
-
-        if (enableDirectDBConnection) {
-          this.dbConnector = new ZabbixDBConnector(sqlDatasourceId);
-          this.getHistoryDB = this.dbConnector.getHistory.bind(this.dbConnector);
-          this.getTrendsDB = this.dbConnector.getTrends.bind(this.dbConnector);
-        }
       }
 
       _createClass(Zabbix, [{

dist/datasource-zabbix/zabbixCachingProxy.service.js

@@ -29,10 +29,11 @@ System.register(['angular', 'lodash'], function (_export, _context) {
   /** @ngInject */
   function ZabbixCachingProxyFactory() {
     var ZabbixCachingProxy = function () {
-      function ZabbixCachingProxy(zabbixAPI, cacheOptions) {
+      function ZabbixCachingProxy(zabbixAPI, zabbixDBConnector, cacheOptions) {
         _classCallCheck(this, ZabbixCachingProxy);
 
         this.zabbixAPI = zabbixAPI;
+        this.dbConnector = zabbixDBConnector;
         this.cacheEnabled = cacheOptions.enabled;
         this.ttl = cacheOptions.ttl || 600000; // 10 minutes by default
 
@@ -53,6 +54,11 @@ System.register(['angular', 'lodash'], function (_export, _context) {
         // Don't run duplicated history requests
         this.getHistory = callAPIRequestOnce(_.bind(this.zabbixAPI.getHistory, this.zabbixAPI), this.historyPromises, getHistoryRequestHash);
 
+        if (this.dbConnector) {
+          this.getHistoryDB = callAPIRequestOnce(_.bind(this.dbConnector.getHistory, this.dbConnector), this.historyPromises, getDBQueryHash);
+          this.getTrendsDB = callAPIRequestOnce(_.bind(this.dbConnector.getTrends, this.dbConnector), this.historyPromises, getDBQueryHash);
+        }
+
         // Don't run duplicated requests
         this.groupPromises = {};
         this.getGroupsOnce = callAPIRequestOnce(_.bind(this.zabbixAPI.getGroups, this.zabbixAPI), this.groupPromises, getRequestHash);
@@ -209,6 +215,14 @@ System.register(['angular', 'lodash'], function (_export, _context) {
     return stamp.getHash();
   }
 
+  function getDBQueryHash(args) {
+    var itemids = _.map(args[0], 'itemid');
+    var consolidateBy = args[3].consolidateBy;
+    var intervalMs = args[3].intervalMs;
+    var stamp = itemids.join() + args[1] + args[2] + consolidateBy + intervalMs;
+    return stamp.getHash();
+  }
+
   return {
     setters: [function (_angular) {
       angular = _angular.default;

dist/test/datasource-zabbix/zabbix.js

@@ -50,17 +50,26 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy, ZabbixDBConnector)
       var ZabbixAPI = zabbixAPIService;
       this.zabbixAPI = new ZabbixAPI(url, username, password, basicAuth, withCredentials);
 
+      if (enableDirectDBConnection) {
+        this.dbConnector = new ZabbixDBConnector(sqlDatasourceId);
+      }
+
       // Initialize caching proxy for requests
       var cacheOptions = {
         enabled: true,
         ttl: cacheTTL
       };
-      this.cachingProxy = new ZabbixCachingProxy(this.zabbixAPI, cacheOptions);
+      this.cachingProxy = new ZabbixCachingProxy(this.zabbixAPI, this.dbConnector, cacheOptions);
 
       // Proxy methods
       this.getHistory = this.cachingProxy.getHistory.bind(this.cachingProxy);
       this.getMacros = this.cachingProxy.getMacros.bind(this.cachingProxy);
 
+      if (enableDirectDBConnection) {
+        this.getHistoryDB = this.cachingProxy.getHistoryDB.bind(this.cachingProxy);
+        this.getTrendsDB = this.cachingProxy.getTrendsDB.bind(this.cachingProxy);
+      }
+
       this.getTrend = this.zabbixAPI.getTrend.bind(this.zabbixAPI);
       this.getEvents = this.zabbixAPI.getEvents.bind(this.zabbixAPI);
       this.getAlerts = this.zabbixAPI.getAlerts.bind(this.zabbixAPI);
@@ -69,12 +78,6 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy, ZabbixDBConnector)
       this.getSLA = this.zabbixAPI.getSLA.bind(this.zabbixAPI);
       this.getVersion = this.zabbixAPI.getVersion.bind(this.zabbixAPI);
       this.login = this.zabbixAPI.login.bind(this.zabbixAPI);
-
-      if (enableDirectDBConnection) {
-        this.dbConnector = new ZabbixDBConnector(sqlDatasourceId);
-        this.getHistoryDB = this.dbConnector.getHistory.bind(this.dbConnector);
-        this.getTrendsDB = this.dbConnector.getTrends.bind(this.dbConnector);
-      }
     }
 
     _createClass(Zabbix, [{

dist/test/datasource-zabbix/zabbixCachingProxy.service.js

@@ -22,10 +22,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 /** @ngInject */
 function ZabbixCachingProxyFactory() {
   var ZabbixCachingProxy = function () {
-    function ZabbixCachingProxy(zabbixAPI, cacheOptions) {
+    function ZabbixCachingProxy(zabbixAPI, zabbixDBConnector, cacheOptions) {
       _classCallCheck(this, ZabbixCachingProxy);
 
       this.zabbixAPI = zabbixAPI;
+      this.dbConnector = zabbixDBConnector;
       this.cacheEnabled = cacheOptions.enabled;
       this.ttl = cacheOptions.ttl || 600000; // 10 minutes by default
 
@@ -46,6 +47,11 @@ function ZabbixCachingProxyFactory() {
       // Don't run duplicated history requests
       this.getHistory = callAPIRequestOnce(_lodash2.default.bind(this.zabbixAPI.getHistory, this.zabbixAPI), this.historyPromises, getHistoryRequestHash);
 
+      if (this.dbConnector) {
+        this.getHistoryDB = callAPIRequestOnce(_lodash2.default.bind(this.dbConnector.getHistory, this.dbConnector), this.historyPromises, getDBQueryHash);
+        this.getTrendsDB = callAPIRequestOnce(_lodash2.default.bind(this.dbConnector.getTrends, this.dbConnector), this.historyPromises, getDBQueryHash);
+      }
+
       // Don't run duplicated requests
       this.groupPromises = {};
       this.getGroupsOnce = callAPIRequestOnce(_lodash2.default.bind(this.zabbixAPI.getGroups, this.zabbixAPI), this.groupPromises, getRequestHash);
@@ -210,6 +216,14 @@ function getHistoryRequestHash(args) {
   return stamp.getHash();
 }
 
+function getDBQueryHash(args) {
+  var itemids = _lodash2.default.map(args[0], 'itemid');
+  var consolidateBy = args[3].consolidateBy;
+  var intervalMs = args[3].intervalMs;
+  var stamp = itemids.join() + args[1] + args[2] + consolidateBy + intervalMs;
+  return stamp.getHash();
+}
+
 String.prototype.getHash = function () {
   var hash = 0,
       i,

src/datasource-zabbix/zabbix.js

@@ -22,17 +22,26 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy, ZabbixDBConnector)
       var ZabbixAPI = zabbixAPIService;
       this.zabbixAPI = new ZabbixAPI(url, username, password, basicAuth, withCredentials);
 
+      if (enableDirectDBConnection) {
+        this.dbConnector = new ZabbixDBConnector(sqlDatasourceId);
+      }
+
       // Initialize caching proxy for requests
       let cacheOptions = {
         enabled: true,
         ttl: cacheTTL
       };
-      this.cachingProxy = new ZabbixCachingProxy(this.zabbixAPI, cacheOptions);
+      this.cachingProxy = new ZabbixCachingProxy(this.zabbixAPI, this.dbConnector, cacheOptions);
 
       // Proxy methods
       this.getHistory = this.cachingProxy.getHistory.bind(this.cachingProxy);
       this.getMacros = this.cachingProxy.getMacros.bind(this.cachingProxy);
 
+      if (enableDirectDBConnection) {
+        this.getHistoryDB = this.cachingProxy.getHistoryDB.bind(this.cachingProxy);
+        this.getTrendsDB = this.cachingProxy.getTrendsDB.bind(this.cachingProxy);
+      }
+
       this.getTrend = this.zabbixAPI.getTrend.bind(this.zabbixAPI);
       this.getEvents = this.zabbixAPI.getEvents.bind(this.zabbixAPI);
       this.getAlerts = this.zabbixAPI.getAlerts.bind(this.zabbixAPI);
@@ -41,12 +50,6 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy, ZabbixDBConnector)
       this.getSLA = this.zabbixAPI.getSLA.bind(this.zabbixAPI);
       this.getVersion = this.zabbixAPI.getVersion.bind(this.zabbixAPI);
       this.login = this.zabbixAPI.login.bind(this.zabbixAPI);
-
-      if (enableDirectDBConnection) {
-        this.dbConnector = new ZabbixDBConnector(sqlDatasourceId);
-        this.getHistoryDB = this.dbConnector.getHistory.bind(this.dbConnector);
-        this.getTrendsDB = this.dbConnector.getTrends.bind(this.dbConnector);
-      }
     }
 
     getItemsFromTarget(target, options) {

src/datasource-zabbix/zabbixCachingProxy.service.js

@@ -8,8 +8,9 @@ import _ from 'lodash';
 function ZabbixCachingProxyFactory() {
 
   class ZabbixCachingProxy {
-    constructor(zabbixAPI, cacheOptions) {
+    constructor(zabbixAPI, zabbixDBConnector, cacheOptions) {
       this.zabbixAPI = zabbixAPI;
+      this.dbConnector = zabbixDBConnector;
       this.cacheEnabled = cacheOptions.enabled;
       this.ttl          = cacheOptions.ttl || 600000; // 10 minutes by default
 
@@ -31,6 +32,13 @@ function ZabbixCachingProxyFactory() {
       this.getHistory = callAPIRequestOnce(_.bind(this.zabbixAPI.getHistory, this.zabbixAPI),
                                            this.historyPromises, getHistoryRequestHash);
 
+      if (this.dbConnector) {
+        this.getHistoryDB = callAPIRequestOnce(_.bind(this.dbConnector.getHistory, this.dbConnector),
+                                               this.historyPromises, getDBQueryHash);
+        this.getTrendsDB = callAPIRequestOnce(_.bind(this.dbConnector.getTrends, this.dbConnector),
+                                              this.historyPromises, getDBQueryHash);
+      }
+
       // Don't run duplicated requests
       this.groupPromises = {};
       this.getGroupsOnce = callAPIRequestOnce(_.bind(this.zabbixAPI.getGroups, this.zabbixAPI),
@@ -195,6 +203,14 @@ function getHistoryRequestHash(args) {
   return stamp.getHash();
 }
 
+function getDBQueryHash(args) {
+  let itemids = _.map(args[0], 'itemid');
+  let consolidateBy = args[3].consolidateBy;
+  let intervalMs = args[3].intervalMs;
+  let stamp = itemids.join() + args[1] + args[2] + consolidateBy + intervalMs;
+  return stamp.getHash();
+}
+
 String.prototype.getHash = function() {
   var hash = 0, i, chr, len;
   if (this.length !== 0) {