Missing condition for cluster without ALB

adenot · adenot · commit ede4d2d39bfa · 2020-03-26T13:55:47.000+11:00
diff --git a/cloutwatch-alarms.tf b/cloutwatch-alarms.tf
@@ -59,7 +59,7 @@ resource "aws_cloudwatch_metric_alarm" "asg_high_cpu" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "alb_500_errors" {
-  count = length(var.alarm_sns_topics) > 0 && var.alarm_alb_500_errors_threshold != 0 ? 1 : 0
+  count = var.alb && length(var.alarm_sns_topics) > 0 && var.alarm_alb_500_errors_threshold != 0 ? 1 : 0
 
   alarm_name          = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-alb-500-errors"
   comparison_operator = "GreaterThanOrEqualToThreshold"
@@ -79,7 +79,7 @@ resource "aws_cloudwatch_metric_alarm" "alb_500_errors" {
 }
 
 resource "aws_cloudwatch_metric_alarm" "alb_400_errors" {
-  count = length(var.alarm_sns_topics) > 0 && var.alarm_alb_400_errors_threshold != 0 ? 1 : 0
+  count = var.alb && length(var.alarm_sns_topics) > 0 && var.alarm_alb_400_errors_threshold != 0 ? 1 : 0
 
   alarm_name          = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-alb-400-errors"
   comparison_operator = "GreaterThanOrEqualToThreshold"

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ resource "aws_cloudwatch_metric_alarm" "asg_high_cpu" {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`resource "aws_cloudwatch_metric_alarm" "alb_500_errors" {`
`62`		`- count = length(var.alarm_sns_topics) > 0 && var.alarm_alb_500_errors_threshold != 0 ? 1 : 0`
	`62`	`+ count = var.alb && length(var.alarm_sns_topics) > 0 && var.alarm_alb_500_errors_threshold != 0 ? 1 : 0`
`63`	`63`
`64`	`64`	`alarm_name = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-alb-500-errors"`
`65`	`65`	`comparison_operator = "GreaterThanOrEqualToThreshold"`
`@@ -79,7 +79,7 @@ resource "aws_cloudwatch_metric_alarm" "alb_500_errors" {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`resource "aws_cloudwatch_metric_alarm" "alb_400_errors" {`
`82`		`- count = length(var.alarm_sns_topics) > 0 && var.alarm_alb_400_errors_threshold != 0 ? 1 : 0`
	`82`	`+ count = var.alb && length(var.alarm_sns_topics) > 0 && var.alarm_alb_400_errors_threshold != 0 ? 1 : 0`
`83`	`83`
`84`	`84`	`alarm_name = "${data.aws_iam_account_alias.current.account_alias}-ecs-${var.name}-alb-400-errors"`
`85`	`85`	`comparison_operator = "GreaterThanOrEqualToThreshold"`