mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-23 17:55:17 +00:00
Merge branch 'main' into syste-users-permissions
This commit is contained in:
@@ -14,6 +14,7 @@ Tracing:
|
||||
# for type 'otel' is used for standard [open telemetry](https://opentelemetry.io)
|
||||
# Fraction: 1.0
|
||||
# Endpoint: 'otel.collector.endpoint'
|
||||
# ServiceName: 'ZITADEL' # Name of the service in traces
|
||||
#
|
||||
# type 'log' or '' disables tracing
|
||||
#
|
||||
@@ -24,6 +25,8 @@ Tracing:
|
||||
Fraction: 1.0 # ZITADEL_TRACING_FRACTION
|
||||
# The endpoint of the otel collector endpoint
|
||||
Endpoint: "" #ZITADEL_TRACING_ENDPOINT
|
||||
# The name of the service in traces
|
||||
ServiceName: "ZITADEL" #ZITADEL_TRACING_SERVICENAME
|
||||
|
||||
# Profiler enables capturing profiling data (CPU, Memory, ...) for performance analysis
|
||||
Profiler:
|
||||
@@ -699,6 +702,7 @@ SystemDefaults:
|
||||
# - "bcrypt"
|
||||
# - "md5" # md5Crypt with salt and password shuffling.
|
||||
# - "md5plain" # md5 digest of a password without salt
|
||||
# - "md5salted" # md5 digest of a salted password
|
||||
# - "scrypt"
|
||||
# - "pbkdf2" # verifier for all pbkdf2 hash modes.
|
||||
SecretHasher:
|
||||
|
Reference in New Issue
Block a user