From bdacf39013186817f305d30db309e49fcdbb4f6e Mon Sep 17 00:00:00 2001
From: Sverre Boschman <sverre.boschman@topicus.nl>
Date: Mon, 1 Apr 2019 14:41:06 +0200
Subject: [PATCH] include all lifecycler ring config

---
 production/helm/loki/templates/_helpers.tpl |  3 +--
 production/helm/loki/values.yaml            | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
index 9187b96add24..22a3f2711c30 100644
--- a/production/helm/loki/templates/_helpers.tpl
+++ b/production/helm/loki/templates/_helpers.tpl
@@ -54,8 +54,7 @@ limits_config:
 ingester:
   lifecycler:
     ring:
-      store: {{ .Values.config.ingester.lifecycler.ring.store }}
-      replication_factor: {{ .Values.config.ingester.lifecycler.ring.replication_factor }}
+{{ toYaml .Values.config.ingester.lifecycler.ring | indent 6 }}    
   chunk_idle_period: 15m
 
 {{- if .Values.config.schema_configs }}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 801d4e9594cc..28b210f8f090 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -21,6 +21,16 @@ config:
       ring:
         store: inmemory
         replication_factor: 1
+
+      ## Different ring configs can be used. E.g. Consul
+      # ring:
+      #   store: consul
+      #   replication_factor: 1
+      #   consul:
+      #     host: "consul:8500"
+      #     prefix: ""
+      #     httpclienttimeout: "20s"
+      #     consistentreads: true
   schema_configs:
   - from: 0
     store: boltdb