From ba48436a0a9b8a9987a59ec482deb0060daa1ec3 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Sun, 12 Jul 2015 20:55:56 +0300 Subject: [PATCH] Resolved #53 - Get settings from data source configuration page. --- zabbix/datasource.js | 11 +++++------ zabbix/partials/config.html | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/zabbix/datasource.js b/zabbix/datasource.js index 656c2dd..57883f6 100644 --- a/zabbix/datasource.js +++ b/zabbix/datasource.js @@ -26,16 +26,15 @@ function (angular, _, kbn) { this.basicAuth = datasource.basicAuth; this.withCredentials = datasource.withCredentials; - // TODO: fix passing username and password from config.html - this.username = datasource.meta.username; - this.password = datasource.meta.password; + this.username = datasource.jsonData.username || datasource.meta.username; + this.password = datasource.jsonData.password || datasource.meta.password; // Use trends instead history since specified time - this.trends = datasource.meta.trends; - this.trendsFrom = datasource.meta.trendsFrom || '7d'; + this.trends = datasource.jsonData.trends || datasource.meta.trends; + this.trendsFrom = datasource.jsonData.trendsFrom || datasource.meta.trendsFrom || '7d'; // Limit metrics per panel for templated request - this.limitmetrics = datasource.meta.limitmetrics || 100; + this.limitmetrics = datasource.jsonData.limitMetrics || datasource.meta.limitmetrics || 100; // Initialize Zabbix API this.zabbixAPI = new ZabbixAPI(this.url, this.username, this.password, this.basicAuth, this.withCredentials); diff --git a/zabbix/partials/config.html b/zabbix/partials/config.html index b9d893a..de32561 100644 --- a/zabbix/partials/config.html +++ b/zabbix/partials/config.html @@ -10,16 +10,44 @@ User
  • - +
  • Password
  • - + +
    • + +
    + +
    + +
    +
    +
    +
    - -