Skip to content

Commit 5c961bb

Browse files
authored
Update datadog-lambda-forwarder component and README (cloudposse/terraform-aws-components#466)
1 parent 669e582 commit 5c961bb

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

src/README.md

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,28 @@ components:
1919
workspace_enabled: true
2020
vars:
2121
enabled: true
22-
forwarder_log_enabled: true
22+
name: datadog-lambda-forwarder
23+
# Set `forwarder_rds_enabled` to `true` and configure `rds-enhanced-monitoring` Log Group when:
24+
# 1. The account has RDS instances provisioned
25+
# 2. RDS Enhanced Monitoring is enabled
26+
# 3. CloudWatch Log Group `RDSOSMetrics` exists (it will be created by AWS automatically when RDS Enhanced Monitoring is enabled)
2327
forwarder_rds_enabled: true
28+
forwarder_log_enabled: true
2429
forwarder_vpc_enabled: true
30+
cloudwatch_forwarder_log_groups:
31+
rds-enhanced-monitoring:
32+
name: "RDSOSMetrics"
33+
filter_pattern: ""
34+
eks-cluster:
35+
# Use either `name` or `name_prefix` with `name_suffix`
36+
# If `name_prefix` with `name_suffix` are used, the final `name` will be constructed using `name_prefix` + context + `name_suffix`,
37+
# e.g. "/aws/eks/eg-ue2-prod-eks-cluster/cluster"
38+
name_prefix: "/aws/eks/"
39+
name_suffix: "eks-cluster/cluster"
40+
filter_pattern: ""
41+
transfer-sftp:
42+
name: "/aws/transfer/s-xxxxxxxxxxxx"
43+
filter_pattern: ""
2544
dd_api_key_source:
2645
resource: "ssm"
2746
identifier: "datadog/datadog_api_key"
@@ -33,7 +52,7 @@ components:
3352
| Name | Version |
3453
|------|---------|
3554
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
36-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.0 |
55+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
3756
3857
## Providers
3958
@@ -43,7 +62,7 @@ No providers.
4362
4463
| Name | Source | Version |
4564
|------|--------|---------|
46-
| <a name="module_datadog_lambda_forwarder"></a> [datadog\_lambda\_forwarder](#module\_datadog\_lambda\_forwarder) | cloudposse/datadog-lambda-forwarder/aws | 0.8.0 |
65+
| <a name="module_datadog_lambda_forwarder"></a> [datadog\_lambda\_forwarder](#module\_datadog\_lambda\_forwarder) | cloudposse/datadog-lambda-forwarder/aws | 0.12.0 |
4766
| <a name="module_iam_roles"></a> [iam\_roles](#module\_iam\_roles) | ../account-map/modules/iam-roles | n/a |
4867
| <a name="module_log_group_prefix"></a> [log\_group\_prefix](#module\_log\_group\_prefix) | cloudposse/label/null | 0.25.0 |
4968
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |

src/default.auto.tfvars

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ locals {
44
cloudwatch_forwarder_log_groups = {
55
for k, v in var.cloudwatch_forwarder_log_groups :
66
k => {
7-
"name" : lookup(v, "name_suffix", null) != null ? format(
7+
name : lookup(v, "name_suffix", null) != null ? format(
88
"%s%s%s%s",
99
lookup(v, "name_prefix", "/aws/"),
1010
module.log_group_prefix.id,
1111
module.log_group_prefix.delimiter,
1212
lookup(v, "name_suffix")
1313
) : lookup(v, "name")
14-
"filter_pattern" : lookup(v, "filter_pattern", "")
14+
filter_pattern : lookup(v, "filter_pattern", "")
1515
}
1616
}
1717

@@ -38,7 +38,7 @@ module "log_group_prefix" {
3838

3939
module "datadog_lambda_forwarder" {
4040
source = "cloudposse/datadog-lambda-forwarder/aws"
41-
version = "0.8.0"
41+
version = "0.12.0"
4242

4343
cloudwatch_forwarder_log_groups = local.cloudwatch_forwarder_log_groups
4444
dd_api_key_kms_ciphertext_blob = var.dd_api_key_kms_ciphertext_blob

src/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = "~> 3.0"
7+
version = ">= 3.0"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)