Skip to content

Commit 5a9cb95

Browse files
kmackowickkmackowick
committed
Add ability to turn off message on AWS monitors
1 parent c4179d3 commit 5a9cb95

File tree

30 files changed

+503
-91
lines changed

30 files changed

+503
-91
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ No inputs.
5252
## Outputs
5353

5454
No outputs.
55-
<!-- END_TF_DOCS -->
55+
<!-- END_TF_DOCS -->

‎aws/alb/main.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ locals {
44
monitor_warn_default_priority = null
55
monitor_nodata_default_priority = null
66

7-
title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}"
7+
title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
88
title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
99
}
1010

@@ -13,7 +13,7 @@ resource "datadog_monitor" "http_5xx_responses" {
1313

1414
name = join("", [local.title_prefix, "ALB 5xx Responses - {{loadbalancer.name}}", local.title_suffix])
1515
include_tags = false
16-
message = local.query_alert_base_message
16+
message = var.http_5xx_responses_use_message ? local.query_alert_base_message : ""
1717
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
1818
type = "query alert"
1919

@@ -43,7 +43,7 @@ resource "datadog_monitor" "http_5xx_tg_responses" {
4343

4444
name = join("", [local.title_prefix, "ALB Target Group 5xx Responses - {{loadbalancer.name}}", local.title_suffix])
4545
include_tags = false
46-
message = local.query_alert_base_message
46+
message = var.http_5xx_tg_responses_use_message ? local.query_alert_base_message : ""
4747
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
4848
type = "query alert"
4949

@@ -74,7 +74,7 @@ resource "datadog_monitor" "latency" {
7474

7575
name = join("", [local.title_prefix, "ALB latency - {{loadbalancer.name}} {{value}}s ", local.title_suffix])
7676
include_tags = false
77-
message = local.query_alert_base_message
77+
message = var.latency_use_message ? local.query_alert_base_message : ""
7878
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
7979
type = "query alert"
8080

@@ -103,7 +103,7 @@ resource "datadog_monitor" "no_healthy_instances" {
103103

104104
name = join("", [local.title_prefix, "ALB available healthy instances - {{loadbalancer.name}} {{value}}%", local.title_suffix])
105105
include_tags = false
106-
message = local.query_alert_base_message
106+
message = var.no_healthy_instances_use_message ? local.query_alert_base_message : ""
107107
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
108108
type = "query alert"
109109

‎aws/alb/variables.tf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ variable "http_5xx_responses_threshold_warning" {
4646
type = number
4747
}
4848

49+
variable "http_5xx_responses_use_message" {
50+
description = "Whether to use the query alert base message"
51+
type = bool
52+
default = false
53+
}
54+
4955
########################################
5056
# HTTP 5xx Response Codes (Target Group)
5157
########################################
@@ -79,6 +85,12 @@ variable "http_5xx_tg_responses_threshold_warning" {
7985
type = number
8086
}
8187

88+
variable "http_5xx_tg_responses_use_message" {
89+
description = "Whether to use the query alert base message"
90+
type = bool
91+
default = false
92+
}
93+
8294
########################################
8395
# Latency Instances
8496
########################################
@@ -112,6 +124,12 @@ variable "latency_threshold_warning" {
112124
type = number
113125
}
114126

127+
variable "latency_use_message" {
128+
description = "Whether to use the query alert base message"
129+
type = bool
130+
default = false
131+
}
132+
115133
########################################
116134
# No Healthy Instances
117135
########################################
@@ -144,3 +162,9 @@ variable "no_healthy_instances_threshold_warning" {
144162
description = "Warning threshold (percentage)"
145163
type = number
146164
}
165+
166+
variable "no_healthy_instances_use_message" {
167+
description = "Whether to use the query alert base message"
168+
type = bool
169+
default = true
170+
}

‎aws/apigateway/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ locals {
44
monitor_warn_default_priority = null
55
monitor_nodata_default_priority = null
66

7-
title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}"
7+
title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
88
title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
99
}
1010

@@ -13,7 +13,7 @@ resource "datadog_monitor" "http_5xx_responses" {
1313

1414
name = join("", [local.title_prefix, "API Gateway 5xx Responses - {{apiname.name}}", local.title_suffix])
1515
include_tags = false
16-
message = local.query_alert_base_message
16+
message = var.http_5xx_responses_use_message ? local.query_alert_base_message : ""
1717
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
1818
type = "query alert"
1919

@@ -43,7 +43,7 @@ resource "datadog_monitor" "latency" {
4343

4444
name = join("", [local.title_prefix, "API Gateway latency - {{apiname.name}}", local.title_suffix])
4545
include_tags = false
46-
message = local.query_alert_base_message
46+
message = var.latency_use_message ? local.query_alert_base_message : ""
4747
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
4848
type = "query alert"
4949

‎aws/apigateway/variables.tf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ variable "http_5xx_responses_threshold_warning" {
4646
type = number
4747
}
4848

49+
variable "http_5xx_responses_use_message" {
50+
description = "Whether to use the query alert base message for HTTP 5xx responses monitor"
51+
type = bool
52+
default = false
53+
}
54+
4955
########################################
5056
# Latency Instances
5157
########################################
@@ -78,3 +84,9 @@ variable "latency_threshold_warning" {
7884
description = "Warning threshold (seconds)"
7985
type = number
8086
}
87+
88+
variable "latency_use_message" {
89+
description = "Whether to use the query alert base message for the latency monitor"
90+
type = bool
91+
default = false
92+
}

‎aws/beanstalk/main.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ locals {
1717

1818
latency_metric = local.latency_metric_map[var.latency_measurement]
1919

20-
title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}"
20+
title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
2121
title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
2222
}
2323

@@ -26,7 +26,7 @@ resource "datadog_monitor" "health" {
2626

2727
name = join("", [local.title_prefix, "Beanstalk Health Events - {{environmentname.name}}", local.title_suffix])
2828
include_tags = false
29-
message = local.query_alert_base_message
29+
message = var.health_use_message ? local.query_alert_base_message : ""
3030
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
3131
type = "metric alert"
3232

@@ -55,7 +55,7 @@ resource "datadog_monitor" "http_5xx_responses" {
5555

5656
name = join("", [local.title_prefix, "ALB 5xx Responses - {{environmentname.name}}", local.title_suffix])
5757
include_tags = false
58-
message = local.query_alert_base_message
58+
message = var.http_5xx_responses_use_message ? local.query_alert_base_message : ""
5959
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
6060
type = "query alert"
6161

@@ -85,7 +85,7 @@ resource "datadog_monitor" "latency" {
8585

8686
name = join("", [local.title_prefix, "Beanstalk Latency - {{environmentname.name}}", local.title_suffix])
8787
include_tags = false
88-
message = local.query_alert_base_message
88+
message = var.latency_use_message ? local.query_alert_base_message : ""
8989
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
9090
type = "query alert"
9191

@@ -113,7 +113,7 @@ resource "datadog_monitor" "root_disk_usage" {
113113

114114
name = join("", [local.title_prefix, "Beanstalk Instance Root Disk Usage - {{environmentname.name}}", local.title_suffix])
115115
include_tags = false
116-
message = local.query_alert_base_message
116+
message = var.root_disk_usage_use_message ? local.query_alert_base_message : ""
117117
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
118118
type = "query alert"
119119

‎aws/beanstalk/variables.tf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ Warning threshold (
6868
END
6969
}
7070

71+
variable "health_use_message" {
72+
description = "Whether to use the query alert base message for health monitor"
73+
type = bool
74+
default = false
75+
}
76+
7177
########################################
7278
# HTTP 5xx Responses
7379
########################################
@@ -101,6 +107,12 @@ variable "http_5xx_responses_threshold_warning" {
101107
type = number
102108
}
103109

110+
variable "http_5xx_responses_use_message" {
111+
description = "Whether to use the query alert base message for HTTP 5xx responses monitor"
112+
type = bool
113+
default = false
114+
}
115+
104116
########################################
105117
# Latency Instances
106118
########################################
@@ -153,6 +165,12 @@ variable "latency_threshold_warning" {
153165
type = number
154166
}
155167

168+
variable "latency_use_message" {
169+
description = "Whether to use the query alert base message for latency monitor"
170+
type = bool
171+
default = false
172+
}
173+
156174
########################################
157175
# Root FS Disk Usage
158176
########################################
@@ -185,3 +203,9 @@ variable "root_disk_usage_threshold_warning" {
185203
description = "Warning threshold (percent)"
186204
type = number
187205
}
206+
207+
variable "root_disk_usage_use_message" {
208+
description = "Whether to use the query alert base message for root disk usage monitor"
209+
type = bool
210+
default = false
211+
}

‎aws/ec2/main.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ locals {
44
monitor_warn_default_priority = null
55
monitor_nodata_default_priority = null
66

7-
title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}"
7+
title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
88
title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
99
}
1010

@@ -13,7 +13,7 @@ resource "datadog_monitor" "status_failed_check" {
1313

1414
name = join("", [local.title_prefix, "EC2 instance status - status check failure - {{name.name}}({{instance_id.name}})", local.title_suffix])
1515
include_tags = false
16-
message = local.query_alert_base_message
16+
message = var.status_failed_check_use_message ? local.query_alert_base_message : ""
1717
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
1818
type = "query alert"
1919

@@ -40,7 +40,7 @@ resource "datadog_monitor" "status_failed_instance" {
4040

4141
name = join("", [local.title_prefix, "EC2 instance status - instance failure - {{name.name}}({{instance_id.name}})", local.title_suffix])
4242
include_tags = false
43-
message = local.query_alert_base_message
43+
message = var.status_failed_instance_use_message ? local.query_alert_base_message : ""
4444
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
4545
type = "query alert"
4646

@@ -67,7 +67,7 @@ resource "datadog_monitor" "status_failed_system" {
6767

6868
name = join("", [local.title_prefix, "EC2 instance status - host failure - {{name.name}}({{instance_id.name}})", local.title_suffix])
6969
include_tags = false
70-
message = local.query_alert_base_message
70+
message = var.status_failed_system_use_message ? local.query_alert_base_message : ""
7171
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
7272
type = "query alert"
7373

@@ -94,7 +94,7 @@ resource "datadog_monitor" "status_failed_volume" {
9494

9595
name = join("", [local.title_prefix, "EC2 instance status - volume failure - {{name.name}}({{instance_id.name}})", local.title_suffix])
9696
include_tags = false
97-
message = local.query_alert_base_message
97+
message = var.status_failed_volume_use_message ? local.query_alert_base_message : ""
9898
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
9999
type = "query alert"
100100

‎aws/ec2/variables.tf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ variable "status_failed_check_no_data_window" {
3434
type = number
3535
}
3636

37+
variable "status_failed_check_use_message" {
38+
description = "Whether to use the query alert base message for ec2 instance status check monitor"
39+
type = bool
40+
default = false
41+
}
42+
3743
########################################
3844
# Instance status check
3945
########################################
@@ -55,6 +61,12 @@ variable "status_failed_instance_no_data_window" {
5561
type = number
5662
}
5763

64+
variable "status_failed_instance_use_message" {
65+
description = "Whether to use the query alert base message for instance status check monitor"
66+
type = bool
67+
default = false
68+
}
69+
5870
#####################################
5971
# system host status check
6072
########################################
@@ -76,6 +88,12 @@ variable "status_failed_system_no_data_window" {
7688
type = number
7789
}
7890

91+
variable "status_failed_system_use_message" {
92+
description = "Whether to use the query alert base message for instance system failure monitor"
93+
type = bool
94+
default = false
95+
}
96+
7997
#####################################
8098
# Attached volume status check
8199
########################################
@@ -96,3 +114,9 @@ variable "status_failed_volume_no_data_window" {
96114
description = "No data threshold (in minutes, 0 to disable)"
97115
type = number
98116
}
117+
118+
variable "status_failed_volume_use_message" {
119+
description = "Whether to use the query alert base message for attached volume status monitor"
120+
type = bool
121+
default = false
122+
}

‎aws/ecs-cluster/main.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
monitor_warn_default_priority = null
66
monitor_nodata_default_priority = null
77

8-
title_prefix = "${var.title_prefix == null ? "" : "[${var.title_prefix}]"}"
8+
title_prefix = var.title_prefix == null ? "" : "[${var.title_prefix}]"
99
title_suffix = var.title_suffix == null ? "" : " (${var.title_suffix})"
1010
}
1111

@@ -14,9 +14,9 @@ resource "datadog_monitor" "agent_status" {
1414

1515
name = join("", [local.title_prefix, "ECS Agent disconnected - {{clustername.name}}", local.title_suffix])
1616
include_tags = false
17-
message = local.query_alert_base_message
17+
message = var.agent_status_use_message ? local.query_alert_base_message : ""
1818
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
19-
type = "service check"
19+
type = "service check"
2020

2121
evaluation_delay = var.evaluation_delay
2222
new_group_delay = var.new_group_delay
@@ -41,7 +41,7 @@ resource "datadog_monitor" "cpu_utilization" {
4141

4242
name = join("", [local.title_prefix, "ECS Cluster CPU Utilization - {{clustername.name}} - {{value}}%", local.title_suffix])
4343
include_tags = false
44-
message = local.query_alert_base_message
44+
message = var.cpu_utilization_use_message ? local.query_alert_base_message : ""
4545
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
4646
type = "query alert"
4747

@@ -70,7 +70,7 @@ resource "datadog_monitor" "cpu_utilization_anomaly" {
7070

7171
name = join("", [local.title_prefix, "ECS cluster CPU utilization anomalous activity - {{clustername.name}}", local.title_suffix])
7272
include_tags = false
73-
message = local.query_alert_base_message
73+
message = var.cpu_utilization_anomaly_use_message ? local.query_alert_base_message : ""
7474
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
7575
type = "query alert"
7676

@@ -106,7 +106,7 @@ resource "datadog_monitor" "memory_reservation" {
106106

107107
name = join("", [local.title_prefix, "ECS Cluster Memory Reservation High - {{clustername.name}} - {{value}}%", local.title_suffix])
108108
include_tags = false
109-
message = local.query_alert_base_message
109+
message = var.memory_reservation_use_message ? local.query_alert_base_message : ""
110110
tags = concat(local.common_tags, var.base_tags, var.additional_tags)
111111
type = "query alert"
112112

0 commit comments

Comments
 (0)