From 667ba7ba4dfd5f83389b6512a908e70ac7dac433 Mon Sep 17 00:00:00 2001
From: Kuntal Basu <kuntalb@scribd.com>
Date: Fri, 8 Nov 2024 15:22:03 -0500
Subject: [PATCH 1/3] making fields optional

---
 monitoring.tf |  7 +++----
 variables.tf  | 14 +++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/monitoring.tf b/monitoring.tf
index 40c0db0..137aa34 100644
--- a/monitoring.tf
+++ b/monitoring.tf
@@ -22,10 +22,9 @@ resource "datadog_monitor" "dead_letters_monitor" {
   query = "avg(last_1h):avg:aws.sqs.approximate_number_of_messages_visible{queuename:${each.key}} > ${var.dl_critical}"
 
   monitor_thresholds {
-    warning           = local.dl_warning
-    warning_recovery  = local.dl_warning - 1
-    critical          = local.dl_critical
-    critical_recovery = local.dl_critical - 1
+    warning  = local.dl_warning
+    critical = local.dl_critical
+    ok       = local.dl_ok
   }
 
   notify_no_data    = false
diff --git a/variables.tf b/variables.tf
index 9002619..5dc122d 100644
--- a/variables.tf
+++ b/variables.tf
@@ -256,17 +256,21 @@ variable "dl_alert_message" {
 }
 
 variable "dl_warning" {
-  type        = number
-  default     = 0
+  type        = any
+  default     = ""
   description = "Dead letters warning value"
 }
 
 variable "dl_critical" {
-  type        = number
-  default     = 0
+  type        = any
+  default     = ""
+  description = "Dead letters critical value"
+}
+variable "dl_ok" {
+  type        = any
+  default     = ""
   description = "Dead letters critical value"
 }
-
 variable "tags_monitoring" {
   type        = list(string)
   default     = []

From c436e8016036161aa207351dfd77984059e45e67 Mon Sep 17 00:00:00 2001
From: Kuntal Basu <kuntalb@scribd.com>
Date: Fri, 8 Nov 2024 15:24:53 -0500
Subject: [PATCH 2/3] Removing redundant local variables

---
 monitoring.tf | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/monitoring.tf b/monitoring.tf
index 137aa34..d8e1055 100644
--- a/monitoring.tf
+++ b/monitoring.tf
@@ -1,7 +1,4 @@
 locals {
-  enable_dead_letters_monitoring = var.enabled_dead_letters_monitoring
-  dl_warning                     = var.dl_warning
-  dl_critical                    = var.dl_critical
   dlq_to_monitor = [
     local.enable_group_events ? var.sqs_fifo_DL_queue_name : var.sqs_queue_name_dl,
     var.enable_glue_create ? var.glue_create_config.sqs_queue_name_dl : "",
@@ -10,7 +7,7 @@ locals {
 }
 
 resource "datadog_monitor" "dead_letters_monitor" {
-  for_each = local.enable_dead_letters_monitoring ? toset(local.dlq_to_monitor) : []
+  for_each = var.enable_dead_letters_monitoring ? toset(local.dlq_to_monitor) : []
 
   type = "metric alert"
   name = "${each.key}-monitor"
@@ -22,9 +19,9 @@ resource "datadog_monitor" "dead_letters_monitor" {
   query = "avg(last_1h):avg:aws.sqs.approximate_number_of_messages_visible{queuename:${each.key}} > ${var.dl_critical}"
 
   monitor_thresholds {
-    warning  = local.dl_warning
-    critical = local.dl_critical
-    ok       = local.dl_ok
+    warning  = var.dl_warning
+    critical = var.dl_critical
+    ok       = var.dl_ok
   }
 
   notify_no_data    = false

From d53521e7730aa07006af177b8287527cc46aa756 Mon Sep 17 00:00:00 2001
From: Kuntal Basu <kuntalb@scribd.com>
Date: Fri, 8 Nov 2024 15:26:25 -0500
Subject: [PATCH 3/3] fixing variable name

---
 monitoring.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monitoring.tf b/monitoring.tf
index d8e1055..4e8b44c 100644
--- a/monitoring.tf
+++ b/monitoring.tf
@@ -7,7 +7,7 @@ locals {
 }
 
 resource "datadog_monitor" "dead_letters_monitor" {
-  for_each = var.enable_dead_letters_monitoring ? toset(local.dlq_to_monitor) : []
+  for_each = var.enabled_dead_letters_monitoring ? toset(local.dlq_to_monitor) : []
 
   type = "metric alert"
   name = "${each.key}-monitor"