diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go index 7b8e91306c0..12cf29b3c43 100644 --- a/pkg/tsdb/postgres/postgres.go +++ b/pkg/tsdb/postgres/postgres.go @@ -62,8 +62,8 @@ func escape(input string) string { } func generateConnectionString(datasource *models.DataSource, logger log.Logger) (string, error) { - sslMode := strings.TrimSpace(strings.ToLower(datasource.JsonData.Get("sslmode").MustString("verify-full"))) - isSSLDisabled := sslMode == "disable" + tlsMode := strings.TrimSpace(strings.ToLower(datasource.JsonData.Get("sslmode").MustString("verify-full"))) + isTLSDisabled := tlsMode == "disable" var host string var port int @@ -88,29 +88,29 @@ func generateConnectionString(datasource *models.DataSource, logger log.Logger) connStr := fmt.Sprintf("user='%s' password='%s' host='%s' dbname='%s' sslmode='%s'", escape(datasource.User), escape(datasource.DecryptedPassword()), escape(host), escape(datasource.Database), - escape(sslMode)) + escape(tlsMode)) if port > 0 { connStr += fmt.Sprintf(" port=%d", port) } - if isSSLDisabled { - logger.Debug("Postgres SSL is disabled") + if isTLSDisabled { + logger.Debug("Postgres TLS/SSL is disabled") } else { - logger.Debug("Postgres SSL is enabled", "sslMode", sslMode) + logger.Debug("Postgres TLS/SSL is enabled", "tlsMode", tlsMode) // Attach root certificate if provided - if sslRootCert := datasource.JsonData.Get("sslRootCertFile").MustString(""); sslRootCert != "" { - logger.Debug("Setting server root certificate", "sslRootCert", sslRootCert) - connStr += fmt.Sprintf(" sslrootcert='%s'", sslRootCert) + if tlsRootCert := datasource.JsonData.Get("sslRootCertFile").MustString(""); tlsRootCert != "" { + logger.Debug("Setting server root certificate", "tlsRootCert", tlsRootCert) + connStr += fmt.Sprintf(" sslrootcert='%s'", tlsRootCert) } // Attach client certificate and key if both are provided - sslCert := datasource.JsonData.Get("sslCertFile").MustString("") - sslKey := datasource.JsonData.Get("sslKeyFile").MustString("") - if sslCert != "" && sslKey != "" { - logger.Debug("Setting SSL client auth", "sslCert", sslCert, "sslKey", sslKey) - connStr += fmt.Sprintf(" sslcert='%s' sslkey='%s'", sslCert, sslKey) - } else if sslCert != "" || sslKey != "" { - return "", fmt.Errorf("SSL client certificate and key must both be specified") + tlsCert := datasource.JsonData.Get("sslCertFile").MustString("") + tlsKey := datasource.JsonData.Get("sslKeyFile").MustString("") + if tlsCert != "" && tlsKey != "" { + logger.Debug("Setting TLS/SSL client auth", "tlsCert", tlsCert, "tlsKey", tlsKey) + connStr += fmt.Sprintf(" sslcert='%s' sslkey='%s'", tlsCert, tlsKey) + } else if tlsCert != "" || tlsKey != "" { + return "", fmt.Errorf("TLS/SSL client certificate and key must both be specified") } } diff --git a/pkg/tsdb/postgres/postgres_test.go b/pkg/tsdb/postgres/postgres_test.go index 0340444fdcb..577a6b6d28e 100644 --- a/pkg/tsdb/postgres/postgres_test.go +++ b/pkg/tsdb/postgres/postgres_test.go @@ -36,7 +36,7 @@ func TestGenerateConnectionString(t *testing.T) { user string password string database string - sslMode string + tlsMode string expConnStr string expErr string }{ @@ -80,20 +80,20 @@ func TestGenerateConnectionString(t *testing.T) { expConnStr: `user='user' password='p\'\\assword' host='host' dbname='database' sslmode='verify-full'`, }, { - desc: "Custom SSL mode", + desc: "Custom TLS/SSL mode", host: "host", user: "user", password: "password", database: "database", - sslMode: "disable", + tlsMode: "disable", expConnStr: "user='user' password='password' host='host' dbname='database' sslmode='disable'", }, } for _, tt := range testCases { t.Run(tt.desc, func(t *testing.T) { data := map[string]interface{}{} - if tt.sslMode != "" { - data["sslmode"] = tt.sslMode + if tt.tlsMode != "" { + data["sslmode"] = tt.tlsMode } ds := &models.DataSource{ Url: tt.host, diff --git a/public/app/plugins/datasource/postgres/partials/config.html b/public/app/plugins/datasource/postgres/partials/config.html index 3fe1ff60ea6..98ddc0b29e8 100644 --- a/public/app/plugins/datasource/postgres/partials/config.html +++ b/public/app/plugins/datasource/postgres/partials/config.html @@ -4,7 +4,8 @@
Host - +
@@ -28,35 +29,40 @@
- +
- + - This option determines whether or with what priority a secure SSL (TLS) TCP/IP connection will be negotiated with the server. + This option determines whether or with what priority a secure TLS/SSL TCP/IP connection will be negotiated with the server.
- SSL Root Certificate - + TLS/SSL Root Certificate + - If the selected SSL mode requires a server root certificate, provide the path to the file here. + If the selected TLS/SSL mode requires a server root certificate, provide the path to the file here. Be sure that the file is readable by the user executing the grafana process.
- SSL Client Certificate - + TLS/SSL Client Certificate + - To authenticate with an SSL/TLS client certificate, provide the path to the file here. + To authenticate with an TLS/SSL client certificate, provide the path to the file here. Be sure that the file is readable by the user executing the grafana process.
- SSL Client Key - + TLS/SSL Client Key + - To authenticate with a client SSL/TLS certificate, provide the path to the corresponding key file here. + To authenticate with a client TLS/SSL certificate, provide the path to the corresponding key file here. Be sure that the file is only readable by the user executing the grafana process.
@@ -67,7 +73,8 @@
Max open - + The maximum number of open connections to the database. If Max idle connections is greater than 0 and the Max open connections is less than Max idle connections, then Max idle connections will be @@ -77,7 +84,8 @@
Max idle - + The maximum number of connections in the idle connection pool. If Max open connections is greater than 0 but less than the Max idle connections, then the Max idle connections will be reduced to match the @@ -86,7 +94,8 @@
Max lifetime - + The maximum amount of time in seconds a connection may be reused. If set to 0, connections are reused forever. @@ -104,11 +113,13 @@ - +
- +
-
-
-

- TimescaleDB is a time-series database built as a PostgreSQL extension. If enabled, Grafana will use time_bucket in the $__timeGroup macro and display TimescaleDB specific aggregate functions in the query builder. -

+
+
+

+ TimescaleDB is a + time-series database built as a PostgreSQL extension. If enabled, Grafana will use time_bucket in + the $__timeGroup macro and display TimescaleDB specific aggregate functions in the query builder. +

+
-
- -
User Permission