mysql-connector: initial ZabbixDBConnector class

src/datasource-zabbix/datasource.js

@@ -20,6 +20,9 @@ class ZabbixAPIDatasource {
     this.datasourceSrv = datasourceSrv;
     this.zabbixAlertingSrv = zabbixAlertingSrv;
 
+    // Use custom format for template variables
+    this.replaceTemplateVars = _.partial(replaceTemplateVars, this.templateSrv);
+
     // General data source settings
     this.name             = instanceSettings.name;
     this.url              = instanceSettings.url;
@@ -44,33 +47,21 @@ class ZabbixAPIDatasource {
     this.addThresholds = instanceSettings.jsonData.addThresholds;
     this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING;
 
-    this.zabbix = new Zabbix(this.url, this.username, this.password, this.basicAuth, this.withCredentials, this.cacheTTL);
-
-    // Try to use direct DB connection
+    // Direct DB Connection options
     this.enableDirectDBConnection = instanceSettings.jsonData.dbConnection.enable;
-    if (this.enableDirectDBConnection) {
-      this.loadSQLDataSource(instanceSettings.jsonData.dbConnection.datasourceId)
-      .then(() => {})
-      .catch(error => {
-        this.enableDirectDBConnection = false;
-        this.alertSrv.set("SQL Data Source Error", error, 'error');
-      });
-    }
+    this.sqlDatasourceId = instanceSettings.jsonData.dbConnection.datasourceId;
 
-    // Use custom format for template variables
-    this.replaceTemplateVars = _.partial(replaceTemplateVars, this.templateSrv);
-  }
+    let zabbixOptions = {
+      username: this.username,
+      password: this.password,
+      basicAuth: this.basicAuth,
+      withCredentials: this.withCredentials,
+      cacheTTL: this.cacheTTL,
+      enableDirectDBConnection: this.enableDirectDBConnection,
+      sqlDatasourceId: this.sqlDatasourceId
+    };
 
-  loadSQLDataSource(datasourceId) {
-    let ds = _.find(this.datasourceSrv.getAll(), {'id': datasourceId});
-    if (ds) {
-      return this.datasourceSrv.loadDatasource(ds.name).then(ds => {
-        console.log('Data source loaded', ds);
-        this.sqlDataSource = ds;
-      });
-    } else {
-      return Promise.reject(`SQL Data Source with ID ${datasourceId} not found`);
-    }
+    this.zabbix = new Zabbix(this.url, zabbixOptions);
   }
 
   ////////////////////////

src/datasource-zabbix/zabbix.js

@@ -3,15 +3,20 @@ import _ from 'lodash';
 import * as utils from './utils';
 import './zabbixAPI.service.js';
 import './zabbixCachingProxy.service.js';
+import './zabbixDBConnector';
 
 // Use factory() instead service() for multiple data sources support.
 // Each Zabbix data source instance should initialize its own API instance.
 
 /** @ngInject */
-function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy) {
+function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy, ZabbixDBConnector) {
 
   class Zabbix {
-    constructor(url, username, password, basicAuth, withCredentials, cacheTTL) {
+    constructor(url, options) {
+      let {
+        username, password, basicAuth, withCredentials, cacheTTL,
+        enableDirectDBConnection, sqlDatasourceId
+      } = options;
 
       // Initialize Zabbix API
       var ZabbixAPI = zabbixAPIService;
@@ -36,6 +41,10 @@ function ZabbixFactory(zabbixAPIService, ZabbixCachingProxy) {
       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);
+      }
     }
 
     getItemsFromTarget(target, options) {

src/datasource-zabbix/zabbixDBConnector.js

@@ -0,0 +1,59 @@
+import angular from 'angular';
+import _ from 'lodash';
+
+/** @ngInject */
+function ZabbixDBConnectorFactory(datasourceSrv, backendSrv) {
+
+  class ZabbixDBConnector {
+
+    constructor(sqlDataSourceId) {
+      this.sqlDataSourceId = sqlDataSourceId;
+
+      // Try to load DS with given id to check it's exist
+      this.loadSQLDataSource(sqlDataSourceId);
+    }
+
+    loadSQLDataSource(datasourceId) {
+      let ds = _.find(datasourceSrv.getAll(), {'id': datasourceId});
+      if (ds) {
+        return datasourceSrv.loadDatasource(ds.name)
+        .then(ds => {
+          console.log('SQL data source loaded', ds);
+        });
+      } else {
+        return Promise.reject(`SQL Data Source with ID ${datasourceId} not found`);
+      }
+    }
+
+    invokeSQLQuery(query) {
+      let queryDef = {
+        refId: 'A',
+        format: 'table',
+        datasourceId: this.sqlDataSourceId,
+        rawSql: query
+      };
+
+      return backendSrv.datasourceRequest({
+        url: '/api/tsdb/query',
+        method: 'POST',
+        data: {
+          queries: [queryDef],
+        }
+      })
+      .then(response => {
+        let results = response.data.results;
+        if (results['A']) {
+          return _.head(results['A'].tables);
+        } else {
+          return null;
+        }
+      });
+    }
+  }
+
+  return ZabbixDBConnector;
+}
+
+angular
+  .module('grafana.services')
+  .factory('ZabbixDBConnector', ZabbixDBConnectorFactory);