From 3ff7607d48f043badb78d4184f95cd050ada88cc Mon Sep 17 00:00:00 2001 From: Hari Chintala Date: Fri, 25 Aug 2023 12:40:44 +0100 Subject: [PATCH 1/2] Set Logging Validity to 2 --- terraform/environments/digital-prison-reporting/main.tf | 1 + .../digital-prison-reporting/modules/glue_job/variables.tf | 2 +- .../modules/lambdas/generic/variables.tf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/terraform/environments/digital-prison-reporting/main.tf b/terraform/environments/digital-prison-reporting/main.tf index 83a8d3184f7..fd64e0fdf62 100644 --- a/terraform/environments/digital-prison-reporting/main.tf +++ b/terraform/environments/digital-prison-reporting/main.tf @@ -592,6 +592,7 @@ module "datamart" { logging = { enable = true log_destination_type = "cloudwatch" + retention_period = 2 log_exports = ["useractivitylog", "userlog", "connectionlog"] } diff --git a/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf b/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf index 37c408109d2..7f824130bc8 100644 --- a/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf +++ b/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf @@ -235,7 +235,7 @@ variable "security_configuration_s3_encryption" { variable "log_group_retention_in_days" { type = number - default = 7 + default = 2 description = "(Optional) The default number of days log events retained in the glue job log group." } diff --git a/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf b/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf index 857afeb15a8..9c83cc40bc7 100644 --- a/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf +++ b/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf @@ -43,7 +43,7 @@ variable "handler" { variable "log_retention_in_days" { description = "Log retention in number of days." type = number - default = 14 + default = 2 } variable "memory_size" { From 4b88a6ca3c1f3cdc3867a92eda8dbf8fbf5070d0 Mon Sep 17 00:00:00 2001 From: Hari Chintala Date: Fri, 25 Aug 2023 16:52:20 +0100 Subject: [PATCH 2/2] Set Logging Validity to 2 --- terraform/environments/digital-prison-reporting/main.tf | 2 +- .../digital-prison-reporting/modules/glue_job/variables.tf | 2 +- .../modules/lambdas/generic/variables.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/environments/digital-prison-reporting/main.tf b/terraform/environments/digital-prison-reporting/main.tf index fd64e0fdf62..a85e4dba90d 100644 --- a/terraform/environments/digital-prison-reporting/main.tf +++ b/terraform/environments/digital-prison-reporting/main.tf @@ -592,7 +592,7 @@ module "datamart" { logging = { enable = true log_destination_type = "cloudwatch" - retention_period = 2 + retention_period = 1 log_exports = ["useractivitylog", "userlog", "connectionlog"] } diff --git a/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf b/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf index 7f824130bc8..9ce6e00d165 100644 --- a/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf +++ b/terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf @@ -235,7 +235,7 @@ variable "security_configuration_s3_encryption" { variable "log_group_retention_in_days" { type = number - default = 2 + default = 1 description = "(Optional) The default number of days log events retained in the glue job log group." } diff --git a/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf b/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf index 9c83cc40bc7..6bd669bc59c 100644 --- a/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf +++ b/terraform/environments/digital-prison-reporting/modules/lambdas/generic/variables.tf @@ -43,7 +43,7 @@ variable "handler" { variable "log_retention_in_days" { description = "Log retention in number of days." type = number - default = 2 + default = 1 } variable "memory_size" {