Explorar o código

rename new JSON data attrbute.

Ramiro Morales %!s(int64=7) %!d(string=hai) anos
pai
achega
d859a6aeb8

+ 1 - 1
pkg/tsdb/mssql/mssql.go

@@ -52,7 +52,7 @@ func generateConnectionString(datasource *models.DataSource) string {
 	}
 
 	server, port := hostParts[0], hostParts[1]
-	encrypt := datasource.JsonData.Get("sslmode").MustString("false")
+	encrypt := datasource.JsonData.Get("encrypt").MustString("false")
 	return fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;encrypt=%s;",
 		server,
 		port,

+ 1 - 1
public/app/plugins/datasource/mssql/partials/config.html

@@ -31,7 +31,7 @@
 	<div class="gf-form">
 		<label class="gf-form-label width-7">Encrypt</label>
 		<div class="gf-form-select-wrapper max-width-15 gf-form-select-wrapper--has-help-icon">
-			<select class="gf-form-input" ng-model="ctrl.current.jsondata.sslmode" ng-options="mode for mode in ['disable', 'false', 'true']" ng-init="ctrl.current.jsondata.sslmode"></select>
+			<select class="gf-form-input" ng-model="ctrl.current.jsondata.encrypt" ng-options="mode for mode in ['disable', 'false', 'true']" ng-init="ctrl.current.jsondata.encrypt"></select>
 			<info-popover mode="right-absolute">
 				Determines whether or to which extent a secure SSL TCP/IP connection will be negotiated with the server.
 				<ul>