feat: configure ingester replication factor (#59)

* feat: configure ingester replication factor * docs(terraform-docs): generate docs and write to README.adoc * fix: terraform format correction * fix: correct syntax * docs(terraform-docs): generate docs and write to README.adoc --------- Co-authored-by: omohammed95 <omohammed95@users.noreply.github.com>
camptocamp · May 24, 2023 · 8d00917 · 8d00917
1 parent dc3f025
commit 8d00917
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 209 deletions.
diff --git a/README.adoc b/README.adoc
@@ -17,8 +17,6 @@ The following requirements are needed by this module:
 
 The following providers are used by this module:
 
-- [[provider_null]] <<provider_null,null>> (>= 3)
-
 - [[provider_random]] <<provider_random,random>> (>= 3)
 
 - [[provider_htpasswd]] <<provider_htpasswd,htpasswd>> (>= 1)
@@ -27,6 +25,8 @@ The following providers are used by this module:
 
 - [[provider_argocd]] <<provider_argocd,argocd>> (>= 4)
 
+- [[provider_null]] <<provider_null,null>> (>= 3)
+
 === Resources
 
 The following resources are used by this module:
@@ -73,7 +73,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v2.0.2"`
+Default: `"v2.1.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -155,28 +155,6 @@ Type: `bool`
 
 Default: `false`
 
-==== [[input_ingester_config]] <<input_ingester_config,ingester_config>>
-
-Description: Configuration of ingester to have more replicas
-
-Type:
-[source,hcl]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-Default:
-[source,json]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
 === Outputs
 
 The following outputs are exported:
@@ -254,7 +232,7 @@ Description: n/a
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v2.0.2"`
+|`"v2.1.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -329,30 +307,6 @@ object({
 |`false`
 |no
 
-|[[input_ingester_config]] <<input_ingester_config,ingester_config>>
-|Configuration of ingester to have more replicas
-|
-
-[source]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-|
-
-[source]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
-|no
-
 |===
 
 = Outputs

diff --git a/aks/README.adoc b/aks/README.adoc
@@ -93,7 +93,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v2.0.2"`
+Default: `"v2.1.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -175,28 +175,6 @@ Type: `bool`
 
 Default: `false`
 
-==== [[input_ingester_config]] <<input_ingester_config,ingester_config>>
-
-Description: Configuration of ingester to have more replicas
-
-Type:
-[source,hcl]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-Default:
-[source,json]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
 === Outputs
 
 The following outputs are exported:
@@ -294,7 +272,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v2.0.2"`
+|`"v2.1.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -369,30 +347,6 @@ object({
 |`false`
 |no
 
-|[[input_ingester_config]] <<input_ingester_config,ingester_config>>
-|Configuration of ingester to have more replicas
-|
-
-[source]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-|
-
-[source]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
-|no
-
 |===
 
 = Outputs

diff --git a/eks/README.adoc b/eks/README.adoc
@@ -75,7 +75,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v2.0.2"`
+Default: `"v2.1.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -157,28 +157,6 @@ Type: `bool`
 
 Default: `false`
 
-==== [[input_ingester_config]] <<input_ingester_config,ingester_config>>
-
-Description: Configuration of ingester to have more replicas
-
-Type:
-[source,hcl]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-Default:
-[source,json]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
 === Outputs
 
 The following outputs are exported:
@@ -254,7 +232,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v2.0.2"`
+|`"v2.1.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -329,30 +307,6 @@ object({
 |`false`
 |no
 
-|[[input_ingester_config]] <<input_ingester_config,ingester_config>>
-|Configuration of ingester to have more replicas
-|
-
-[source]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-|
-
-[source]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
-|no
-
 |===
 
 = Outputs

diff --git a/kind/README.adoc b/kind/README.adoc
@@ -76,7 +76,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v2.0.2"`
+Default: `"v2.1.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -158,28 +158,6 @@ Type: `bool`
 
 Default: `false`
 
-==== [[input_ingester_config]] <<input_ingester_config,ingester_config>>
-
-Description: Configuration of ingester to have more replicas
-
-Type:
-[source,hcl]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-Default:
-[source,json]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
 === Outputs
 
 The following outputs are exported:
@@ -256,7 +234,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v2.0.2"`
+|`"v2.1.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -331,30 +309,6 @@ object({
 |`false`
 |no
 
-|[[input_ingester_config]] <<input_ingester_config,ingester_config>>
-|Configuration of ingester to have more replicas
-|
-
-[source]
-----
-object({
-    replicas       = number
-    maxUnavailable = number
-  })
-----
-
-|
-
-[source]
-----
-{
-  "maxUnavailable": null,
-  "replicas": 1
-}
-----
-
-|no
-
 |===
 
 = Outputs

diff --git a/locals.tf b/locals.tf
@@ -43,8 +43,9 @@ locals {
           persistence = {
             enabled = true
           }
-          replicas       = "${var.ingester_config.replicas}"
-          maxUnavailable = "${var.ingester_config.maxUnavailable}"
+          replicas       = 3
+          maxUnavailable = 1
+          affinity       = ""
         }
         loki = {
           structuredConfig = {
@@ -70,6 +71,11 @@ locals {
               retention_enabled      = false
             }
             ingester = {
+              lifecycler = {
+                ring = {
+                  replication_factor = 3
+                }
+              }
               wal = {
                 replay_memory_ceiling = "500MB"
                 flush_on_shutdown     = true

diff --git a/variables.tf b/variables.tf
@@ -83,16 +83,3 @@ variable "enable_filebeat" {
   type    = bool
   default = false
 }
-
-variable "ingester_config" {
-  description = "Configuration of ingester to have more replicas"
-  type = object({
-    replicas       = number
-    maxUnavailable = number
-  })
-  default = {
-    replicas       = 1
-    maxUnavailable = null
-  }
-}
-