Switch default to arithmetic and better support Down when SQS is 0 wi…

…th LessThanOrEqualToThreshold
appzen-oss · Aug 22, 2019 · 7a76820 · 7a76820
1 parent 63b32b6
commit 7a76820
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/main.tf b/main.tf
@@ -128,7 +128,7 @@ resource "aws_appautoscaling_policy" "scale_down" {
 resource "aws_cloudwatch_metric_alarm" "service_queue_high" {
   alarm_name          = "${module.label.id}-queue-count-high"
   alarm_description   = "This alarm monitors ${var.queue_name} Queue count utilization for scaling up"
-  comparison_operator = "GreaterThanOrEqualToThreshold"
+  comparison_operator = "GreaterThanThreshold"
   evaluation_periods  = "1"
   threshold           = "${var.high_threshold}"
   alarm_actions       = ["${aws_appautoscaling_policy.scale_up.arn}"]
@@ -182,16 +182,11 @@ resource "aws_cloudwatch_metric_alarm" "service_queue_high" {
 resource "aws_cloudwatch_metric_alarm" "service_queue_low" {
   alarm_name          = "${module.label.id}-queue-count-low"
   alarm_description   = "This alarm monitors ${var.queue_name} Queue count utilization for scaling down"
-  comparison_operator = "LessThanThreshold"
+  comparison_operator = "LessThanOrEqualToThreshold"
   evaluation_periods  = "1"
   threshold           = "${var.low_threshold}"
   alarm_actions       = ["${aws_appautoscaling_policy.scale_down.arn}"]
 
-  #  namespace           = "AWS/SQS"
-  #  period              = "60"
-  #  statistic           = "Average"
-  #  metric_name         = "ApproximateNumberOfMessagesVisible"
-
   metric_query {
     id          = "e1"
     expression  = "visible+notvisible"

diff --git a/variables.tf b/variables.tf
@@ -1,6 +1,6 @@
 variable "adjustment_type_down" {
   description = "Autoscaling policy down adjustment type (ChangeInCapacity, PercentChangeInCapacity)"
-  default     = "ChangeInCapacity"
+  default     = "ExactCapacity"
 }
 
 variable "adjustment_type_up" {