diff --git a/docs/content/observability/access-logs.md b/docs/content/observability/access-logs.md index 00a29cf79..0effd5d1b 100644 --- a/docs/content/observability/access-logs.md +++ b/docs/content/observability/access-logs.md @@ -152,15 +152,14 @@ accessLog: format: json fields: defaultMode: keep - fields: + names: + ClientUsername: drop + headers: + defaultMode: keep names: - ClientUsername: drop - headers: - defaultMode: keep - names: - - User-Agent: redact - - Authorization: drop - - Content-Type: keep + - User-Agent: redact + - Authorization: drop + - Content-Type: keep ``` ```bash tab="CLI" diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index f0a030073..5e45f6cf4 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -77,6 +77,7 @@ Attach labels to your containers and let Traefik do the rest! deploy: labels: - traefik.http.routers.my-container.rule=Host(`my-domain`) + - traefik.http.services.my-container-service.loadbalancer.server.port=8080 ``` !!! important "Labels in Docker Swarm Mode" diff --git a/docs/content/providers/marathon.md b/docs/content/providers/marathon.md index e19e9877c..762b7a0f7 100644 --- a/docs/content/providers/marathon.md +++ b/docs/content/providers/marathon.md @@ -243,7 +243,7 @@ That is to say, if none of the application's labels match the expression, no rou In addition, the expression also matched against the application's constraints, such as described in [Marathon constraints](https://mesosphere.github.io/marathon/docs/constraints.html). If the expression is empty, all detected applications are included. -The expression syntax is based on the `Label("key", "value")`, and `LabelRegexp("key", "value")`, as well as the usual boolean logic. +The expression syntax is based on the `Label("key", "value")`, and `LabelRegex("key", "value")`, as well as the usual boolean logic. In addition, to match against marathon constraints, the function `MarathonConstraint("field:operator:value")` can be used, where the field, operator, and value parts are joined together in a single string with the `:` separator. ??? example "Constraints Expression Examples" @@ -275,7 +275,7 @@ In addition, to match against marathon constraints, the function `MarathonConstr ```toml # Includes only applications having a label with key `a.label.name` and a value matching the `a.+` regular expression. - constraints = "LabelRegexp(`a.label.name`, `a.+`)" + constraints = "LabelRegex(`a.label.name`, `a.+`)" ``` ```toml diff --git a/docs/content/routing/routers/index.md b/docs/content/routing/routers/index.md index 642292d98..c9067a1af 100644 --- a/docs/content/routing/routers/index.md +++ b/docs/content/routing/routers/index.md @@ -631,7 +631,7 @@ Services are the target for the router. rule: "HostSNI(`foo-domain`)" service: service-id # will terminate the TLS request by default - tld: {} + tls: {} ``` ??? example "Configuring passthrough"