From 65cf757fab9b8a0e9405264ee08a774ce87d5493 Mon Sep 17 00:00:00 2001
From: Alec Sears <alec.sears@cerner.com>
Date: Tue, 8 Oct 2019 13:46:38 -0500
Subject: [PATCH] Update zabbix_api.go

---
 pkg/zabbix_api.go | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkg/zabbix_api.go b/pkg/zabbix_api.go
index 0e98b47..9c204ba 100644
--- a/pkg/zabbix_api.go
+++ b/pkg/zabbix_api.go
@@ -48,16 +48,6 @@ func (ds *ZabbixDatasource) ZabbixAPIQuery(ctx context.Context, tsdbReq *datasou
 		return nil, err
 	}
 
-	jsonDataStr := dsInfo.GetJsonData()
-	jsonData, err := simplejson.NewJson([]byte(jsonDataStr))
-	if err != nil {
-		return nil, err
-	}
-
-	zabbixLogin := jsonData.Get("username").MustString()
-	// zabbixPassword := jsonData.Get("password").MustString()
-	ds.logger.Debug("ZabbixAPIQuery", "url", zabbixUrl, "user", zabbixLogin)
-
 	jsonQueries := make([]*simplejson.Json, 0)
 	for _, query := range tsdbReq.Queries {
 		json, err := simplejson.NewJson([]byte(query.ModelJson))
@@ -138,7 +128,13 @@ func (ds *ZabbixDatasource) loginWithDs(ctx context.Context, dsInfo *datasource.
 	}
 
 	zabbixLogin := jsonData.Get("username").MustString()
-	zabbixPassword := jsonData.Get("password").MustString()
+	var zabbixPassword string
+	if securePassword, exists := dsInfo.GetDecryptedSecureJsonData()["password"]; exists {
+		zabbixPassword = securePassword
+	} else {
+		zabbixPassword = jsonData.Get("password").MustString()
+	}
+
 	auth, err := ds.login(ctx, zabbixUrlStr, zabbixLogin, zabbixPassword)
 	if err != nil {
 		ds.logger.Error("loginWithDs", "error", err)