Integrated new sam 'log-group-connector' to support auto subscribe lo…

…g group by tags
SumoLogic · Sep 19, 2024 · c7c47b1 · c7c47b1
1 parent 17e7028
commit c7c47b1
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 29 deletions.
diff --git a/aws/cloudwatchlogsforwarder/README.md b/aws/cloudwatchlogsforwarder/README.md
diff --git a/aws/cloudwatchlogsforwarder/cloudwatchlogsforwarder.tf b/aws/cloudwatchlogsforwarder/cloudwatchlogsforwarder.tf
@@ -196,6 +196,7 @@ resource "aws_serverlessapplicationrepository_cloudformation_stack" "auto_enable
     DestinationArnType  = "Lambda"
     DestinationArnValue = aws_lambda_function.logs_lambda_function.arn
     LogGroupPattern     = var.auto_enable_logs_subscription_options.filter
+    LogGroupTags        = var.auto_enable_logs_subscription_options.tags_filter
     UseExistingLogs     = local.auto_enable_existing
   }
 }
diff --git a/aws/cloudwatchlogsforwarder/examples/default/main.tf b/aws/cloudwatchlogsforwarder/examples/default/main.tf
@@ -21,9 +21,10 @@ module "cloudwatch_logs_lambda_log_forwarder_module" {
   }
 
   auto_enable_logs_subscription = "Both"
-  app_semantic_version = "1.0.11"
+  app_semantic_version = "1.0.14"
   auto_enable_logs_subscription_options = {
     filter = "lambda|rds"
+    tags_filter = ""
   }
 }
 

diff --git a/aws/cloudwatchlogsforwarder/variables.tf b/aws/cloudwatchlogsforwarder/variables.tf
@@ -103,14 +103,17 @@ variable "auto_enable_logs_subscription" {
 variable "auto_enable_logs_subscription_options" {
   type = object({
     filter = string
+    tags_filter = string
   })
 
   description = <<EOT
-		filter - Enter regex for matching logGroups. Regex will check for the name. Visit https://help.sumologic.com/03Send-Data/Collect-from-Other-Data-Sources/Auto-Subscribe_AWS_Log_Groups_to_a_Lambda_Function#Configuring_parameters
+		filter - Enter regex for matching logGroups. Regex will check for the name.
+        tags_filter - Enter comma separated key value pairs for filtering logGroups using tags. Ex KeyName1=string,KeyName2=string. This is optional leave it blank if tag based filtering is not needed.
+        Visit https://help.sumologic.com/docs/send-data/collect-from-other-data-sources/autosubscribe-arn-destination/#configuringparameters
 	EOT
 
   default = {
     filter = "lambda"
+    tags_filter = ""
   }
 }
-
diff --git a/aws/kinesisfirehoseforlogs/README.md b/aws/kinesisfirehoseforlogs/README.md
diff --git a/aws/kinesisfirehoseforlogs/examples/default/main.tf b/aws/kinesisfirehoseforlogs/examples/default/main.tf
@@ -24,8 +24,9 @@ module "kinesis_firehose_for_logs_module" {
   }
 
   auto_enable_logs_subscription = "Both"
-  app_semantic_version = "1.0.11"
+  app_semantic_version = "1.0.14"
   auto_enable_logs_subscription_options = {
     filter = "lambda|rds"
+    tags_filter = ""
   }
 }
diff --git a/aws/kinesisfirehoseforlogs/kinesisfirehoseforlogs.tf b/aws/kinesisfirehoseforlogs/kinesisfirehoseforlogs.tf
@@ -178,6 +178,7 @@ resource "aws_serverlessapplicationrepository_cloudformation_stack" "auto_enable
     DestinationArnType  = "Kinesis"
     DestinationArnValue = aws_kinesis_firehose_delivery_stream.logs_delivery_stream.arn
     LogGroupPattern     = var.auto_enable_logs_subscription_options.filter
+    LogGroupTags        = var.auto_enable_logs_subscription_options.tags_filter
     UseExistingLogs     = local.auto_enable_existing
     RoleArn             = aws_iam_role.logs_role.arn
   }

diff --git a/aws/kinesisfirehoseforlogs/variables.tf b/aws/kinesisfirehoseforlogs/variables.tf
@@ -81,14 +81,17 @@ variable "auto_enable_logs_subscription" {
 variable "auto_enable_logs_subscription_options" {
   type = object({
     filter = string
+    tags_filter = string
   })
 
   description = <<EOT
-		filter - Enter regex for matching logGroups. Regex will check for the name. Visit https://help.sumologic.com/03Send-Data/Collect-from-Other-Data-Sources/Auto-Subscribe_AWS_Log_Groups_to_a_Lambda_Function#Configuring_parameters
+		filter - Enter regex for matching logGroups. Regex will check for the name.
+        tags_filter - Enter comma separated key value pairs for filtering logGroups using tags. Ex KeyName1=string,KeyName2=string. This is optional leave it blank if tag based filtering is not needed.
+        Visit https://help.sumologic.com/docs/send-data/collect-from-other-data-sources/autosubscribe-arn-destination/#configuringparameters
 	EOT
 
   default = {
     filter = "lambda"
+    tags_filter = ""
   }
 }
-