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

Removed deprecated settings loading from plugin.json file.

Browse Source
This commit is contained in:
Alexander Zobnin
2016-01-16 14:28:27 +03:00
parent 225d515c6b
commit 097801ba60
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/datasource-zabbix/datasource.js
View File

@@ -19,25 +19,15 @@ function (angular, _, dateMath) {
this.basicAuth = instanceSettings.basicAuth; this.basicAuth = instanceSettings.basicAuth;
this.withCredentials = instanceSettings.withCredentials; this.withCredentials = instanceSettings.withCredentials;
if (instanceSettings.jsonData) { this.username = instanceSettings.jsonData.username;
this.username = instanceSettings.jsonData.username; this.password = instanceSettings.jsonData.password;
this.password = instanceSettings.jsonData.password;
// Use trends instead history since specified time // Use trends instead history since specified time
this.trends = instanceSettings.jsonData.trends; this.trends = instanceSettings.jsonData.trends;
this.trendsFrom = instanceSettings.jsonData.trendsFrom || '7d'; this.trendsFrom = instanceSettings.jsonData.trendsFrom || '7d';
// Limit metrics per panel for templated request // Limit metrics per panel for templated request
this.limitmetrics = instanceSettings.jsonData.limitMetrics || 100; this.limitmetrics = instanceSettings.jsonData.limitMetrics || 100;
} else {
// DEPRECATED. Loads settings from plugin.json file.
// For backward compatibility only.
this.username = instanceSettings.meta.username;
this.password = instanceSettings.meta.password;
this.trends = instanceSettings.meta.trends;
this.trendsFrom = instanceSettings.meta.trendsFrom || '7d';
this.limitmetrics = instanceSettings.meta.limitmetrics || 100;
}
// Initialize Zabbix API // Initialize Zabbix API
this.zabbixAPI = new ZabbixAPI(this.url, this.username, this.password, this.basicAuth, this.withCredentials); this.zabbixAPI = new ZabbixAPI(this.url, this.username, this.password, this.basicAuth, this.withCredentials);