From 097801ba60d34501d6fe28a9b8d7ff4b727343f6 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sat, 16 Jan 2016 14:28:27 +0300 Subject: [PATCH] Removed deprecated settings loading from plugin.json file. --- plugins/datasource-zabbix/datasource.js | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js index 1108c7b..b9405d1 100644 --- a/plugins/datasource-zabbix/datasource.js +++ b/plugins/datasource-zabbix/datasource.js @@ -19,25 +19,15 @@ function (angular, _, dateMath) { this.basicAuth = instanceSettings.basicAuth; this.withCredentials = instanceSettings.withCredentials; - if (instanceSettings.jsonData) { - this.username = instanceSettings.jsonData.username; - this.password = instanceSettings.jsonData.password; + this.username = instanceSettings.jsonData.username; + this.password = instanceSettings.jsonData.password; - // Use trends instead history since specified time - this.trends = instanceSettings.jsonData.trends; - this.trendsFrom = instanceSettings.jsonData.trendsFrom || '7d'; + // Use trends instead history since specified time + this.trends = instanceSettings.jsonData.trends; + this.trendsFrom = instanceSettings.jsonData.trendsFrom || '7d'; - // Limit metrics per panel for templated request - 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; - } + // Limit metrics per panel for templated request + this.limitmetrics = instanceSettings.jsonData.limitMetrics || 100; // Initialize Zabbix API this.zabbixAPI = new ZabbixAPI(this.url, this.username, this.password, this.basicAuth, this.withCredentials);