Skip to content

Commit 38b550d

Browse files
Fix alert warning (#44)
* making fields optional * Removing redundant local variables * fixing variable name
1 parent 11b59ba commit 38b550d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

monitoring.tf

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
locals {
2-
enable_dead_letters_monitoring = var.enabled_dead_letters_monitoring
3-
dl_warning = var.dl_warning
4-
dl_critical = var.dl_critical
52
dlq_to_monitor = [
63
local.enable_group_events ? var.sqs_fifo_DL_queue_name : var.sqs_queue_name_dl,
74
var.enable_glue_create ? var.glue_create_config.sqs_queue_name_dl : "",
@@ -10,7 +7,7 @@ locals {
107
}
118

129
resource "datadog_monitor" "dead_letters_monitor" {
13-
for_each = local.enable_dead_letters_monitoring ? toset(local.dlq_to_monitor) : []
10+
for_each = var.enabled_dead_letters_monitoring ? toset(local.dlq_to_monitor) : []
1411

1512
type = "metric alert"
1613
name = "${each.key}-monitor"
@@ -22,10 +19,9 @@ resource "datadog_monitor" "dead_letters_monitor" {
2219
query = "avg(last_1h):avg:aws.sqs.approximate_number_of_messages_visible{queuename:${each.key}} > ${var.dl_critical}"
2320

2421
monitor_thresholds {
25-
warning = local.dl_warning
26-
warning_recovery = local.dl_warning - 1
27-
critical = local.dl_critical
28-
critical_recovery = local.dl_critical - 1
22+
warning = var.dl_warning
23+
critical = var.dl_critical
24+
ok = var.dl_ok
2925
}
3026

3127
notify_no_data = false

variables.tf

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,17 +256,21 @@ variable "dl_alert_message" {
256256
}
257257

258258
variable "dl_warning" {
259-
type = number
260-
default = 0
259+
type = any
260+
default = ""
261261
description = "Dead letters warning value"
262262
}
263263

264264
variable "dl_critical" {
265-
type = number
266-
default = 0
265+
type = any
266+
default = ""
267+
description = "Dead letters critical value"
268+
}
269+
variable "dl_ok" {
270+
type = any
271+
default = ""
267272
description = "Dead letters critical value"
268273
}
269-
270274
variable "tags_monitoring" {
271275
type = list(string)
272276
default = []

0 commit comments

Comments
 (0)