diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 909e71aa6..ba2dcbc95 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -76,7 +76,7 @@ Add more configuration information here. --> -### If applicable, please paste the log output at DEBUG level (`--logLevel=DEBUG` switch) +### If applicable, please paste the log output at DEBUG level (`--log.level=DEBUG` switch) ``` (paste your output here) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index 4fad5ee3b..44410d56e 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -81,7 +81,7 @@ Add more configuration information here. --> -### If applicable, please paste the log output in DEBUG level (`--logLevel=DEBUG` switch) +### If applicable, please paste the log output in DEBUG level (`--log.level=DEBUG` switch) ``` (paste your output here) diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index 853e1b0bd..550af28ab 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -317,7 +317,7 @@ func configureLogging(staticConfiguration *static.Configuration) { // otherwise. var levelStr string if staticConfiguration.Log != nil { - levelStr = strings.ToLower(staticConfiguration.Log.LogLevel) + levelStr = strings.ToLower(staticConfiguration.Log.Level) } if levelStr == "" { levelStr = "error" diff --git a/docs/content/observability/logs.md b/docs/content/observability/logs.md index 2e96b51f9..ba8eda6c2 100644 --- a/docs/content/observability/logs.md +++ b/docs/content/observability/logs.md @@ -37,9 +37,9 @@ You can configure a file path instead using the `filePath` option. By default, the logs use a text format (`common`), but you can also ask for the `json` format in the `format` option. -#### logLevel +#### log level -By default, the `logLevel` is set to `error`, but you can choose amongst `debug`, `panic`, `fatal`, `error`, `warn`, and `info`. +By default, the `level` is set to `error`, but you can choose amongst `debug`, `panic`, `fatal`, `error`, `warn`, and `info`. ## Log Rotation diff --git a/docs/content/reference/static-configuration.toml b/docs/content/reference/static-configuration.toml index 5f77395b5..f22d6d3c6 100644 --- a/docs/content/reference/static-configuration.toml +++ b/docs/content/reference/static-configuration.toml @@ -152,7 +152,7 @@ Middlewares = ["foobar", "foobar"] [Log] - LogLevel = "foobar" + Level = "foobar" FilePath = "foobar" Format = "foobar" @@ -205,7 +205,7 @@ [Tracing.Instana] LocalAgentHost = "foobar" LocalAgentPort = 42 - LogLevel = "foobar" + Level = "foobar" [HostResolver] CnameFlattening = true diff --git a/docs/content/reference/static-configuration.txt b/docs/content/reference/static-configuration.txt index 64ba67008..a8c1d0781 100644 --- a/docs/content/reference/static-configuration.txt +++ b/docs/content/reference/static-configuration.txt @@ -40,13 +40,13 @@ --api.middlewares Middleware list --api.statistics Enable more detailed statistics (default "true") --api.statistics.recenterrors Number of recent errors logged (default "10") --c, --configfile Configuration file to use (TOML). +-c, --configfile Configuration file to use (TOML). --entrypoints Entrypoints definition using format: --entryPoints='Name:http Address::8000 (default "map[]") Redirect.EntryPoint:https' --entryPoints='Name:https Address::4442 TLS:tests/traefik.crt,tests/traefik.key;prod/traefik.crt,prod/traefik.key' --global Global configuration options (default "true") --global.checknewversion Periodically check if a new version has been released (default "true") --d, --global.debug Enable debug mode (default "false") +-d, --global.debug Enable debug mode (default "false") --global.sendanonymoususage send periodically anonymous usage statistics (default "false") --hostresolver Enable CNAME Flattening (default "false") --hostresolver.cnameflattening A flag to enable/disable CNAME flattening (default "false") @@ -55,7 +55,7 @@ --log Traefik log settings (default "false") --log.filepath Traefik log file path. Stdout is used when omitted or empty --log.format Traefik log format: json | common (default "common") ---log.loglevel Log level set to traefik logs. +--log.level Log level set to traefik logs. --metrics Enable a metrics exporter (default "false") --metrics.datadog DataDog metrics exporter type (default "false") --metrics.datadog.address DataDog's address (default "localhost:8125") @@ -193,4 +193,4 @@ --tracing.zipkin.id128bit Use Zipkin 128 bit root span IDs. (default "true") --tracing.zipkin.samespan Use Zipkin SameSpan RPC style traces. (default "false") --tracing.zipkin.samplerate The rate between 0.0 and 1.0 of requests to trace. (default "1") --h, --help Print Help (this message) and exit \ No newline at end of file +-h, --help Print Help (this message) and exit \ No newline at end of file diff --git a/integration/fixtures/access_log_config.toml b/integration/fixtures/access_log_config.toml index 69e22c66a..bd27bbf48 100644 --- a/integration/fixtures/access_log_config.toml +++ b/integration/fixtures/access_log_config.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "ERROR" +level = "ERROR" filePath = "traefik.log" [accessLog] diff --git a/integration/fixtures/acme/acme_base.toml b/integration/fixtures/acme/acme_base.toml index 9123eb0c7..4f693fb6c 100644 --- a/integration/fixtures/acme/acme_base.toml +++ b/integration/fixtures/acme/acme_base.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/acme/acme_tls.toml b/integration/fixtures/acme/acme_tls.toml index a0d3c850f..eba84f38d 100644 --- a/integration/fixtures/acme/acme_tls.toml +++ b/integration/fixtures/acme/acme_tls.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/acme/acme_tls_dynamic.toml b/integration/fixtures/acme/acme_tls_dynamic.toml index 30f5d09b3..2de71cca5 100644 --- a/integration/fixtures/acme/acme_tls_dynamic.toml +++ b/integration/fixtures/acme/acme_tls_dynamic.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml b/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml index c08e13b39..8d8629ddd 100644 --- a/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml +++ b/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/docker/minimal.toml b/integration/fixtures/docker/minimal.toml index d4073bcca..f3c89cba7 100644 --- a/integration/fixtures/docker/minimal.toml +++ b/integration/fixtures/docker/minimal.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/docker/simple.toml b/integration/fixtures/docker/simple.toml index 0ad2f3c30..365533562 100644 --- a/integration/fixtures/docker/simple.toml +++ b/integration/fixtures/docker/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/error_pages/error.toml b/integration/fixtures/error_pages/error.toml index 6cc387aa2..5d6d10932 100644 --- a/integration/fixtures/error_pages/error.toml +++ b/integration/fixtures/error_pages/error.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/error_pages/simple.toml b/integration/fixtures/error_pages/simple.toml index 6ed4a8a4f..385def51b 100644 --- a/integration/fixtures/error_pages/simple.toml +++ b/integration/fixtures/error_pages/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/file/56-simple-panic.toml b/integration/fixtures/file/56-simple-panic.toml index 328208efa..fd94864de 100644 --- a/integration/fixtures/file/56-simple-panic.toml +++ b/integration/fixtures/file/56-simple-panic.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/file/directory.toml b/integration/fixtures/file/directory.toml index c9260ee47..9bde5a91e 100644 --- a/integration/fixtures/file/directory.toml +++ b/integration/fixtures/file/directory.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/file/simple.toml b/integration/fixtures/file/simple.toml index 8229d03d6..accd6032d 100644 --- a/integration/fixtures/file/simple.toml +++ b/integration/fixtures/file/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/grpc/config.toml b/integration/fixtures/grpc/config.toml index ca25ee2ad..c88ed6914 100644 --- a/integration/fixtures/grpc/config.toml +++ b/integration/fixtures/grpc/config.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] rootCAs = [ """{{ .CertContent }}""" ] diff --git a/integration/fixtures/grpc/config_h2c.toml b/integration/fixtures/grpc/config_h2c.toml index cd5259e7d..e1267ea22 100644 --- a/integration/fixtures/grpc/config_h2c.toml +++ b/integration/fixtures/grpc/config_h2c.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/grpc/config_h2c_termination.toml b/integration/fixtures/grpc/config_h2c_termination.toml index d8ccc5233..2533bcc07 100644 --- a/integration/fixtures/grpc/config_h2c_termination.toml +++ b/integration/fixtures/grpc/config_h2c_termination.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/grpc/config_insecure.toml b/integration/fixtures/grpc/config_insecure.toml index 80e6ea1d5..57e5a2499 100644 --- a/integration/fixtures/grpc/config_insecure.toml +++ b/integration/fixtures/grpc/config_insecure.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] insecureSkipVerify = true diff --git a/integration/fixtures/grpc/config_retry.toml b/integration/fixtures/grpc/config_retry.toml index 756fb4e1a..b873f724c 100644 --- a/integration/fixtures/grpc/config_retry.toml +++ b/integration/fixtures/grpc/config_retry.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] rootCAs = [ """{{ .CertContent }}""" ] diff --git a/integration/fixtures/grpc/config_with_flush.toml b/integration/fixtures/grpc/config_with_flush.toml index ca25ee2ad..c88ed6914 100644 --- a/integration/fixtures/grpc/config_with_flush.toml +++ b/integration/fixtures/grpc/config_with_flush.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] rootCAs = [ """{{ .CertContent }}""" ] diff --git a/integration/fixtures/headers/basic.toml b/integration/fixtures/headers/basic.toml index 341df9667..a69314e18 100644 --- a/integration/fixtures/headers/basic.toml +++ b/integration/fixtures/headers/basic.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/headers/cors.toml b/integration/fixtures/headers/cors.toml index 7b554d37c..fde39cd63 100644 --- a/integration/fixtures/headers/cors.toml +++ b/integration/fixtures/headers/cors.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml index b0a45b2b9..eb8fb1e22 100644 --- a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml +++ b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.http1] diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml index 6658aa5fa..ca2e261f6 100644 --- a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml +++ b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.http1] diff --git a/integration/fixtures/healthcheck/port_overload.toml b/integration/fixtures/healthcheck/port_overload.toml index ca29f0e91..138ef9462 100644 --- a/integration/fixtures/healthcheck/port_overload.toml +++ b/integration/fixtures/healthcheck/port_overload.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/healthcheck/simple.toml b/integration/fixtures/healthcheck/simple.toml index 6f82648dd..5bb413241 100644 --- a/integration/fixtures/healthcheck/simple.toml +++ b/integration/fixtures/healthcheck/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/https/clientca/https_1ca1config.toml b/integration/fixtures/https/clientca/https_1ca1config.toml index ac96518f1..50755445c 100644 --- a/integration/fixtures/https/clientca/https_1ca1config.toml +++ b/integration/fixtures/https/clientca/https_1ca1config.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/clientca/https_2ca1config.toml b/integration/fixtures/https/clientca/https_2ca1config.toml index 2b2191a87..1443bb5ad 100644 --- a/integration/fixtures/https/clientca/https_2ca1config.toml +++ b/integration/fixtures/https/clientca/https_2ca1config.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/clientca/https_2ca2config.toml b/integration/fixtures/https/clientca/https_2ca2config.toml index 68c7f0552..6af488d6c 100644 --- a/integration/fixtures/https/clientca/https_2ca2config.toml +++ b/integration/fixtures/https/clientca/https_2ca2config.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/dynamic_https_sni.toml b/integration/fixtures/https/dynamic_https_sni.toml index f8a67f45d..c01ae8786 100644 --- a/integration/fixtures/https/dynamic_https_sni.toml +++ b/integration/fixtures/https/dynamic_https_sni.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/dynamic_https_sni_default_cert.toml b/integration/fixtures/https/dynamic_https_sni_default_cert.toml index 9f21dbb47..e8f4fd768 100644 --- a/integration/fixtures/https/dynamic_https_sni_default_cert.toml +++ b/integration/fixtures/https/dynamic_https_sni_default_cert.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/https_redirect.toml b/integration/fixtures/https/https_redirect.toml index 5ac100f56..22e184dfa 100644 --- a/integration/fixtures/https/https_redirect.toml +++ b/integration/fixtures/https/https_redirect.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/https/https_sni.toml b/integration/fixtures/https/https_sni.toml index 956b884ac..5be5d5154 100644 --- a/integration/fixtures/https/https_sni.toml +++ b/integration/fixtures/https/https_sni.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml index 4d7e28ab8..059ba3086 100644 --- a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml +++ b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/https_sni_default_cert.toml b/integration/fixtures/https/https_sni_default_cert.toml index 056bee7fe..0bf10dfcc 100644 --- a/integration/fixtures/https/https_sni_default_cert.toml +++ b/integration/fixtures/https/https_sni_default_cert.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/https_sni_strict.toml b/integration/fixtures/https/https_sni_strict.toml index df4af0028..f24b9cf3b 100644 --- a/integration/fixtures/https/https_sni_strict.toml +++ b/integration/fixtures/https/https_sni_strict.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web-secure] diff --git a/integration/fixtures/https/rootcas/https.toml b/integration/fixtures/https/rootcas/https.toml index 37349218c..c3e903387 100644 --- a/integration/fixtures/https/rootcas/https.toml +++ b/integration/fixtures/https/rootcas/https.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] # Use certificate in net/internal/testcert.go diff --git a/integration/fixtures/https/rootcas/https_with_file.toml b/integration/fixtures/https/rootcas/https_with_file.toml index b28c386e5..661e441a7 100644 --- a/integration/fixtures/https/rootcas/https_with_file.toml +++ b/integration/fixtures/https/rootcas/https_with_file.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] # Use certificate in net/internal/testcert.go diff --git a/integration/fixtures/k8s_crd.toml b/integration/fixtures/k8s_crd.toml index 6d3473478..787403409 100644 --- a/integration/fixtures/k8s_crd.toml +++ b/integration/fixtures/k8s_crd.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/k8s_default.toml b/integration/fixtures/k8s_default.toml index c004d1603..11a131af1 100644 --- a/integration/fixtures/k8s_default.toml +++ b/integration/fixtures/k8s_default.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/log_rotation_config.toml b/integration/fixtures/log_rotation_config.toml index 12acdac0a..95dee4997 100644 --- a/integration/fixtures/log_rotation_config.toml +++ b/integration/fixtures/log_rotation_config.toml @@ -4,7 +4,7 @@ sendAnonymousUsage = false [log] filePath = "traefik.log" -logLevel = "ERROR" +level = "ERROR" [accessLog] filePath = "access.log" diff --git a/integration/fixtures/marathon/simple.toml b/integration/fixtures/marathon/simple.toml index 600794d30..01a77d3b1 100644 --- a/integration/fixtures/marathon/simple.toml +++ b/integration/fixtures/marathon/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/multiple_provider.toml b/integration/fixtures/multiple_provider.toml index afebad773..d0bb8f653 100644 --- a/integration/fixtures/multiple_provider.toml +++ b/integration/fixtures/multiple_provider.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/multiprovider.toml b/integration/fixtures/multiprovider.toml index 6211a9c92..cc03d5d1f 100644 --- a/integration/fixtures/multiprovider.toml +++ b/integration/fixtures/multiprovider.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [api] diff --git a/integration/fixtures/proxy-protocol/with.toml b/integration/fixtures/proxy-protocol/with.toml index 9b3e00936..1d75abb4d 100644 --- a/integration/fixtures/proxy-protocol/with.toml +++ b/integration/fixtures/proxy-protocol/with.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/proxy-protocol/without.toml b/integration/fixtures/proxy-protocol/without.toml index 95cc33669..3baeae411 100644 --- a/integration/fixtures/proxy-protocol/without.toml +++ b/integration/fixtures/proxy-protocol/without.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/ratelimit/simple.toml b/integration/fixtures/ratelimit/simple.toml index 6d9f82f90..12f588d29 100644 --- a/integration/fixtures/ratelimit/simple.toml +++ b/integration/fixtures/ratelimit/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/reqacceptgrace.toml b/integration/fixtures/reqacceptgrace.toml index 1894018fc..260760b8e 100644 --- a/integration/fixtures/reqacceptgrace.toml +++ b/integration/fixtures/reqacceptgrace.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/rest/simple.toml b/integration/fixtures/rest/simple.toml index 9ab8f2572..0d3dbafcd 100644 --- a/integration/fixtures/rest/simple.toml +++ b/integration/fixtures/rest/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/retry/simple.toml b/integration/fixtures/retry/simple.toml index 180221858..ad94b47d1 100644 --- a/integration/fixtures/retry/simple.toml +++ b/integration/fixtures/retry/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/simple_auth.toml b/integration/fixtures/simple_auth.toml index 96fb3109b..b8beb0994 100644 --- a/integration/fixtures/simple_auth.toml +++ b/integration/fixtures/simple_auth.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/simple_hostresolver.toml b/integration/fixtures/simple_hostresolver.toml index 1e9c582df..859edf47b 100644 --- a/integration/fixtures/simple_hostresolver.toml +++ b/integration/fixtures/simple_hostresolver.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/simple_stats.toml b/integration/fixtures/simple_stats.toml index 1cc33c3ef..808a2635d 100644 --- a/integration/fixtures/simple_stats.toml +++ b/integration/fixtures/simple_stats.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/simple_web.toml b/integration/fixtures/simple_web.toml index 59f1d92c8..de39fbbdf 100644 --- a/integration/fixtures/simple_web.toml +++ b/integration/fixtures/simple_web.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/simple_whitelist.toml b/integration/fixtures/simple_whitelist.toml index b328109e9..272e634a2 100644 --- a/integration/fixtures/simple_whitelist.toml +++ b/integration/fixtures/simple_whitelist.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/tcp/mixed.toml b/integration/fixtures/tcp/mixed.toml index 5b0a8352e..3116d7df9 100644 --- a/integration/fixtures/tcp/mixed.toml +++ b/integration/fixtures/tcp/mixed.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.tcp] diff --git a/integration/fixtures/tcp/non-tls-fallback.toml b/integration/fixtures/tcp/non-tls-fallback.toml index ab73ddf30..99f2c51b8 100644 --- a/integration/fixtures/tcp/non-tls-fallback.toml +++ b/integration/fixtures/tcp/non-tls-fallback.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.tcp] diff --git a/integration/fixtures/tcp/non-tls.toml b/integration/fixtures/tcp/non-tls.toml index 0c847777f..4cf36eade 100644 --- a/integration/fixtures/tcp/non-tls.toml +++ b/integration/fixtures/tcp/non-tls.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.tcp] diff --git a/integration/fixtures/timeout/forwarding_timeouts.toml b/integration/fixtures/timeout/forwarding_timeouts.toml index 935d4a0f4..4ceceb446 100644 --- a/integration/fixtures/timeout/forwarding_timeouts.toml +++ b/integration/fixtures/timeout/forwarding_timeouts.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport.forwardingTimeouts] dialTimeout = "300ms" diff --git a/integration/fixtures/tlsclientheaders/simple.toml b/integration/fixtures/tlsclientheaders/simple.toml index 4595942d6..609c4ef5f 100644 --- a/integration/fixtures/tlsclientheaders/simple.toml +++ b/integration/fixtures/tlsclientheaders/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] rootCAs = [ """{{ .RootCertContent }}""" ] diff --git a/integration/fixtures/tracing/simple.toml b/integration/fixtures/tracing/simple.toml index 7fa4be0f7..955f1eebc 100644 --- a/integration/fixtures/tracing/simple.toml +++ b/integration/fixtures/tracing/simple.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [api] diff --git a/integration/fixtures/traefik_log_config.toml b/integration/fixtures/traefik_log_config.toml index 3135807ee..d5bcf259b 100644 --- a/integration/fixtures/traefik_log_config.toml +++ b/integration/fixtures/traefik_log_config.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" filePath = "traefik.log" [accessLog] diff --git a/integration/fixtures/websocket/config.toml b/integration/fixtures/websocket/config.toml index 88659b149..fd7f3f9e1 100644 --- a/integration/fixtures/websocket/config.toml +++ b/integration/fixtures/websocket/config.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [entryPoints] [entryPoints.web] diff --git a/integration/fixtures/websocket/config_https.toml b/integration/fixtures/websocket/config_https.toml index 0da7ba507..76de69636 100644 --- a/integration/fixtures/websocket/config_https.toml +++ b/integration/fixtures/websocket/config_https.toml @@ -3,7 +3,7 @@ checkNewVersion = false sendAnonymousUsage = false [log] -logLevel = "DEBUG" +level = "DEBUG" [serversTransport] insecureSkipVerify=true diff --git a/pkg/anonymize/anonymize_config_test.go b/pkg/anonymize/anonymize_config_test.go index 1d0f132aa..0108bdb69 100644 --- a/pkg/anonymize/anonymize_config_test.go +++ b/pkg/anonymize/anonymize_config_test.go @@ -58,7 +58,7 @@ func TestDo_globalConfiguration(t *testing.T) { } config.Log = &types.TraefikLog{ - LogLevel: "LogLevel", + Level: "Level", FilePath: "/foo/path", Format: "json", } diff --git a/pkg/anonymize/anonymize_doOnJSON_test.go b/pkg/anonymize/anonymize_doOnJSON_test.go index a85de48cf..dc8da18dd 100644 --- a/pkg/anonymize/anonymize_doOnJSON_test.go +++ b/pkg/anonymize/anonymize_doOnJSON_test.go @@ -14,7 +14,7 @@ func Test_doOnJSON(t *testing.T) { "CheckNewVersion": true, "AccessLogsFile": "", "TraefikLogsFile": "", - "LogLevel": "ERROR", + "Level": "ERROR", "EntryPoints": { "http": { "Network": "", @@ -97,7 +97,7 @@ func Test_doOnJSON(t *testing.T) { "CheckNewVersion": true, "AccessLogsFile": "", "TraefikLogsFile": "", - "LogLevel": "ERROR", + "Level": "ERROR", "EntryPoints": { "http": { "Network": "", diff --git a/pkg/types/logs.go b/pkg/types/logs.go index d43f2ea4c..b0e32d90a 100644 --- a/pkg/types/logs.go +++ b/pkg/types/logs.go @@ -18,7 +18,7 @@ const ( // TraefikLog holds the configuration settings for the traefik logger. type TraefikLog struct { - LogLevel string `description:"Log level set to traefik logs." export:"true"` + Level string `description:"Log level set to traefik logs." export:"true"` FilePath string `json:"file,omitempty" description:"Traefik log file path. Stdout is used when omitted or empty"` Format string `json:"format,omitempty" description:"Traefik log format: json | common"` } diff --git a/traefik.sample.toml b/traefik.sample.toml index 7b13a3f88..1bff7753d 100644 --- a/traefik.sample.toml +++ b/traefik.sample.toml @@ -40,7 +40,7 @@ # Optional # Default: "ERROR" # -# logLevel = "DEBUG" +# level = "DEBUG" # Sets the filepath for the traefik log. If not specified, stdout will be used. # Intermediate directories are created if necessary.