From 4b2c823521ebee450233aced33ae5eb3bdf79587 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 30 Mar 2022 07:24:54 -0700 Subject: [PATCH] mssql: explicit disable encryption when its disabled (#46546) (#47060) (cherry picked from commit b52794601dd86fb7700ed0f04ab014a8ff62266d) Co-authored-by: Dirkco du Plessis --- pkg/tsdb/mssql/mssql.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go index c130dc2411e..dd60bf6b03e 100644 --- a/pkg/tsdb/mssql/mssql.go +++ b/pkg/tsdb/mssql/mssql.go @@ -169,6 +169,8 @@ func generateConnectionString(dsInfo sqleng.DataSourceInfo) (string, error) { if certificate != "" { connStr += fmt.Sprintf("certificate=%s;", certificate) } + } else if encrypt == "disable" { + connStr += fmt.Sprintf("encrypt=%s;", dsInfo.JsonData.Encrypt) } return connStr, nil }