From 71a48cb0a34a57f488400f26e7d64e48b8bd690c Mon Sep 17 00:00:00 2001 From: sidnhs Date: Tue, 30 Dec 2025 15:30:34 +0000 Subject: [PATCH] CCM-12770: Splunk log sending mandatory --- .../components/obs/module_lambda_alert_forwarding.tf | 4 +++- .../obs/module_lambda_splunk_logs_formatter_lambda.tf | 4 +++- .../obs/module_lambda_splunk_metrics_formatter_lambda.tf | 4 +++- .../obs/module_lambda_splunk_metrics_formatter_lambda_us.tf | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/infrastructure/terraform/components/obs/module_lambda_alert_forwarding.tf b/infrastructure/terraform/components/obs/module_lambda_alert_forwarding.tf index 8b7e3211..3224b9c7 100644 --- a/infrastructure/terraform/components/obs/module_lambda_alert_forwarding.tf +++ b/infrastructure/terraform/components/obs/module_lambda_alert_forwarding.tf @@ -1,5 +1,5 @@ module "lambda_alert_forwarding" { - source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip" + source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip" function_name = "alert-forwarding" description = "A function for formatting and sending Cloudwatch alerts to Teams" @@ -33,6 +33,8 @@ module "lambda_alert_forwarding" { force_lambda_code_deploy = var.force_lambda_code_deploy enable_lambda_insights = false + send_to_firehose = false + lambda_env_vars = { "TEAMS_WEBHOOK_CLOUDWATCH_SSM_PARAM" = aws_ssm_parameter.teams_webhook_url_cloudwatch_alarms.name, "TEAMS_WEBHOOK_ALERTS_BACKUP_ERRORS_SSM_PARAM" = aws_ssm_parameter.teams_webhook_url_alerts_backup_errors.name diff --git a/infrastructure/terraform/components/obs/module_lambda_splunk_logs_formatter_lambda.tf b/infrastructure/terraform/components/obs/module_lambda_splunk_logs_formatter_lambda.tf index a9ff33d4..5116d309 100644 --- a/infrastructure/terraform/components/obs/module_lambda_splunk_logs_formatter_lambda.tf +++ b/infrastructure/terraform/components/obs/module_lambda_splunk_logs_formatter_lambda.tf @@ -1,5 +1,5 @@ module "splunk_logs_formatter_lambda" { - source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip" + source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip" function_name = "splunk-logs-formatter" description = "A function for formatting logs for Splunk" @@ -27,6 +27,8 @@ module "splunk_logs_formatter_lambda" { memory = 128 timeout = 900 + send_to_firehose = false + lambda_env_vars = { ENVIRONMENT = var.environment } diff --git a/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda.tf b/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda.tf index f6706a66..76265033 100644 --- a/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda.tf +++ b/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda.tf @@ -1,5 +1,5 @@ module "splunk_metrics_formatter_lambda" { - source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip" + source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip" function_name = "splunk-metrics-formatter" description = "A function for formatting metrics for Splunk" @@ -27,6 +27,8 @@ module "splunk_metrics_formatter_lambda" { memory = 512 timeout = 900 + send_to_firehose = false + lambda_env_vars = { ENVIRONMENT = var.environment SPLUNK_CLOUDWATCH_SOURCETYPE = "aws:cloudwatch:metric" diff --git a/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda_us.tf b/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda_us.tf index 77dd8618..564ffc41 100644 --- a/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda_us.tf +++ b/infrastructure/terraform/components/obs/module_lambda_splunk_metrics_formatter_lambda_us.tf @@ -1,5 +1,5 @@ module "splunk_metrics_formatter_lambda_us" { - source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip" + source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip" providers = { aws = aws.us-east-1 @@ -31,6 +31,8 @@ module "splunk_metrics_formatter_lambda_us" { memory = 512 timeout = 900 + send_to_firehose = false + lambda_env_vars = { ENVIRONMENT = var.environment SPLUNK_CLOUDWATCH_SOURCETYPE = "aws:cloudwatch:metric"