Move static resources to infra - part 1

Author: dlzhry2nhs

…/batch_processor_errors_slack_chatbot.tf …/batch_processor_errors_slack_chatbot.tfterraform/batch_processor_errors_slack_chatbot.tf renamed to infra/batch_processor_errors_slack_chatbot.tf terraform/batch_processor_errors_slack_chatbot.tf renamed to infra/batch_processor_errors_slack_chatbot.tf

@@ -306,7 +306,8 @@ resource "aws_cloudwatch_log_metric_filter" "batch_processor_filter_error_logs"
   count          = var.batch_error_notifications_enabled ? 1 : 0
 
   name           = "${local.short_prefix}-BatchProcessorFilterErrorLogsFilter"
-  pattern        = "%\\[ERROR\\]|\\[CRITICAL\\]%"
+  # Ignore errors with the below exception type. This is an expected error which returns items to the queue
+  pattern        = "\"[ERROR]\" -EventAlreadyProcessingForSupplierAndVaccTypeError"
   log_group_name = aws_cloudwatch_log_group.batch_processor_filter_lambda_log_group.name
 
   metric_transformation {
@@ -328,6 +329,6 @@ resource "aws_cloudwatch_metric_alarm" "batch_processor_filter_error_alarm" {
   statistic           = "Sum"
   threshold           = 1
   alarm_description   = "This sets off an alarm for any error logs found in the batch processor filter Lambda function"
-  alarm_actions       = [aws_sns_topic.batch_processor_errors.arn]
+  # alarm_actions       = [data.aws_sns_topic.batch_processor_errors.arn]
   treat_missing_data  = "notBreaching"
 }

…form/batch_processor_errors_sns_topic.tf infra/batch_processor_errors_sns_topic.tfterraform/batch_processor_errors_sns_topic.tf renamed to infra/batch_processor_errors_sns_topic.tf terraform/batch_processor_errors_sns_topic.tf renamed to infra/batch_processor_errors_sns_topic.tf

@@ -362,7 +362,7 @@ resource "aws_cloudwatch_log_metric_filter" "record_processor_task_error_logs" {
   count          = var.batch_error_notifications_enabled ? 1 : 0
 
   name           = "${local.short_prefix}-RecordProcessorTaskErrorLogsFilter"
-  pattern        = "%ERROR:|CRITICAL:%"
+  pattern        = "%ERROR:%"
   log_group_name = aws_cloudwatch_log_group.ecs_task_log_group.name
 
   metric_transformation {
@@ -384,6 +384,6 @@ resource "aws_cloudwatch_metric_alarm" "record_processor_task_error_alarm" {
   statistic           = "Sum"
   threshold           = 1
   alarm_description   = "This sets off an alarm for any error logs found in the record processor ECS task"
-  alarm_actions       = [aws_sns_topic.batch_processor_errors.arn]
+  # alarm_actions       = [data.aws_sns_topic.batch_processor_errors.arn]
   treat_missing_data  = "notBreaching"
 }

terraform/batch_processor_filter_lambda.tf

@@ -323,7 +323,7 @@ resource "aws_cloudwatch_log_metric_filter" "file_name_processor_error_logs" {
   count          = var.batch_error_notifications_enabled ? 1 : 0
 
   name           = "${local.short_prefix}-FilenameProcessorErrorLogsFilter"
-  pattern        = "%\\[ERROR\\]|\\[CRITICAL\\]%"
+  pattern        = "%\\[ERROR\\]%"
   log_group_name = aws_cloudwatch_log_group.file_name_processor_log_group.name
 
   metric_transformation {
@@ -345,6 +345,6 @@ resource "aws_cloudwatch_metric_alarm" "file_name_processor_error_alarm" {
   statistic           = "Sum"
   threshold           = 1
   alarm_description   = "This sets off an alarm for any error logs found in the file name processor Lambda function"
-  alarm_actions       = [aws_sns_topic.batch_processor_errors.arn]
+  # alarm_actions       = [data.aws_sns_topic.batch_processor_errors.arn]
   treat_missing_data  = "notBreaching"
 }

terraform/ecs_batch_processor_config.tf

@@ -106,3 +106,7 @@ data "aws_kms_key" "existing_id_sync_sqs_encryption_key" {
 data "aws_route53_zone" "project_zone" {
   name = local.project_domain_name
 }
+
+# data "aws_sns_topic" "batch_processor_errors" {
+#   name = "${var.environment}-batch-processor-errors"
+# }