From a9ba13e3bd79ba42700f05d4edabe03487836cef Mon Sep 17 00:00:00 2001 From: Stephen Astels Date: Thu, 6 Jun 2024 16:55:35 -0400 Subject: [PATCH] tweaks --- aws/common/outputs.tf | 2 +- aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf | 4 ---- aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf | 1 - env/production/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl | 1 - env/staging/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/aws/common/outputs.tf b/aws/common/outputs.tf index 0e9c9b301..5dd4a245d 100644 --- a/aws/common/outputs.tf +++ b/aws/common/outputs.tf @@ -211,4 +211,4 @@ output "subnet_cidr_blocks" { output "sns_monthly_spend_limit" { value = var.sns_monthly_spend_limit -} \ No newline at end of file +} diff --git a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf index 711be026b..5350a03cc 100644 --- a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf +++ b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf @@ -73,7 +73,6 @@ resource "aws_cloudwatch_metric_alarm" "lambda-image-pinpoint-delivery-receipts- } } - resource "aws_cloudwatch_metric_alarm" "pinpoint-spending-warning" { count = var.cloudwatch_enabled ? 1 : 0 alarm_name = "pinpoint-spending-warning" @@ -105,7 +104,6 @@ resource "aws_cloudwatch_metric_alarm" "pinpoint-spending-critical" { ok_actions = [var.sns_alert_ok_arn] } - resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-success-rate-warning" { count = var.cloudwatch_enabled ? 1 : 0 alarm_name = "pinpoint-sms-success-rate-warning" @@ -117,7 +115,6 @@ resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-success-rate-warning" { alarm_actions = [var.sns_alert_warning_arn] treat_missing_data = "notBreaching" - metric_query { id = "success_rate" expression = "successes / (successes + failures)" @@ -190,7 +187,6 @@ resource "aws_cloudwatch_metric_alarm" "sns-sms-success-rate-canadian-numbers-cr } } - resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-blocked-as-spam-warning" { count = var.cloudwatch_enabled ? 1 : 0 alarm_name = "pinpoint-sms-blocked-as-spam-warning" diff --git a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf index 9623631bc..4603bb439 100644 --- a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf +++ b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf @@ -109,7 +109,6 @@ resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-successes" { } } - resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-failures" { count = var.cloudwatch_enabled ? 1 : 0 name = "pinpoint-sms-failures" diff --git a/env/production/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl b/env/production/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl index 98dd08b5e..795e6df18 100644 --- a/env/production/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl +++ b/env/production/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl @@ -46,5 +46,4 @@ inputs = { pinpoint_to_sqs_sms_callbacks_ecr_repository_url = dependency.ecr.outputs.pinpoint_to_sqs_sms_callbacks_ecr_repository_url pinpoint_to_sqs_sms_callbacks_ecr_arn = dependency.ecr.outputs.pinpoint_to_sqs_sms_callbacks_ecr_arn pinpoint_monthly_spend_limit = dependency.common.outputs.sns_monthly_spend_limit - } diff --git a/env/staging/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl b/env/staging/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl index 852c0cd01..459f20659 100644 --- a/env/staging/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl +++ b/env/staging/pinpoint_to_sqs_sms_callbacks/terragrunt.hcl @@ -41,7 +41,6 @@ inputs = { pinpoint_to_sqs_sms_callbacks_ecr_repository_url = dependency.ecr.outputs.pinpoint_to_sqs_sms_callbacks_ecr_repository_url pinpoint_to_sqs_sms_callbacks_ecr_arn = dependency.ecr.outputs.pinpoint_to_sqs_sms_callbacks_ecr_arn pinpoint_monthly_spend_limit = dependency.common.outputs.sns_monthly_spend_limit - } terraform {