From 6d09865911d6cfbb1840ff3a6c33e52bed3d97d1 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Wed, 20 Nov 2019 09:10:00 -0500 Subject: [PATCH] docs: update limits_config to new structure from #948 (#1278) Co-Authored-By: Sandeep Sukhani --- docs/configuration/README.md | 48 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/configuration/README.md b/docs/configuration/README.md index 3e8f5aed5d4f4..3ce31f652d94b 100644 --- a/docs/configuration/README.md +++ b/docs/configuration/README.md @@ -8,6 +8,7 @@ Configuration examples can be found in the [Configuration Examples](examples.md) * [Configuration File Reference](#configuration-file-reference) * [server_config](#server_config) +* [distributor_config](#distributor_config) * [querier_config](#querier_config) * [ingester_client_config](#ingester_client_config) * [grpc_client_config](#grpc_client_config) @@ -58,6 +59,9 @@ Supported contents and default values of `loki.yaml`: # Configures the server of the launched module(s). [server: ] +# Configures the distributor. +[distributor: ] + # Configures the querier. Only appropriate when running all modules or # just the querier. [querier: ] @@ -135,6 +139,15 @@ The `server_config` block configures Promtail's behavior as an HTTP server: [http_path_prefix: ] ``` +## distributor_config + +The `distributor_config` block configures the Loki Distributor. + +```yaml +# Period at which to reload user ingestion limits. +[limiter_reload_period: | default = 5m] +``` + ## querier_config The `querier_config` block configures the Loki Querier. @@ -663,23 +676,13 @@ The `limits_config` block configures global and per-tenant limits for ingesting logs in Loki. ```yaml -# Per-user ingestion rate limit in samples per second. -[ingestion_rate: | default = 25000] +# Per-user ingestion rate limit in sample size per second. Units in MB. +[ingestion_rate_mb: | default = 4] -# Per-user allowed ingestion burst size (in number of samples). -[ingestion_burst_size: | default = 50000] - -# Whether or not, for all users, samples with external labels -# identifying replicas in an HA Prometheus setup will be handled. -[accept_ha_samples: | default = false] - -# Prometheus label to look for in samples to identify a -# Prometheus HA cluster. -[ha_cluster_label: | default = "cluster"] - -# Prometheus label to look for in samples to identify a Prometheus HA -# replica. -[ha_replica_label: | default = "__replica__"] +# Per-user allowed ingestion burst size (in sample size). Units in MB. Warning, +# very high limits will be reset every limiter_reload_period defined in +# distributor_config. +[ingestion_burst_size_mb: | default = 6] # Maximum length of a label name. [max_label_name_length: | default = 1024] @@ -703,14 +706,8 @@ logs in Loki. # Enforce every sample has a metric name. [enforce_metric_name: | default = true] -# Maximum number of samples that a query can return. -[max_samples_per_query: | default = 1000000] - -# Maximum number of active series per user. -[max_series_per_user: | default = 5000000] - -# Maximum number of active series per metric name. -[max_series_per_metric: | default = 50000] +# Maximum number of active streams per user. +[max_streams_per_user: | default = 10e3] # Maximum number of chunks that can be fetched by a single query. [max_chunks_per_query: | default = 2000000] @@ -725,6 +722,9 @@ logs in Loki. # Cardinality limit for index queries [cardinality_limit: | default = 100000] +# Maximum number of stream matchers per query. +[max_streams_matchers_per_query: | default = 1000] + # Filename of per-user overrides file [per_tenant_override_config: ]