feat(loki-stack)!: deprecate and remove the loki-stack chart

README.adoc

@@ -62,7 +62,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v4.0.1"`
+Default: `"v4.0.2"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -112,14 +112,6 @@ Type: `map(string)`
 
 Default: `{}`
 
-==== [[input_distributed_mode]] <<input_distributed_mode,distributed_mode>>
-
-Description: Boolean to activate Loki in distributed mode.
-
-Type: `bool`
-
-Default: `false`
-
 ==== [[input_ingress]] <<input_ingress,ingress>>
 
 Description: Loki frontend ingress configuration.
@@ -146,7 +138,7 @@ Default: `false`
 
 ==== [[input_retention]] <<input_retention,retention>>
 
-Description: Logs retention period.To deactivate retention, pass 0s.
+Description: Logs retention period. To deactivate retention, pass 0s.
 
 Type: `string`
 
@@ -217,7 +209,7 @@ Description: Credentials to access the Loki ingress, if activated.
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v4.0.1"`
+|`"v4.0.2"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -264,12 +256,6 @@ object({
 |`{}`
 |no
 
-|[[input_distributed_mode]] <<input_distributed_mode,distributed_mode>>
-|Boolean to activate Loki in distributed mode.
-|`bool`
-|`false`
-|no
-
 |[[input_ingress]] <<input_ingress,ingress>>
 |Loki frontend ingress configuration.
 |
@@ -293,7 +279,7 @@ object({
 |no
 
 |[[input_retention]] <<input_retention,retention>>
-|Logs retention period.To deactivate retention, pass 0s.
+|Logs retention period. To deactivate retention, pass 0s.
 |`string`
 |`"30d"`
 |no

aks/README.adoc

@@ -77,7 +77,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v4.0.1"`
+Default: `"v4.0.2"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -127,14 +127,6 @@ Type: `map(string)`
 
 Default: `{}`
 
-==== [[input_distributed_mode]] <<input_distributed_mode,distributed_mode>>
-
-Description: Boolean to activate Loki in distributed mode.
-
-Type: `bool`
-
-Default: `false`
-
 ==== [[input_ingress]] <<input_ingress,ingress>>
 
 Description: Loki frontend ingress configuration.
@@ -161,7 +153,7 @@ Default: `false`
 
 ==== [[input_retention]] <<input_retention,retention>>
 
-Description: Logs retention period.To deactivate retention, pass 0s.
+Description: Logs retention period. To deactivate retention, pass 0s.
 
 Type: `string`
 
@@ -252,7 +244,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v4.0.1"`
+|`"v4.0.2"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -299,12 +291,6 @@ object({
 |`{}`
 |no
 
-|[[input_distributed_mode]] <<input_distributed_mode,distributed_mode>>
-|Boolean to activate Loki in distributed mode.
-|`bool`
-|`false`
-|no
-
 |[[input_ingress]] <<input_ingress,ingress>>
 |Loki frontend ingress configuration.
 |
@@ -328,7 +314,7 @@ object({
 |no
 
 |[[input_retention]] <<input_retention,retention>>
-|Logs retention period.To deactivate retention, pass 0s.
+|Logs retention period. To deactivate retention, pass 0s.
 |`string`
 |`"30d"`
 |no

aks/locals.tf

@@ -1,7 +1,7 @@
 locals {
   use_managed_identity = var.logs_storage.managed_identity_node_rg_name != null
 
-  helm_values = [var.distributed_mode ? {
+  helm_values = [{
     loki-distributed = merge(local.use_managed_identity ? {
       serviceAccount = {
         annotations = {
@@ -19,8 +19,40 @@ locals {
           "azure.workload.identity/use" = "true"
         }
         } : null, {
-        schemaConfig  = local.schema_config
-        storageConfig = local.storage_config
+        schemaConfig = {
+          configs = [
+            {
+              from         = "2020-12-22"
+              store        = "boltdb-shipper"
+              object_store = "azure"
+              schema       = "v11"
+              index = {
+                prefix = "index_"
+                period = "24h"
+              }
+            }
+          ]
+
+        }
+        storageConfig = {
+          azure = merge(local.use_managed_identity ? null : {
+            account_key = var.logs_storage.storage_account_key
+            }, local.use_managed_identity ? {
+            use_federated_token = true
+            } : null,
+            {
+              container_name  = var.logs_storage.container
+              account_name    = var.logs_storage.storage_account
+              request_timeout = "180s"
+              max_retries     = 50
+              min_retry_delay = "1s"
+              max_retry_delay = "5s"
+          })
+          boltdb_shipper = {
+            shared_store = "azure"
+          }
+
+        }
         structuredConfig = {
           compactor = {
             shared_store      = "azure"
@@ -29,63 +61,5 @@ locals {
         }
       })
     })
-    } : null, var.distributed_mode ? null : {
-    loki-stack = {
-      loki = merge(local.use_managed_identity ? {
-        # Current chart version uses loki 2.6.1.
-        # TODO remove once chart uses a version >= 2.8.
-        image = {
-          tag = "2.8.0"
-        }
-        serviceAccount = {
-          annotations = {
-            "azure.workload.identity/client-id" = azurerm_user_assigned_identity.loki[0].client_id
-          }
-        }
-        podLabels = {
-          "azure.workload.identity/use" = "true"
-        }
-        } : null, {
-        config = {
-          schema_config  = local.schema_config
-          storage_config = local.storage_config
-        }
-      })
-    }
-    }
-  ]
-
-  schema_config = {
-    configs = [
-      {
-        from         = "2020-12-22"
-        store        = "boltdb-shipper"
-        object_store = "azure"
-        schema       = "v11"
-        index = {
-          prefix = "index_"
-          period = "24h"
-        }
-      }
-    ]
-  }
-
-  storage_config = {
-    azure = merge(local.use_managed_identity ? null : {
-      account_key = var.logs_storage.storage_account_key
-      }, local.use_managed_identity ? {
-      use_federated_token = true
-      } : null,
-      {
-        container_name  = var.logs_storage.container
-        account_name    = var.logs_storage.storage_account
-        request_timeout = "180s"
-        max_retries     = 50
-        min_retry_delay = "1s"
-        max_retry_delay = "5s"
-    })
-    boltdb_shipper = {
-      shared_store = "azure"
-    }
-  }
+  }]
 }

aks/main.tf

@@ -47,10 +47,9 @@ module "loki-stack" {
   app_autosync     = var.app_autosync
   dependency_ids   = var.dependency_ids
 
-  retention        = var.retention
-  distributed_mode = var.distributed_mode
-  ingress          = var.ingress
-  enable_filebeat  = var.enable_filebeat
+  retention       = var.retention
+  ingress         = var.ingress
+  enable_filebeat = var.enable_filebeat
 
   helm_values = concat(local.helm_values, var.helm_values)
 }