Skip to content

Commit 24dff24

Browse files
jimjhtianchu
andauthored
cloudformation: add parameter for forwarder bucket name (#516)
* add parameter for forwarder bucket name * Add DdForwarderBucketName to the Advanced group Co-authored-by: Tian Chu <tian.chu@datadoghq.com>
1 parent 1c3523b commit 24dff24

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

aws/logs_monitoring/template.yaml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,10 @@ Parameters:
206206
Type: String
207207
Default: ""
208208
Description: The endpoint URL to forward the traces to, useful for forwarding traces through a proxy
209+
DdForwarderBucketName:
210+
Type: String
211+
Default: ""
212+
Description: The name of the forwarder bucket to create. If not provided, AWS will generate a unique name.
209213
Conditions:
210214
IsAWSChina:
211215
Fn::Equals:
@@ -369,6 +373,11 @@ Conditions:
369373
- Fn::Equals:
370374
- Ref: DdTraceIntakeUrl
371375
- ""
376+
SetDdForwarderBucketName:
377+
Fn::Not:
378+
- Fn::Equals:
379+
- Ref: DdForwarderBucketName
380+
- ""
372381
Rules:
373382
MustSetDdApiKey:
374383
Assertions:
@@ -653,7 +662,7 @@ Resources:
653662
- Ref: DdApiKeySecret
654663
- Fn::Sub: "${DdApiKeySecretArn}*"
655664
Effect: Allow
656-
# Fetch Lambda resource tags for data enrichment
665+
# Fetch Lambda resource tags for data enrichment
657666
- Fn::If:
658667
- SetDdFetchLambdaTags
659668
- Action:
@@ -671,7 +680,7 @@ Resources:
671680
Resource: "*"
672681
Effect: Allow
673682
- Ref: AWS::NoValue
674-
# To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
683+
# To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
675684
- Fn::If:
676685
- SetAdditionalTargetLambdas
677686
- Action:
@@ -742,6 +751,11 @@ Resources:
742751
ForwarderBucket:
743752
Type: AWS::S3::Bucket
744753
Properties:
754+
BucketName:
755+
Fn::If:
756+
- SetDdForwarderBucketName
757+
- Ref: DdForwarderBucketName
758+
- Ref: AWS::NoValue
745759
BucketEncryption:
746760
ServerSideEncryptionConfiguration:
747761
- ServerSideEncryptionByDefault:
@@ -1006,6 +1020,7 @@ Metadata:
10061020
- DdApiUrl
10071021
- DdTraceIntakeUrl
10081022
- AdditionalTargetLambdaArns
1023+
- DdForwarderBucketName
10091024
ParameterLabels:
10101025
DdApiKey:
10111026
default: "DdApiKey *"

0 commit comments

Comments
 (0)