From 72ee6c5e69c3f745fc9155ae564a3c81d4cf3133 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 16:51:36 -0500
Subject: [PATCH] fix(deps): update module
 github.com/aws/aws-sdk-go-v2/service/s3 to v1.68.0 (#15060)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paul Rogers <paul.rogers@grafana.com>
---
 nix/packages/loki.nix                                       | 2 +-
 .../helm/loki/templates/ingester/_helpers-ingester.tpl      | 6 +++---
 production/helm/loki/values.yaml                            | 6 ++++++
 tools/lambda-promtail/go.mod                                | 2 +-
 tools/lambda-promtail/go.sum                                | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nix/packages/loki.nix b/nix/packages/loki.nix
index 2893ac54de3f8..ee161437786e6 100644
--- a/nix/packages/loki.nix
+++ b/nix/packages/loki.nix
@@ -5,7 +5,7 @@ let
     pname = "lambda-promtail";
 
     src = ./../../tools/lambda-promtail;
-    vendorHash = "sha256-jMpd0Seu8zWj7uE7fxH2TDYuZwr+ESDf4H++5SNK1Xg=";
+    vendorHash = "sha256-6soQ9GaQSvxg3ivJHFZbqye7+TF8XLJuylOZz+Zjal0=";
 
     doCheck = false;
 
diff --git a/production/helm/loki/templates/ingester/_helpers-ingester.tpl b/production/helm/loki/templates/ingester/_helpers-ingester.tpl
index ba034c6bb013c..c4d38d5204e23 100644
--- a/production/helm/loki/templates/ingester/_helpers-ingester.tpl
+++ b/production/helm/loki/templates/ingester/_helpers-ingester.tpl
@@ -77,8 +77,8 @@ expects a dict
 Return rollout-group prefix if it is set
 */}}
 {{- define "loki.prefixRolloutGroup" -}}
-{{- if .Values.prefixRolloutGroup -}}
-{{- .Values.loki.prefixRolloutGroup -}}-
+{{- if .Values.ingester.rolloutGroupNamePrefix -}}
+{{- .Values.ingester.rolloutGroupNamePrefix -}}-
 {{- end -}}
 {{- end -}}
 
@@ -86,7 +86,7 @@ Return rollout-group prefix if it is set
 Return ingester name prefix if required
 */}}
 {{- define "loki.prefixIngesterName" -}}
-{{- if .Values.doPrefixIngesterName -}}
+{{- if .Values.ingester.addIngesterNamePrefix -}}
 loki-
 {{- end -}}
 {{- end -}}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 78961a7243009..b2d4525d6528d 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -1891,6 +1891,12 @@ ingester:
       excludeDefaultZone: false
       readPath: false
       writePath: false
+
+  # optionally allow adding arbitrary prefix to the ingester rollout-group label
+  rolloutGroupNamePrefix: null
+  # optionally allow adding 'loki-' prefix to ingester name label
+  addIngesterNamePrefix: false
+
 # --  Configuration for the distributor
 distributor:
   # -- Number of replicas for the distributor
diff --git a/tools/lambda-promtail/go.mod b/tools/lambda-promtail/go.mod
index ba9c463497926..e485cf814d2bd 100644
--- a/tools/lambda-promtail/go.mod
+++ b/tools/lambda-promtail/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/aws/aws-lambda-go v1.47.0
 	github.com/aws/aws-sdk-go-v2 v1.32.5
 	github.com/aws/aws-sdk-go-v2/config v1.28.5
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.67.1
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.68.0
 	github.com/go-kit/log v0.2.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/snappy v0.0.4
diff --git a/tools/lambda-promtail/go.sum b/tools/lambda-promtail/go.sum
index 5a472a08a832c..44abdc2e222e7 100644
--- a/tools/lambda-promtail/go.sum
+++ b/tools/lambda-promtail/go.sum
@@ -74,8 +74,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 h1:wtpJ4zcwr
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5/go.mod h1:qu/W9HXQbbQ4+1+JcZp0ZNPV31ym537ZJN+fiS7Ti8E=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 h1:P1doBzv5VEg1ONxnJss1Kh5ZG/ewoIE4MQtKKc6Crgg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5/go.mod h1:NOP+euMW7W3Ukt28tAxPuoWao4rhhqJD3QEBk7oCg7w=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.67.1 h1:LXLnDfjT/P6SPIaCE86xCOjJROPn4FNB2EdN68vMK5c=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.67.1/go.mod h1:ralv4XawHjEMaHOWnTFushl0WRqim/gQWesAMF6hTow=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.68.0 h1:bFpcqdwtAEsgpZXvkTxIThFQx/EM0oV6kXmfFIGjxME=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.68.0/go.mod h1:ralv4XawHjEMaHOWnTFushl0WRqim/gQWesAMF6hTow=
 github.com/aws/aws-sdk-go-v2/service/sso v1.24.6 h1:3zu537oLmsPfDMyjnUS2g+F2vITgy5pB74tHI+JBNoM=
 github.com/aws/aws-sdk-go-v2/service/sso v1.24.6/go.mod h1:WJSZH2ZvepM6t6jwu4w/Z45Eoi75lPN7DcydSRtJg6Y=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.5 h1:K0OQAsDywb0ltlFrZm0JHPY3yZp/S9OaoLU33S7vPS8=