Skip to content

Commit a6ff2ae

Browse files
authored
Logging best practises (#585)
* Update default password hashing algorithm * Tell the linter that this is not a password * Sort alphabetically * Add additional logging params
1 parent ce6dcbd commit a6ff2ae

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

api/v1/postgres_types.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ const (
8585
defaultPostgresParamValueWalKeepSize = "1GB"
8686
defaultPostgresParamValuePGStatStatementsMax = "500"
8787
defaultPostgresParamValuePasswordEncryption = "scram-sha-256" // nolint
88+
defaultPostgresParamValueLogMinErrorStatement = "WARNING"
89+
defaultPostgresParamValueLogErrorVerbosity = "VERBOSE"
90+
defaultPostgresParamValueLogLinePrefix = "%m [%p]: [%l-1] db=%d,user=%u,app=%a,client=%h "
8891

8992
// PostgresAutoAssignedIPNamePrefix a prefix to add to the generated random name
9093
PostgresAutoAssignedIPNamePrefix = "pgaas-autoassign-"
@@ -959,12 +962,16 @@ func enableAuditLogs(parameters map[string]string) {
959962
// setDefaultPostgresParams configures default keepalive values
960963
func setDefaultPostgresParams(parameters map[string]string, version string) {
961964
// set default parameters
962-
parameters["tcp_keepalives_idle"] = defaultPostgresParamValueTCPKeepAlivesIdle
963-
parameters["tcp_keepalives_interval"] = defaultPostgresParamValueTCPKeepAlivesInterval
965+
parameters["log_error_verbosity"] = defaultPostgresParamValueLogErrorVerbosity
964966
parameters["log_file_mode"] = defaultPostgresParamValueLogFileMode
965-
966-
parameters["ssl_prefer_server_ciphers"] = defaultPostgresParamValueSSLPreferServerCiphers
967+
parameters["log_line_prefix"] = defaultPostgresParamValueLogLinePrefix
968+
parameters["log_min_error_statement"] = defaultPostgresParamValueLogMinErrorStatement
969+
parameters["password_encryption"] = defaultPostgresParamValuePasswordEncryption
970+
parameters["pg_stat_statements.max"] = defaultPostgresParamValuePGStatStatementsMax
967971
parameters["ssl_ciphers"] = defaultPostgresParamValueSSLCiphers
972+
parameters["ssl_prefer_server_ciphers"] = defaultPostgresParamValueSSLPreferServerCiphers
973+
parameters["tcp_keepalives_idle"] = defaultPostgresParamValueTCPKeepAlivesIdle
974+
parameters["tcp_keepalives_interval"] = defaultPostgresParamValueTCPKeepAlivesInterval
968975

969976
// set version specific parameters
970977
v, err := strconv.Atoi(version)
@@ -981,10 +988,6 @@ func setDefaultPostgresParams(parameters map[string]string, version string) {
981988
} else {
982989
parameters["wal_keep_segments"] = defaultPostgresParamValueWalKeepSegments
983990
}
984-
985-
parameters["pg_stat_statements.max"] = defaultPostgresParamValuePGStatStatementsMax
986-
987-
parameters["password_encryption"] = defaultPostgresParamValuePasswordEncryption
988991
}
989992

990993
// setPostgresParams add the provided params to the parameter map (but ignore params that are blocked)

0 commit comments

Comments
 (0)