Skip to content

NRL-1386 Status lambdas only send logs to splunk #954

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

Merged
jackleary merged 6 commits into from
Jul 1, 2025
Merged

NRL-1386 Status lambdas only send logs to splunk #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21b4512
NRL-1386 Status lambdas only send logs to splunk
jackleary Jun 30, 2025
4eb3695
NRL-1386 name update
jackleary Jun 30, 2025
929d82c
NRL-1386 Logic update for lambda subscriptions
jackleary Jun 30, 2025
0670107
NRL-1386 Upgrade to medium ec2 for 4gb memory
jackleary Jun 30, 2025
4d96b35
NRL-1386 temp change for testers
jackleary Jun 30, 2025
041ee5d
NRL-1386 revert temp change
jackleary Jun 30, 2025
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
2 changes: 1 addition & 1 deletion terraform/account-wide-infrastructure/dev/vars.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ variable "enable_powerbi_auto_push" {
variable "powerbi_gw_instance_type" {
type = string
description = "Type for PowerBI GW EC2 Instance"
default = "t2.micro"
default = "t2.medium"
}

variable "use_powerbi_gw_custom_ami" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/account-wide-infrastructure/prod/vars.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ variable "enable_powerbi_auto_push" {
variable "powerbi_gw_instance_type" {
type = string
description = "Type for PowerBI GW EC2 Instance"
default = "t2.micro"
default = "t2.medium"
}

variable "use_powerbi_gw_custom_ami" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/account-wide-infrastructure/test/vars.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ variable "enable_powerbi_auto_push" {
variable "powerbi_gw_instance_type" {
type = string
description = "Type for PowerBI GW EC2 Instance"
default = "t2.micro"
default = "t2.medium"
}

variable "use_powerbi_gw_custom_ami" {
Expand Down
4 changes: 2 additions & 2 deletions terraform/infrastructure/lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ module "consumer__status" {
local.pointers_kms_read_write_arn,
local.auth_store_read_policy_arn
]
firehose_subscriptions = local.firehose_lambda_subscriptions
firehose_subscriptions = local.firehost_lambda_splunk_only_subscription
handler = "status.handler"
retention = var.log_retention_period
}
Expand Down Expand Up @@ -351,7 +351,7 @@ module "producer__status" {
local.pointers_kms_read_write_arn,
local.auth_store_read_policy_arn
]
firehose_subscriptions = local.firehose_lambda_subscriptions
firehose_subscriptions = local.firehost_lambda_splunk_only_subscription
handler = "status.handler"
retention = var.log_retention_period
}
13 changes: 10 additions & 3 deletions terraform/infrastructure/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,16 @@ locals {

reporting_bucket_arn = data.aws_s3_bucket.source-data-bucket.arn
reporting_kms_arn = data.aws_kms_key.glue.arn
firehose_lambda_subscriptions = var.use_shared_resources ? {
"splunk_subscription" : module.firehose__processor[0].firehose_subscription,
"reports_subscription" : module.firehose__processor[0].firehose_reporting_subscription
firehose_lambda_subscriptions = var.use_shared_resources ? (
var.enable_reporting ? {
"splunk_subscription" = module.firehose__processor[0].firehose_subscription,
"reports_subscription" = module.firehose__processor[0].firehose_reporting_subscription
} : {
"splunk_subscription" = module.firehose__processor[0].firehose_subscription
}
) : {}
firehost_lambda_splunk_only_subscription = var.use_shared_resources ? {
"splunk_subscription" : module.firehose__processor[0].firehose_subscription
} : {}
splunk_environment = local.is_sandbox_env ? "${var.account_name}sandbox" : var.account_name
splunk_index = "aws_recordlocator_${local.splunk_environment}"
Expand Down
Loading