Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cloudformation: add parameter for forwarder bucket name #516

Merged
merged 2 commits into from
Dec 21, 2021
Merged

cloudformation: add parameter for forwarder bucket name #516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec9444d
add parameter for forwarder bucket name
jimjh Nov 21, 2021
9d1e274
Add DdForwarderBucketName to the Advanced group
tianchu Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions aws/logs_monitoring/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ Parameters:
Type: String
Default: ""
Description: The endpoint URL to forward the traces to, useful for forwarding traces through a proxy
DdForwarderBucketName:
Type: String
Default: ""
Description: The name of the forwarder bucket to create. If not provided, AWS will generate a unique name.
Conditions:
IsAWSChina:
Fn::Equals:
Expand Down Expand Up @@ -369,6 +373,11 @@ Conditions:
- Fn::Equals:
- Ref: DdTraceIntakeUrl
- ""
SetDdForwarderBucketName:
Fn::Not:
- Fn::Equals:
- Ref: DdForwarderBucketName
- ""
Rules:
MustSetDdApiKey:
Assertions:
Expand Down Expand Up @@ -653,7 +662,7 @@ Resources:
- Ref: DdApiKeySecret
- Fn::Sub: "${DdApiKeySecretArn}*"
Effect: Allow
# Fetch Lambda resource tags for data enrichment
# Fetch Lambda resource tags for data enrichment
- Fn::If:
- SetDdFetchLambdaTags
- Action:
Expand All @@ -671,7 +680,7 @@ Resources:
Resource: "*"
Effect: Allow
- Ref: AWS::NoValue
# To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
# To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
- Fn::If:
- SetAdditionalTargetLambdas
- Action:
Expand Down Expand Up @@ -742,6 +751,11 @@ Resources:
ForwarderBucket:
Type: AWS::S3::Bucket
Properties:
BucketName:
Fn::If:
- SetDdForwarderBucketName
- Ref: DdForwarderBucketName
- Ref: AWS::NoValue
BucketEncryption:
ServerSideEncryptionConfiguration:
- ServerSideEncryptionByDefault:
Expand Down Expand Up @@ -1006,6 +1020,7 @@ Metadata:
- DdApiUrl
- DdTraceIntakeUrl
- AdditionalTargetLambdaArns
- DdForwarderBucketName
ParameterLabels:
DdApiKey:
default: "DdApiKey *"
Expand Down