From f468d5d258a42316036290fad1b795c40bec22e4 Mon Sep 17 00:00:00 2001
From: Robert Fratto <robert.fratto@grafana.com>
Date: Mon, 18 Nov 2019 10:10:35 -0500
Subject: [PATCH] docs: update limits_config to new structure from #948

---
 docs/configuration/README.md | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/docs/configuration/README.md b/docs/configuration/README.md
index 3e8f5aed5d4f4..e4ceaa0feb95e 100644
--- a/docs/configuration/README.md
+++ b/docs/configuration/README.md
@@ -663,23 +663,11 @@ 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: <float> | default = 25000]
+# Per-user ingestion rate limit in samples per second. Units in MB.
+[ingestion_rate_mb: <float> | default = 4]
 
-# Per-user allowed ingestion burst size (in number of samples).
-[ingestion_burst_size: <int> | 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: <boolean> | default = false]
-
-# Prometheus label to look for in samples to identify a
-# Prometheus HA cluster.
-[ha_cluster_label: <string> | default = "cluster"]
-
-# Prometheus label to look for in samples to identify a Prometheus HA
-# replica.
-[ha_replica_label: <string> | default = "__replica__"]
+# Per-user allowed ingestion burst size (in number of samples). Units in MB.
+[ingestion_burst_size_mb: <int> | default = 6]
 
 # Maximum length of a label name.
 [max_label_name_length: <int> | default = 1024]
@@ -703,14 +691,8 @@ logs in Loki.
 # Enforce every sample has a metric name.
 [enforce_metric_name: <boolean> | default = true]
 
-# Maximum number of samples that a query can return.
-[max_samples_per_query: <int> | default = 1000000]
-
-# Maximum number of active series per user.
-[max_series_per_user: <int> | default = 5000000]
-
-# Maximum number of active series per metric name.
-[max_series_per_metric: <int> | default = 50000]
+# Maximum number of active streams per user.
+[max_streams_per_user: <int> | default = 10e3]
 
 # Maximum number of chunks that can be fetched by a single query.
 [max_chunks_per_query: <int> | default = 2000000]
@@ -725,6 +707,9 @@ logs in Loki.
 # Cardinality limit for index queries
 [cardinality_limit: <int> | default = 100000]
 
+# Maximum number of stream matchers per query.
+[max_streams_matchers_per_query: <int> | default = 1000]
+
 # Filename of per-user overrides file
 [per_tenant_override_config: <string>]