diff --git a/.goreleaser.yml b/.goreleaser.yml index 95086aeb3..a2fbee302 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -34,8 +34,10 @@ builds: goarch: 386 - goos: openbsd goarch: arm + - goos: openbsd + goarch: arm64 - goos: freebsd - goarch: arm + goarch: arm64 changelog: skip: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 727aad05c..6f71bbdda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +## [v2.1.7](https://github.com/containous/traefik/tree/v2.1.7) (2020-03-18) +[All Commits](https://github.com/containous/traefik/compare/v2.1.6...v2.1.7) + +**Bug fixes:** +- **[logs,middleware]** Access log field quotes. ([#6484](https://github.com/containous/traefik/pull/6484) by [ldez](https://github.com/ldez)) +- **[metrics]** fix statsd scale for duration based metrics ([#6054](https://github.com/containous/traefik/pull/6054) by [ddtmachado](https://github.com/ddtmachado)) +- **[middleware]** Added support for replacement containing escaped characters ([#6413](https://github.com/containous/traefik/pull/6413) by [rtribotte](https://github.com/rtribotte)) + +**Documentation:** +- **[acme,docker]** Add some missing doc. ([#6422](https://github.com/containous/traefik/pull/6422) by [ldez](https://github.com/ldez)) +- **[acme]** Added wildcard ACME example ([#6423](https://github.com/containous/traefik/pull/6423) by [Basster](https://github.com/Basster)) +- **[acme]** fix typo ([#6408](https://github.com/containous/traefik/pull/6408) by [hamiltont](https://github.com/hamiltont)) + ## [v2.2.0-rc2](https://github.com/containous/traefik/tree/v2.2.0-rc2) (2020-03-11) [All Commits](https://github.com/containous/traefik/compare/v2.2.0-rc1...v2.2.0-rc2) diff --git a/docs/content/observability/access-logs.md b/docs/content/observability/access-logs.md index bbcbd62b1..c09a8ebf4 100644 --- a/docs/content/observability/access-logs.md +++ b/docs/content/observability/access-logs.md @@ -35,7 +35,7 @@ If the given format is unsupported, the default (CLF) is used instead. !!! info "Common Log Format" ```html - - [] " " "" "" "" "" ms + - [] " " "" "" "" "" ms ``` ### `bufferingSize` diff --git a/docs/content/reference/static-configuration/cli-ref.md b/docs/content/reference/static-configuration/cli-ref.md index 5df9e764d..4d63cc971 100644 --- a/docs/content/reference/static-configuration/cli-ref.md +++ b/docs/content/reference/static-configuration/cli-ref.md @@ -105,6 +105,12 @@ HTTP configuration. `--entrypoints..http.middlewares`: Default middlewares for the routers linked to the entry point. +`--entrypoints..http.redirections.entrypoint.permanent`: +Applied a permanent redirection. Defaults to true. (Default: ```true```) + +`--entrypoints..http.redirections.entrypoint.priority`: +Priority of the generated router. Defaults to 1. (Default: ```1```) + `--entrypoints..http.redirections.entrypoint.scheme`: Scheme used for the redirection. Defaults to https. (Default: ```https```) diff --git a/docs/content/reference/static-configuration/env-ref.md b/docs/content/reference/static-configuration/env-ref.md index 664326ff5..6800f51f9 100644 --- a/docs/content/reference/static-configuration/env-ref.md +++ b/docs/content/reference/static-configuration/env-ref.md @@ -105,6 +105,12 @@ HTTP configuration. `TRAEFIK_ENTRYPOINTS__HTTP_MIDDLEWARES`: Default middlewares for the routers linked to the entry point. +`TRAEFIK_ENTRYPOINTS__HTTP_REDIRECTIONS_ENTRYPOINT_PERMANENT`: +Applied a permanent redirection. Defaults to true. (Default: ```true```) + +`TRAEFIK_ENTRYPOINTS__HTTP_REDIRECTIONS_ENTRYPOINT_PRIORITY`: +Priority of the generated router. Defaults to 1. (Default: ```1```) + `TRAEFIK_ENTRYPOINTS__HTTP_REDIRECTIONS_ENTRYPOINT_SCHEME`: Scheme used for the redirection. Defaults to https. (Default: ```https```) diff --git a/docs/content/reference/static-configuration/file.toml b/docs/content/reference/static-configuration/file.toml index 43ef4f20d..fce1dc4d3 100644 --- a/docs/content/reference/static-configuration/file.toml +++ b/docs/content/reference/static-configuration/file.toml @@ -34,6 +34,8 @@ [entryPoints.EntryPoint0.http.redirections.entryPoint] to = "foobar" scheme = "foobar" + permanent = true + priority = 42 [entryPoints.EntryPoint0.http.tls] options = "foobar" certResolver = "foobar" diff --git a/docs/content/reference/static-configuration/file.yaml b/docs/content/reference/static-configuration/file.yaml index 2dcdb8ce5..a8ab3acda 100644 --- a/docs/content/reference/static-configuration/file.yaml +++ b/docs/content/reference/static-configuration/file.yaml @@ -37,6 +37,8 @@ entryPoints: entryPoint: to: foobar scheme: foobar + permanent: true + priority: 42 middlewares: - foobar - foobar diff --git a/pkg/middlewares/accesslog/logger_formatters.go b/pkg/middlewares/accesslog/logger_formatters.go index 5abb996d7..4c559a648 100644 --- a/pkg/middlewares/accesslog/logger_formatters.go +++ b/pkg/middlewares/accesslog/logger_formatters.go @@ -45,8 +45,8 @@ func (f *CommonLogFormatter) Format(entry *logrus.Entry) ([]byte, error) { toLog(entry.Data, "request_Referer", `"-"`, true), toLog(entry.Data, "request_User-Agent", `"-"`, true), toLog(entry.Data, RequestCount, defaultValue, true), - toLog(entry.Data, RouterName, defaultValue, true), - toLog(entry.Data, ServiceURL, defaultValue, true), + toLog(entry.Data, RouterName, `"-"`, true), + toLog(entry.Data, ServiceURL, `"-"`, true), elapsedMillis) return b.Bytes(), err diff --git a/pkg/middlewares/accesslog/logger_formatters_test.go b/pkg/middlewares/accesslog/logger_formatters_test.go index ce3c6aec5..79b2273f1 100644 --- a/pkg/middlewares/accesslog/logger_formatters_test.go +++ b/pkg/middlewares/accesslog/logger_formatters_test.go @@ -36,7 +36,7 @@ func TestCommonLogFormatter_Format(t *testing.T) { RouterName: "", ServiceURL: "", }, - expectedLog: `10.0.0.1 - Client [10/Nov/2009:23:00:00 +0000] "GET /foo http" - - "-" "-" 0 - - 123000ms + expectedLog: `10.0.0.1 - Client [10/Nov/2009:23:00:00 +0000] "GET /foo http" - - "-" "-" 0 "-" "-" 123000ms `, }, { diff --git a/pkg/middlewares/accesslog/logger_test.go b/pkg/middlewares/accesslog/logger_test.go index 53f082f1f..6d1567db0 100644 --- a/pkg/middlewares/accesslog/logger_test.go +++ b/pkg/middlewares/accesslog/logger_test.go @@ -497,7 +497,7 @@ func TestNewLogHandlerOutputStdout(t *testing.T) { DefaultMode: "drop", }, }, - expectedLog: `- - - [-] "- - -" - - "testReferer" "testUserAgent" - - - 0ms`, + expectedLog: `- - - [-] "- - -" - - "testReferer" "testUserAgent" - "-" "-" 0ms`, }, { desc: "Default mode drop with override", @@ -512,7 +512,7 @@ func TestNewLogHandlerOutputStdout(t *testing.T) { }, }, }, - expectedLog: `- - TestUser [-] "- - -" - - "testReferer" "testUserAgent" - - - 0ms`, + expectedLog: `- - TestUser [-] "- - -" - - "testReferer" "testUserAgent" - "-" "-" 0ms`, }, { desc: "Default mode drop with header dropped", @@ -530,7 +530,7 @@ func TestNewLogHandlerOutputStdout(t *testing.T) { }, }, }, - expectedLog: `- - TestUser [-] "- - -" - - "-" "-" - - - 0ms`, + expectedLog: `- - TestUser [-] "- - -" - - "-" "-" - "-" "-" 0ms`, }, { desc: "Default mode drop with header redacted", @@ -548,7 +548,7 @@ func TestNewLogHandlerOutputStdout(t *testing.T) { }, }, }, - expectedLog: `- - TestUser [-] "- - -" - - "REDACTED" "REDACTED" - - - 0ms`, + expectedLog: `- - TestUser [-] "- - -" - - "REDACTED" "REDACTED" - "-" "-" 0ms`, }, { desc: "Default mode drop with header redacted", @@ -569,7 +569,7 @@ func TestNewLogHandlerOutputStdout(t *testing.T) { }, }, }, - expectedLog: `- - TestUser [-] "- - -" - - "REDACTED" "testUserAgent" - - - 0ms`, + expectedLog: `- - TestUser [-] "- - -" - - "REDACTED" "testUserAgent" - "-" "-" 0ms`, }, }