Enable support for non-SAM regions with load balancer policies covering both legacy and new regions.

aws-observability-terraform/app-modules/alb/app.tf

@@ -1,5 +1,5 @@
 module "alb_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/apigateway/app.tf

@@ -1,5 +1,5 @@
 module "apigateway_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/dynamodb/app.tf

@@ -1,5 +1,5 @@
 module "dynamodb_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/ec2metrics/app.tf

@@ -1,5 +1,5 @@
 module "ec2metrics_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/ecs/app.tf

@@ -1,5 +1,5 @@
 module "ecs_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/elasticache/app.tf

@@ -1,5 +1,5 @@
 module "elasticache_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/elb/app.tf

@@ -1,5 +1,5 @@
 module "classic_elb_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/lambda/app.tf

@@ -1,5 +1,5 @@
 module "lambda_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/nlb/app.tf

@@ -1,5 +1,5 @@
 module "nlb_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/overview/app.tf

@@ -1,5 +1,5 @@
 module "overview_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/rds/app.tf

@@ -1,5 +1,5 @@
 module "rds_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/sns/app.tf

@@ -1,5 +1,5 @@
 module "sns_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/app-modules/sqs/app.tf

@@ -1,5 +1,5 @@
 module "sqs_module" {
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q1"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=fy27q2"
   # source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic"
   # version = "1.0.23"
 

aws-observability-terraform/providers.tf

@@ -6,7 +6,7 @@ provider "sumologic" {
 }
 
 provider "aws" {
-  region = "us-east-1"
+  region = "me-central-1"
   #
   # Below properties should be added when you would like to onboard more than one region and account
   # More Information regarding AWS Profile can be found at -

aws-observability-terraform/source-module/local.tf

@@ -110,6 +110,9 @@ locals {
     "cn-northwest-1" = "037604701340"
   }
 
+  # Check if current region is in the old regions list
+  is_old_region = lookup(local.region_to_elb_account_id, local.aws_region, null) != null
+
   namespace_scan_interval = {
     "ApplicationELB" = 60000,
     "ApiGateway"     = 300000,

aws-observability-terraform/source-module/main.tf

@@ -26,8 +26,9 @@ module "cloudtrail_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_cloudtrail_source ? ["cloudtrail_module"] : [])
   #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudtrail"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudtrail?ref=fy27q1"
-  #version = "1.0.23"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudtrail?ref=fy27q2"
+  #version = "1.0.24"
+
 
 
   create_collector          = false
@@ -63,14 +64,18 @@ module "cloudtrail_module" {
   aws_resource_tags = var.aws_resource_tags
 }
 
-#ALB module
+# #ALB module
 module "elb_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_elb_source ? ["elb_module"] : [])
   #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/elb"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/elb?ref=fy27q1"
-  #version = "1.0.23"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/elb?ref=fy27q2"
+  #version = "1.0.24"
 
+  providers = {
+    aws                    = aws
+    lambda-invoke-extension = lambda-invoke-extension
+  }
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -116,9 +121,13 @@ module "classic_lb_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_classic_lb_source ? ["classic_lb_module"] : [])
   #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/elasticloadbalancing"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/elasticloadbalancing?ref=fy27q1"
-  #version = "1.0.23"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/elasticloadbalancing?ref=fy27q2"
+  #version = "1.0.24"
 
+  providers = {
+    aws                    = aws
+    lambda-invoke-extension = lambda-invoke-extension
+  }
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -164,8 +173,9 @@ module "cloudwatch_custom_metrics_source_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_cw_metrics_source && length(local.custom_namespace) > 0 ? ["Custom"] : [])
   #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchmetrics"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchmetrics?ref=fy27q1"
-  #version = "1.0.23"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchmetrics?ref=fy27q2"
+  #version = "1.0.24"
+
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -195,9 +205,8 @@ module "cloudwatch_metrics_source_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = local.create_cw_metrics_source && length(local.aws_namespace) > 0 ? toset(local.aws_namespace) : []
   # source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchmetrics"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchmetrics?ref=fy27q1"
-  #version = "1.0.23"
-
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchmetrics?ref=fy27q2"
+  #version = "1.0.24"
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -227,8 +236,8 @@ module "kinesis_firehose_for_metrics_source_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_kf_metrics_source ? ["kinesis_firehose_for_metrics_source_module"] : [])
   # source = "SumoLogic/sumo-logic-integrations/sumologic//aws/kinesisfirehoseformetrics"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/kinesisfirehoseformetrics?ref=fy27q1"
-  #version = "1.0.23"
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/kinesisfirehoseformetrics?ref=fy27q2"
+  #version = "1.0.24"
 
   create_collector          = false
   sumologic_organization_id = var.sumologic_organization_id
@@ -261,9 +270,8 @@ module "cloudwatch_logs_lambda_log_forwarder_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_llf_logs_source ? ["cloudwatch_logs_lambda_log_forwarder_module"] : [])
   # source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchlogsforwarder"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchlogsforwarder?ref=fy27q1"
-  #version = "1.0.23"
-
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/cloudwatchlogsforwarder?ref=fy27q2"
+  #version = "1.0.24"
 
   create_collector = false
 
@@ -295,9 +303,8 @@ module "kinesis_firehose_for_logs_module" {
   depends_on = [time_sleep.wait_for_minutes]
   for_each   = toset(local.create_kf_logs_source ? ["kinesis_firehose_for_logs_module"] : [])
   #source = "SumoLogic/sumo-logic-integrations/sumologic//aws/kinesisfirehoseforlogs"
-  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/kinesisfirehoseforlogs?ref=fy27q1"
-  #version = "1.0.23"
-
+  source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//aws/kinesisfirehoseforlogs?ref=fy27q2"
+  #version = "1.0.24"
 
   create_collector = false
 

aws-observability-terraform/source-module/main_s3_bucket.tf

@@ -15,10 +15,16 @@ resource "aws_s3_bucket_policy" "dump_access_logs_to_s3" {
   for_each = toset(local.create_common_bucket ? ["s3_bucket"] : [])
 
   bucket = aws_s3_bucket.s3_bucket["s3_bucket"].id
-  policy = templatefile("${path.module}/templates/s3_bucket_policy.tmpl", {
+
+  # Use old policy template with ELB_ACCOUNT_ID for old regions
+  # Use new policy template with only BUCKET_NAME for new regions
+  policy = local.is_old_region ? templatefile("${path.module}/templates/s3_bucket_old_policy.tmpl", {
     BUCKET_NAME     = local.common_bucket_name
     ELB_ACCCOUNT_ID = local.region_to_elb_account_id[local.aws_region]
     AWS_PARTITION   = data.aws_partition.current.partition
+  }) : templatefile("${path.module}/templates/s3_bucket_new_policy.tmpl", {
+    BUCKET_NAME = local.common_bucket_name
+    AWS_PARTITION   = data.aws_partition.current.partition
   })
 }
 

aws-observability-terraform/source-module/outputs.tf

@@ -53,11 +53,6 @@ output "elb_sns_subscription" {
   description = "AWS SNS subscription to Sumo Logic AWS ELB source."
 }
 
-output "elb_auto_enable_stack" {
-  value       = local.create_elb_source && var.auto_enable_access_logs != "None" ? module.elb_module["elb_module"].aws_serverlessapplicationrepository_cloudformation_stack : {}
-  description = "AWS CloudFormation stack for ALB Auto Enable access logs."
-}
-
 output "classic_lb_sns_topic" {
   value       = local.create_classic_lb_source && !var.classic_lb_source_details.bucket_details.create_bucket ? module.classic_lb_module["classic_lb_module"].aws_sns_topic : {}
   description = "SNS topic created to be attached to an existing classic lb logs bucket."
@@ -73,11 +68,6 @@ output "classic_lb_sns_subscription" {
   description = "AWS SNS subscription to Sumo Logic AWS Classic LB source."
 }
 
-output "classic_lb_auto_enable_stack" {
-  value       = local.create_classic_lb_source && var.auto_enable_access_logs != "None" ? module.classic_lb_module["classic_lb_module"].aws_serverlessapplicationrepository_cloudformation_stack : {}
-  description = "AWS CloudFormation stack for Classic LB Auto Enable access logs."
-}
-
 output "cloudwatch_metrics_source" {
   value = local.create_cw_metrics_source && length(local.aws_namespace) > 0 ? toset([
     for namespace in local.aws_namespace : module.cloudwatch_metrics_source_module[namespace].sumologic_source
@@ -115,11 +105,6 @@ output "cloudwatch_logs_lambda_function" {
   description = "AWS Lambda function to send logs to Sumo Logic."
 }
 
-output "cloudwatch_logs_auto_subscribe_stack" {
-  value       = local.create_llf_logs_source && var.auto_enable_logs_subscription != "None" ? module.cloudwatch_logs_lambda_log_forwarder_module["cloudwatch_logs_lambda_log_forwarder_module"].aws_serverlessapplicationrepository_cloudformation_stack : {}
-  description = "AWS CloudFormation stack for Auto Enable logs subscription."
-}
-
 output "kinesis_firehose_for_logs_source" {
   value       = local.create_kf_logs_source ? module.kinesis_firehose_for_logs_module["kinesis_firehose_for_logs_module"].sumologic_source : null
   description = "Sumo Logic Kinesis Firehose for Logs source."
@@ -128,9 +113,4 @@ output "kinesis_firehose_for_logs_source" {
 output "aws_kinesis_firehose_logs_delivery_stream" {
   value       = local.create_kf_logs_source ? module.kinesis_firehose_for_logs_module["kinesis_firehose_for_logs_module"].aws_kinesis_firehose_delivery_stream : null
   description = "AWS Kinesis firehose delivery stream to send logs to Sumo Logic."
-}
-
-output "kinesis_firehose_for_logs_auto_subscribe_stack" {
-  value       = local.create_kf_logs_source && var.auto_enable_logs_subscription != "None" ? module.kinesis_firehose_for_logs_module["kinesis_firehose_for_logs_module"].aws_serverlessapplicationrepository_cloudformation_stack : {}
-  description = "AWS CloudFormation stack for Auto Enable logs subscription."
 }

aws-observability-terraform/source-module/templates/s3_bucket_new_policy.tmpl

@@ -0,0 +1,53 @@
+{
+  "Statement": [
+    {
+      "Sid": "AWSCloudTrailAclCheck",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "cloudtrail.amazonaws.com"
+      },
+      "Action": "s3:GetBucketAcl",
+      "Resource": "arn:${AWS_PARTITION}:s3:::${BUCKET_NAME}"
+    },
+    {
+      "Sid": "AWSCloudTrailWrite",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "cloudtrail.amazonaws.com"
+      },
+      "Action": "s3:PutObject",
+      "Resource": "arn:${AWS_PARTITION}:s3:::${BUCKET_NAME}/*",
+      "Condition": {
+        "StringEquals": {
+          "s3:x-amz-acl": "bucket-owner-full-control"
+        }
+      }
+    },
+    {
+      "Sid": "AWSBucketExistenceCheck",
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "cloudtrail.amazonaws.com"
+      },
+      "Action": "s3:ListBucket",
+      "Resource": "arn:${AWS_PARTITION}:s3:::${BUCKET_NAME}"
+    },
+    {
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "logdelivery.elasticloadbalancing.amazonaws.com"
+      },
+      "Action": "s3:PutObject",
+      "Resource": "arn:${AWS_PARTITION}:s3:::${BUCKET_NAME}/*"
+    },
+    {
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "delivery.logs.amazonaws.com"
+      },
+      "Action": "s3:GetBucketAcl",
+      "Resource": "arn:${AWS_PARTITION}:s3:::${BUCKET_NAME}"
+    }
+  ],
+  "Version": "2008-10-17"
+}

aws-observability-terraform/source-module/versions.tf

@@ -18,5 +18,17 @@ terraform {
       source  = "hashicorp/random"
       version = ">= 3.1.0"
     }
+    lambda-invoke-extension = {
+      source = "registry.terraform.io/local-dev/lambda-invoke-extension"
+      #version = "0.1.0"
+    }
   }
+}
+
+provider "aws" {
+  region = "me-central-1"
+}
+
+provider "lambda-invoke-extension" {
+  region = "me-central-1"
 }