Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: db connectors

Browse Source
This commit is contained in:
Alexander Zobnin
2018-06-08 19:32:26 +03:00
parent 95bbede3da
commit 16861ad8c3
27 changed files with 1699 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/datasource-zabbix/datasource.js
View File

@@ -54,7 +54,7 @@ class ZabbixAPIDatasource {
// Direct DB Connection options
let dbConnectionOptions = jsonData.dbConnection || {};
this.enableDirectDBConnection = dbConnectionOptions.enable;
this.sqlDatasourceId = dbConnectionOptions.datasourceId;
this.datasourceId = dbConnectionOptions.datasourceId;
let zabbixOptions = {
url: this.url,
@@ -64,7 +64,7 @@ class ZabbixAPIDatasource {
withCredentials: this.withCredentials,
cacheTTL: this.cacheTTL,
enableDirectDBConnection: this.enableDirectDBConnection,
sqlDatasourceId: this.sqlDatasourceId
datasourceId: this.datasourceId
};
this.zabbix = new Zabbix(zabbixOptions, backendSrv, datasourceSrv);
@@ -350,7 +350,7 @@ class ZabbixAPIDatasource {
})
.then(() => {
if (this.enableDirectDBConnection) {
return this.zabbix.dbConnector.testSQLDataSource();
return this.zabbix.dbConnector.testDataSource();
} else {
return Promise.resolve();
}