Merge branch 'main' into release

particuleio · Jul 16, 2024 · 4a434ed · 4a434ed
2 parents 4bacd30 + 15d6f39
commit 4a434ed
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/helm-dependencies.yaml b/helm-dependencies.yaml
@@ -75,7 +75,7 @@ dependencies:
     version: 6.6.6
     repository: https://grafana.github.io/helm-charts
   - name: promtail
-    version: 6.16.3
+    version: 6.16.4
     repository: https://grafana.github.io/helm-charts
   - name: metrics-server
     version: 3.12.1

diff --git a/modules/aws/loki-stack.tf b/modules/aws/loki-stack.tf
@@ -39,8 +39,6 @@ locals {
       enabled: true
     loki:
       auth_enabled: false
-      compactor:
-        shared_store: aws
       storage:
         bucketNames:
           chunks: "${local.loki-stack["bucket"]}"

diff --git a/modules/scaleway/loki-stack.tf b/modules/scaleway/loki-stack.tf
@@ -31,8 +31,6 @@ locals {
       enabled: true
     loki:
       auth_enabled: false
-      compactor:
-        shared_store: aws
       storage:
         bucketNames:
           chunks: "${local.loki-stack["bucket"]}"