From b4973223f513d6ae4b94647bc7526e961cf50f65 Mon Sep 17 00:00:00 2001 From: Marc Ransome Date: Mon, 19 Apr 2021 10:52:27 +0100 Subject: [PATCH 1/2] Add CloudWatch log group for agent logs --- groups/frontend/iam.tf | 2 +- groups/frontend/logs.tf | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/groups/frontend/iam.tf b/groups/frontend/iam.tf index 7b79910..7b7cbe4 100644 --- a/groups/frontend/iam.tf +++ b/groups/frontend/iam.tf @@ -2,7 +2,7 @@ module "instance_profile" { source = "git@github.com:companieshouse/terraform-modules//aws/instance_profile?ref=tags/1.0.62" name = "tuxedo-frontend-profile" - cw_log_group_arns = [for log_group in merge(aws_cloudwatch_log_group.tuxedo, aws_cloudwatch_log_group.ngsrv) : log_group.arn] + cw_log_group_arns = [for log_group in merge(aws_cloudwatch_log_group.tuxedo, aws_cloudwatch_log_group.ngsrv, aws_cloudwatch_log_group.cloudwatch) : log_group.arn] enable_SSM = true kms_key_refs = [ local.ssm_kms_key_id diff --git a/groups/frontend/logs.tf b/groups/frontend/logs.tf index 437cda5..8ada2d8 100644 --- a/groups/frontend/logs.tf +++ b/groups/frontend/logs.tf @@ -24,3 +24,13 @@ resource "aws_cloudwatch_log_group" "ngsrv" { nGsrvLogName = each.value.log_name }) } + +resource "aws_cloudwatch_log_group" "cloudwatch" { + name = "${var.service_subtype}-${var.service}-cloudwatch" + retention_in_days = var.default_log_retention_in_days + kms_key_id = local.logs_kms_key_id + + tags = merge(local.common_tags, { + LogName = "cloudwatch" + }) +} From 055ef313eaf2f3e9b80127f81fa86f54945f8a55 Mon Sep 17 00:00:00 2001 From: Marc Ransome Date: Mon, 19 Apr 2021 11:21:37 +0100 Subject: [PATCH 2/2] Transform data type to ensure merge function succeeds --- groups/frontend/iam.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groups/frontend/iam.tf b/groups/frontend/iam.tf index 7b7cbe4..6443b94 100644 --- a/groups/frontend/iam.tf +++ b/groups/frontend/iam.tf @@ -2,7 +2,7 @@ module "instance_profile" { source = "git@github.com:companieshouse/terraform-modules//aws/instance_profile?ref=tags/1.0.62" name = "tuxedo-frontend-profile" - cw_log_group_arns = [for log_group in merge(aws_cloudwatch_log_group.tuxedo, aws_cloudwatch_log_group.ngsrv, aws_cloudwatch_log_group.cloudwatch) : log_group.arn] + cw_log_group_arns = [for log_group in merge(aws_cloudwatch_log_group.tuxedo, aws_cloudwatch_log_group.ngsrv, {"cloudwatch" = aws_cloudwatch_log_group.cloudwatch}) : log_group.arn] enable_SSM = true kms_key_refs = [ local.ssm_kms_key_id