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

Added backward compatibility for plugin configuration.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-07-16 18:29:41 +03:00
parent 9d84a3e0e8
commit f07b5cb476
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zabbix/datasource.js
View File

@@ -26,15 +26,25 @@ function (angular, _, kbn) {
this.basicAuth = datasource.basicAuth; this.basicAuth = datasource.basicAuth;
this.withCredentials = datasource.withCredentials; this.withCredentials = datasource.withCredentials;
this.username = datasource.jsonData.username || datasource.meta.username; if (datasource.jsonData) {
this.password = datasource.jsonData.password || datasource.meta.password; this.username = datasource.jsonData.username;
this.password = datasource.jsonData.password;
// Use trends instead history since specified time // Use trends instead history since specified time
this.trends = datasource.jsonData.trends || datasource.meta.trends; this.trends = datasource.jsonData.trends;
this.trendsFrom = datasource.jsonData.trendsFrom || datasource.meta.trendsFrom || '7d'; this.trendsFrom = datasource.jsonData.trendsFrom || '7d';
// Limit metrics per panel for templated request // Limit metrics per panel for templated request
this.limitmetrics = datasource.jsonData.limitMetrics || datasource.meta.limitmetrics || 100; this.limitmetrics = datasource.jsonData.limitMetrics || 100;
} else {
// DEPRECATED. Loads settings from plugin.json file.
// For backward compatibility only.
this.username = datasource.meta.username;
this.password = datasource.meta.password;
this.trends = datasource.meta.trends;
this.trendsFrom = datasource.meta.trendsFrom || '7d';
this.limitmetrics = datasource.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);