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

Lambda log rentention variable #274

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Lambda log rentention variable #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8785932
Allow setting of lambda log retention period
TomJKing Jan 19, 2024
fe0be24
Use log retention variable in lambdas
TomJKing Jan 19, 2024
a502b48
Default lambda log retention to 30 days
TomJKing Jan 23, 2024
eec5260
Merge remote-tracking branch 'origin/master' into lambda-log-rententi…
TomJKing Jan 23, 2024
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
7 changes: 4 additions & 3 deletions lambda/create_db_users.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ resource "aws_kms_ciphertext" "environment_vars_create_db_users" {
}

resource "aws_cloudwatch_log_group" "create_db_users_lambda_log_group" {
count = local.count_create_db_users
name = "/aws/lambda/${aws_lambda_function.create_db_users_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_create_db_users
name = "/aws/lambda/${aws_lambda_function.create_db_users_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "create_db_users_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/create_keycloak_db_user.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ resource "aws_kms_ciphertext" "environment_vars_create_keycloak_db_user" {
}

resource "aws_cloudwatch_log_group" "create_keycloak_db_user_lambda_log_group" {
count = local.count_create_keycloak_db_user
name = "/aws/lambda/${aws_lambda_function.create_keycloak_db_user_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_create_keycloak_db_user
name = "/aws/lambda/${aws_lambda_function.create_keycloak_db_user_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "create_keycloak_db_user_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/create_keycloak_db_user_new.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ resource "aws_kms_ciphertext" "environment_vars_create_keycloak_db_user_new" {
}

resource "aws_cloudwatch_log_group" "create_keycloak_db_user_lambda_log_group_new" {
count = local.count_create_keycloak_db_user_new
name = "/aws/lambda/${aws_lambda_function.create_keycloak_db_user_lambda_function_new.*.function_name[0]}"
tags = var.common_tags
count = local.count_create_keycloak_db_user_new
name = "/aws/lambda/${aws_lambda_function.create_keycloak_db_user_lambda_function_new.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "create_keycloak_db_user_lambda_policy_new" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/create_keycloak_users_api.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ resource "aws_kms_ciphertext" "environment_vars_create_keycloak_users_api" {
}

resource "aws_cloudwatch_log_group" "create_keycloak_users_api_lambda_log_group" {
count = local.count_create_keycloak_users_api
name = "/aws/lambda/${aws_lambda_function.create_keycloak_users_api_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_create_keycloak_users_api
name = "/aws/lambda/${aws_lambda_function.create_keycloak_users_api_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "create_keycloak_users_api_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/create_keycloak_users_s3.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ resource "aws_kms_ciphertext" "environment_vars_create_keycloak_users_s3" {
}

resource "aws_cloudwatch_log_group" "create_keycloak_users_s3_lambda_log_group" {
count = local.count_create_keycloak_users_s3
name = "/aws/lambda/${aws_lambda_function.create_keycloak_users_s3_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_create_keycloak_users_s3
name = "/aws/lambda/${aws_lambda_function.create_keycloak_users_s3_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "create_keycloak_users_s3_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/ecr_scan.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ resource "aws_lambda_permission" "lambda_allow_event" {
}

resource "aws_cloudwatch_log_group" "ecr_scan_lambda_log_group" {
count = local.count_ecr_scan
name = "/aws/lambda/${aws_lambda_function.ecr_scan_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_ecr_scan
name = "/aws/lambda/${aws_lambda_function.ecr_scan_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "ecr_scan_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/export_api_authoriser.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ resource "aws_kms_ciphertext" "environment_vars_export_api_authoriser" {
}

resource "aws_cloudwatch_log_group" "export_api_authoriser_lambda_log_group" {
count = local.count_export_api_authoriser
name = "/aws/lambda/${aws_lambda_function.export_api_authoriser_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_export_api_authoriser
name = "/aws/lambda/${aws_lambda_function.export_api_authoriser_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_role" "export_api_authoriser_lambda_iam_role" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/export_status_update.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ resource "aws_lambda_function" "export_status_update_lambda_function" {
}

resource "aws_cloudwatch_log_group" "export_status_update_lambda_log_group" {
count = local.count_export_status_update
name = "/aws/lambda/${aws_lambda_function.export_status_update_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_export_status_update
name = "/aws/lambda/${aws_lambda_function.export_status_update_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "export_status_update_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/notifications.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ data "aws_ssm_parameter" "slack_export_webhook" {
}

resource "aws_cloudwatch_log_group" "notifications_lambda_log_group" {
count = local.count_notifications
name = "/aws/lambda/${aws_lambda_function.notifications_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_notifications
name = "/aws/lambda/${aws_lambda_function.notifications_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "notifications_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/reporting.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ resource "aws_kms_ciphertext" "environment_vars_reporting" {
}

resource "aws_cloudwatch_log_group" "reporting_lambda_log_group" {
count = local.count_reporting
name = "/aws/lambda/${aws_lambda_function.reporting_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_reporting
name = "/aws/lambda/${aws_lambda_function.reporting_lambda_function.*.function_name[0]}"
tags = var.common_tags
retention_in_days = var.cloudwatch_log_retention_in_days
}

resource "aws_iam_policy" "reporting_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/rotate_keycloak_secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ resource "aws_lambda_function" "rotate_keycloak_secrets_lambda_function" {
}

resource "aws_cloudwatch_log_group" "rotate_keycloak_secrets_lambda_log_group" {
count = local.count_rotate_keycloak_secrets
name = "/aws/lambda/${aws_lambda_function.rotate_keycloak_secrets_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_rotate_keycloak_secrets
name = "/aws/lambda/${aws_lambda_function.rotate_keycloak_secrets_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "rotate_keycloak_secrets_lambda_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/service_unavailable.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ resource "aws_lambda_function" "lambda_service_unavailable_function" {
}

resource "aws_cloudwatch_log_group" "lambda_service_unavailable_log_group" {
count = local.count_service_unavailable
name = "/aws/lambda/${aws_lambda_function.lambda_service_unavailable_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_service_unavailable
name = "/aws/lambda/${aws_lambda_function.lambda_service_unavailable_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "lambda_service_unavailable_policy" {
Expand Down
7 changes: 4 additions & 3 deletions lambda/signed_cookies.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ resource "aws_kms_ciphertext" "environment_vars_signed_cookies" {
}

resource "aws_cloudwatch_log_group" "signed_cookies_lambda_log_group" {
count = local.count_signed_cookies
name = "/aws/lambda/${aws_lambda_function.signed_cookies_lambda_function.*.function_name[0]}"
tags = var.common_tags
count = local.count_signed_cookies
name = "/aws/lambda/${aws_lambda_function.signed_cookies_lambda_function.*.function_name[0]}"
retention_in_days = var.cloudwatch_log_retention_in_days
tags = var.common_tags
}

resource "aws_iam_policy" "signed_cookies_lambda_policy" {
Expand Down
5 changes: 5 additions & 0 deletions lambda/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,3 +368,8 @@ variable "user_session_timeout_mins" {
description = "Timeout for a user session in minutes"
default = 60
}

variable "cloudwatch_log_retention_in_days" {
description = "Number of days to retain logs. '0' equals indefinite retention"
default = 30
}
Loading