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

check dbConnection config object, issue #436

Browse Source
This commit is contained in:
Alexander Zobnin
2017-07-26 19:13:44 +03:00
parent ec272770bb
commit e7acd9d634
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/datasource-zabbix/datasource.js vendored
View File

@@ -239,8 +239,9 @@ System.register(['lodash', 'app/core/utils/datemath', './utils', './migrations',
this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING; this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING;
// Direct DB Connection options // Direct DB Connection options
this.enableDirectDBConnection = instanceSettings.jsonData.dbConnection.enable; var dbConnectionOptions = instanceSettings.jsonData.dbConnection || {};
this.sqlDatasourceId = instanceSettings.jsonData.dbConnection.datasourceId; this.enableDirectDBConnection = dbConnectionOptions.enable;
this.sqlDatasourceId = dbConnectionOptions.datasourceId;
var zabbixOptions = { var zabbixOptions = {
username: this.username, username: this.username,

2
dist/datasource-zabbix/datasource.js.map vendored
View File

File diff suppressed because one or more lines are too long

5
dist/test/datasource-zabbix/datasource.js vendored
View File

@@ -92,8 +92,9 @@ var ZabbixAPIDatasource = function () {
this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING; this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING;
// Direct DB Connection options // Direct DB Connection options
this.enableDirectDBConnection = instanceSettings.jsonData.dbConnection.enable; var dbConnectionOptions = instanceSettings.jsonData.dbConnection || {};
this.sqlDatasourceId = instanceSettings.jsonData.dbConnection.datasourceId; this.enableDirectDBConnection = dbConnectionOptions.enable;
this.sqlDatasourceId = dbConnectionOptions.datasourceId;
var zabbixOptions = { var zabbixOptions = {
username: this.username, username: this.username,

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

@@ -47,8 +47,9 @@ class ZabbixAPIDatasource {
this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING; this.alertingMinSeverity = instanceSettings.jsonData.alertingMinSeverity || c.SEV_WARNING;
// Direct DB Connection options // Direct DB Connection options
this.enableDirectDBConnection = instanceSettings.jsonData.dbConnection.enable; let dbConnectionOptions = instanceSettings.jsonData.dbConnection || {};
this.sqlDatasourceId = instanceSettings.jsonData.dbConnection.datasourceId; this.enableDirectDBConnection = dbConnectionOptions.enable;
this.sqlDatasourceId = dbConnectionOptions.datasourceId;
let zabbixOptions = { let zabbixOptions = {
username: this.username, username: this.username,