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

db connector: ds loading refactor

Browse Source
This commit is contained in:
Alexander Zobnin
2018-10-30 21:05:48 +03:00
parent 6eb52619b9
commit 34ba8bba1c
3 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
import _ from 'lodash';
import * as utils from '../utils';
import responseHandler from '../responseHandler';
import { CachingProxy } from './proxy/cachingProxy';
import { ZabbixNotImplemented } from './connectors/dbConnector';
import { DBConnector } from './connectors/dbConnector';
import { ZabbixAPIConnector } from './connectors/zabbix_api/zabbixAPIConnector';
import { SQLConnector } from './connectors/sql/sqlConnector';
import { InfluxDBConnector } from './connectors/influxdb/influxdbConnector';
import { CachingProxy } from './proxy/cachingProxy';
import { ZabbixNotImplemented } from './connectors/dbConnector';
const REQUESTS_TO_PROXYFY = [
'getHistory', 'getTrend', 'getGroups', 'getHosts', 'getApps', 'getItems', 'getMacros', 'getItemsByIDs',
@@ -55,24 +55,27 @@ export class Zabbix {
this.bindRequests();
if (enableDirectDBConnection) {
let dbConnectorOptions = {
datasourceId: dbConnectionDatasourceId,
datasourceName: dbConnectionDatasourceName
};
this.dbConnector = new DBConnector(dbConnectorOptions, datasourceSrv);
this.dbConnector.loadDBDataSource().then(ds => {
if (ds.type === 'influxdb') {
this.dbConnector = new InfluxDBConnector(dbConnectorOptions, datasourceSrv);
} else {
this.dbConnector = new SQLConnector(dbConnectorOptions, datasourceSrv, backendSrv);
}
}).then(() => {
this.initDBConnector(dbConnectionDatasourceId, dbConnectionDatasourceName, datasourceSrv)
.then(() => {
this.getHistoryDB = this.cachingProxy.proxyfyWithCache(this.dbConnector.getHistory, 'getHistory', this.dbConnector);
this.getTrendsDB = this.cachingProxy.proxyfyWithCache(this.dbConnector.getTrends, 'getTrends', this.dbConnector);
});
}
}
initDBConnector(datasourceId, datasourceName, datasourceSrv) {
return DBConnector.loadDatasource(datasourceId, datasourceName, datasourceSrv)
.then(ds => {
const options = { datasourceId, datasourceName };
if (ds.type === 'influxdb') {
this.dbConnector = new InfluxDBConnector(options, datasourceSrv);
} else {
this.dbConnector = new SQLConnector(options, datasourceSrv);
}
return this.dbConnector;
});
}
proxyfyRequests() {
for (let request of REQUESTS_TO_PROXYFY) {
this.zabbixAPI[request] = this.cachingProxy.proxyfy(this.zabbixAPI[request], request, this.zabbixAPI);