From 23cd2d1cd541702dd8689da53cf771b0f3dcc4bb Mon Sep 17 00:00:00 2001 From: Kristian Klausen Date: Wed, 31 Mar 2021 04:52:56 +0200 Subject: [PATCH] Doc: Fix out-of-date defaults 0b1dbe26 ("Promtail: Add a stream lagging metric (#2618)") d3bf21e7 ("Promtail: (and also fluent-bit) change the max batch size to 1MB (#2710)") --- docs/sources/clients/aws/eks/values.yaml | 8 ++++---- docs/sources/clients/docker-driver/configuration.md | 6 +++--- docs/sources/clients/promtail/configuration.md | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/sources/clients/aws/eks/values.yaml b/docs/sources/clients/aws/eks/values.yaml index 966e67922075..927ac9857e98 100644 --- a/docs/sources/clients/aws/eks/values.yaml +++ b/docs/sources/clients/aws/eks/values.yaml @@ -160,18 +160,18 @@ config: # Maximum wait period before sending batch batchwait: 1s # Maximum batch size to accrue before sending, unit is byte - batchsize: 102400 + batchsize: 1048576 # Maximum time to wait for server to respond to a request timeout: 10s backoff_config: # Initial backoff time between retries - min_period: 100ms + min_period: 500ms # Maximum backoff time between retries - max_period: 5s + max_period: 5m # Maximum number of retries when sending batches, 0 means infinite retries - max_retries: 20 + max_retries: 10 # The labels to add to any time series or alerts when communicating with loki external_labels: {} diff --git a/docs/sources/clients/docker-driver/configuration.md b/docs/sources/clients/docker-driver/configuration.md index dbde7c5c94cb..fc8216b25731 100644 --- a/docs/sources/clients/docker-driver/configuration.md +++ b/docs/sources/clients/docker-driver/configuration.md @@ -198,9 +198,9 @@ To specify additional logging driver options, you can use the --log-opt NAME=VAL | `loki-external-labels` | No | `container_name={{.Name}}` | Additional label value pair separated by `,` to send with logs. The value is expanded with the [Docker tag template format](https://docs.docker.com/config/containers/logging/log_tags/). (eg: `container_name={{.ID}}.{{.Name}},cluster=prod`) | | `loki-timeout` | No | `10s` | The timeout to use when sending logs to the Loki instance. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". | | `loki-batch-wait` | No | `1s` | The amount of time to wait before sending a log batch complete or not. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". | -| `loki-batch-size` | No | `102400` | The maximum size of a log batch to send. | -| `loki-min-backoff` | No | `100ms` | The minimum amount of time to wait before retrying a batch. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". | -| `loki-max-backoff` | No | `10s` | The maximum amount of time to wait before retrying a batch. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". | +| `loki-batch-size` | No | `1048576` | The maximum size of a log batch to send. | +| `loki-min-backoff` | No | `500ms` | The minimum amount of time to wait before retrying a batch. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". | +| `loki-max-backoff` | No | `5m` | The maximum amount of time to wait before retrying a batch. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". | | `loki-retries` | No | `10` | The maximum amount of retries for a log batch. | | `loki-pipeline-stage-file` | No | | The location of a pipeline stage configuration file ([example](https://github.com/grafana/loki/blob/master/cmd/docker-driver/pipeline-example.yaml)). Pipeline stages allows to parse log lines to extract more labels, [see associated documentation](../promtail/pipelines.md). | | `loki-pipeline-stages` | No | | The pipeline stage configuration provided as a string [see pipeline stages](#pipeline-stages) and [associated documentation](../promtail/stages/). | diff --git a/docs/sources/clients/promtail/configuration.md b/docs/sources/clients/promtail/configuration.md index 35717f1e3a43..aa13d2b9af7f 100644 --- a/docs/sources/clients/promtail/configuration.md +++ b/docs/sources/clients/promtail/configuration.md @@ -221,7 +221,7 @@ url: # Maximum batch size (in bytes) of logs to accumulate before sending # the batch to Loki. -[batchsize: | default = 102400] +[batchsize: | default = 1048576] # If using basic auth, configures the username and password # sent.