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

Merge branch 'master' of https://github.com/g-goessel/grafana-zabbix into g-goessel-master

Browse Source
This commit is contained in:
Alexander Zobnin
2018-08-28 20:34:37 +03:00
parent a3d04a155f 9cfb7e210a
commit ed5cc05c13
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,8 +50,8 @@ export class ZabbixDatasource {
// Direct DB Connection options
let dbConnectionOptions = jsonData.dbConnection || {};
this.enableDirectDBConnection = dbConnectionOptions.enable;
this.datasourceId = dbConnectionOptions.datasourceId;
this.enableDirectDBConnection = dbConnectionOptions.enable || jsonData.dbConnectionEnable || false;
this.datasourceId = dbConnectionOptions.datasourceId || jsonData.dbConnectionDatasourceId;
let zabbixOptions = {
url: this.url,