Skip to content

Commit 1fc40e1

Browse files
sidnhssidnhs
authored
CCM-12770: Splunk log sending mandatory (#166)
* CCM-12770: Splunk log sending mandatory * CCM-12770: Splunk log sending mandatory
1 parent 571608e commit 1fc40e1

12 files changed

Lines changed: 22 additions & 30 deletions

‎infrastructure/terraform/components/dl/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ No requirements.
4040
| Name | Source | Version |
4141
|------|--------|---------|
4242
| <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-kms.zip | n/a |
43-
| <a name="module_lambda_apim_key_generation"></a> [lambda\_apim\_key\_generation](#module\_lambda\_apim\_key\_generation) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
44-
| <a name="module_lambda_lambda_apim_refresh_token"></a> [lambda\_lambda\_apim\_refresh\_token](#module\_lambda\_lambda\_apim\_refresh\_token) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
45-
| <a name="module_mesh_poll"></a> [mesh\_poll](#module\_mesh\_poll) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
46-
| <a name="module_pdm_mock"></a> [pdm\_mock](#module\_pdm\_mock) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
47-
| <a name="module_pdm_uploader"></a> [pdm\_uploader](#module\_pdm\_uploader) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
43+
| <a name="module_lambda_apim_key_generation"></a> [lambda\_apim\_key\_generation](#module\_lambda\_apim\_key\_generation) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
44+
| <a name="module_lambda_lambda_apim_refresh_token"></a> [lambda\_lambda\_apim\_refresh\_token](#module\_lambda\_lambda\_apim\_refresh\_token) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
45+
| <a name="module_mesh_poll"></a> [mesh\_poll](#module\_mesh\_poll) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
46+
| <a name="module_pdm_mock"></a> [pdm\_mock](#module\_pdm\_mock) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
47+
| <a name="module_pdm_uploader"></a> [pdm\_uploader](#module\_pdm\_uploader) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
4848
| <a name="module_s3bucket_cf_logs"></a> [s3bucket\_cf\_logs](#module\_s3bucket\_cf\_logs) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-s3bucket.zip | n/a |
4949
| <a name="module_s3bucket_letters"></a> [s3bucket\_letters](#module\_s3bucket\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-s3bucket.zip | n/a |
5050
| <a name="module_s3bucket_static_assets"></a> [s3bucket\_static\_assets](#module\_s3bucket\_static\_assets) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-s3bucket.zip | n/a |
5151
| <a name="module_sqs_event_publisher_errors"></a> [sqs\_event\_publisher\_errors](#module\_sqs\_event\_publisher\_errors) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
5252
| <a name="module_sqs_pdm_uploader"></a> [sqs\_pdm\_uploader](#module\_sqs\_pdm\_uploader) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
5353
| <a name="module_sqs_ttl"></a> [sqs\_ttl](#module\_sqs\_ttl) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
5454
| <a name="module_sqs_ttl_handle_expiry_errors"></a> [sqs\_ttl\_handle\_expiry\_errors](#module\_sqs\_ttl\_handle\_expiry\_errors) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-sqs.zip | n/a |
55-
| <a name="module_ttl_create"></a> [ttl\_create](#module\_ttl\_create) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
56-
| <a name="module_ttl_handle_expiry"></a> [ttl\_handle\_expiry](#module\_ttl\_handle\_expiry) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
57-
| <a name="module_ttl_poll"></a> [ttl\_poll](#module\_ttl\_poll) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip | n/a |
55+
| <a name="module_ttl_create"></a> [ttl\_create](#module\_ttl\_create) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
56+
| <a name="module_ttl_handle_expiry"></a> [ttl\_handle\_expiry](#module\_ttl\_handle\_expiry) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
57+
| <a name="module_ttl_poll"></a> [ttl\_poll](#module\_ttl\_poll) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip | n/a |
5858
## Outputs
5959

6060
| Name | Description |

‎infrastructure/terraform/components/dl/cloudwatch_event_bus.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "aws_cloudwatch_event_bus" "main" {
2-
name = "${local.csi}"
2+
name = local.csi
33

44
kms_key_identifier = module.kms.key_id
55

‎infrastructure/terraform/components/dl/locals.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
locals {
2-
aws_lambda_functions_dir_path = "../../../../lambdas"
3-
log_destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
2+
aws_lambda_functions_dir_path = "../../../../lambdas"
3+
log_destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
44
apim_access_token_ssm_parameter_name = "/${var.component}/${var.environment}/apim/access_token"
55
apim_api_key_ssm_parameter_name = "/${var.component}/${var.environment}/apim/api_key"
66
apim_private_key_ssm_parameter_name = "/${var.component}/${var.environment}/apim/private_key"
77
apim_keystore_s3_bucket = "nhs-${var.aws_account_id}-${var.region}-${var.environment}-${var.component}-static-assets"
88
root_domain_name = "${var.environment}.${local.acct.route53_zone_names["digital-letters"]}"
99
root_domain_id = local.acct.route53_zone_ids["digital-letters"]
10-
ttl_shard_count = 3
10+
ttl_shard_count = 3
1111
deploy_pdm_mock = var.enable_pdm_mock
1212
}

‎infrastructure/terraform/components/dl/module_lambda_apim_key_generation.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "lambda_apim_key_generation" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

44
function_name = "apim-key-generation"
55
description = "A function to generate APIM public and private keys"
@@ -33,7 +33,6 @@ module "lambda_apim_key_generation" {
3333
force_lambda_code_deploy = var.force_lambda_code_deploy
3434
enable_lambda_insights = false
3535

36-
send_to_firehose = true
3736
log_destination_arn = local.log_destination_arn
3837
log_subscription_role_arn = local.acct.log_subscription_role_arn
3938

‎infrastructure/terraform/components/dl/module_lambda_apim_refresh_token.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "lambda_lambda_apim_refresh_token" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

44
function_name = "apim-refresh-token"
55
description = "A function to generate APIM access tokens"
@@ -32,7 +32,6 @@ module "lambda_lambda_apim_refresh_token" {
3232
force_lambda_code_deploy = var.force_lambda_code_deploy
3333
enable_lambda_insights = false
3434

35-
send_to_firehose = true
3635
log_destination_arn = local.log_destination_arn
3736
log_subscription_role_arn = local.acct.log_subscription_role_arn
3837

‎infrastructure/terraform/components/dl/module_lambda_mesh_poll.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "mesh_poll" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

44
function_name = "mesh-poll"
55
description = "A lambda function for polling MESH inbox for new messages"
@@ -32,7 +32,6 @@ module "mesh_poll" {
3232
force_lambda_code_deploy = var.force_lambda_code_deploy
3333
enable_lambda_insights = false
3434

35-
send_to_firehose = true
3635
log_destination_arn = local.log_destination_arn
3736
log_subscription_role_arn = local.acct.log_subscription_role_arn
3837

‎infrastructure/terraform/components/dl/module_lambda_pdm_mock.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "pdm_mock" {
22
count = local.deploy_pdm_mock ? 1 : 0
3-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
3+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
44

55
function_name = "pdm-mock"
66
description = "A lambda function for mocking PDM (Patient Data Manager) API endpoints"
@@ -32,7 +32,6 @@ module "pdm_mock" {
3232
force_lambda_code_deploy = var.force_lambda_code_deploy
3333
enable_lambda_insights = false
3434

35-
send_to_firehose = true
3635
log_destination_arn = local.log_destination_arn
3736
log_subscription_role_arn = local.acct.log_subscription_role_arn
3837

‎infrastructure/terraform/components/dl/module_lambda_pdm_uploader.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "pdm_uploader" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

44
function_name = "pdm-uploader"
55
description = "A function to upload documents to PDM"
@@ -31,7 +31,6 @@ module "pdm_uploader" {
3131
force_lambda_code_deploy = var.force_lambda_code_deploy
3232
enable_lambda_insights = false
3333

34-
send_to_firehose = true
3534
log_destination_arn = local.log_destination_arn
3635
log_subscription_role_arn = local.acct.log_subscription_role_arn
3736

‎infrastructure/terraform/components/dl/module_lambda_ttl_create.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "ttl_create" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

44
function_name = "ttl-create"
55
description = "A function for creating TTL records"
@@ -31,7 +31,6 @@ module "ttl_create" {
3131
force_lambda_code_deploy = var.force_lambda_code_deploy
3232
enable_lambda_insights = false
3333

34-
send_to_firehose = true
3534
log_destination_arn = local.log_destination_arn
3635
log_subscription_role_arn = local.acct.log_subscription_role_arn
3736

‎infrastructure/terraform/components/dl/module_lambda_ttl_handle_expiry.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "ttl_handle_expiry" {
2-
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.24/terraform-lambda.zip"
2+
source = "https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.29/terraform-lambda.zip"
33

44
function_name = "ttl-handle-expiry"
55
description = "A function for handling deleted TTL records"
@@ -31,7 +31,6 @@ module "ttl_handle_expiry" {
3131
force_lambda_code_deploy = var.force_lambda_code_deploy
3232
enable_lambda_insights = false
3333

34-
send_to_firehose = true
3534
log_destination_arn = local.log_destination_arn
3635
log_subscription_role_arn = local.acct.log_subscription_role_arn
3736

0 commit comments

Comments
 (0)