diff --git a/cloud/aws/alb/README.md b/cloud/aws/alb/README.md index e47d1ac..a6dcac0 100644 --- a/cloud/aws/alb/README.md +++ b/cloud/aws/alb/README.md @@ -30,21 +30,33 @@ Inputs | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| +| alb_no_healthy_instances_message | Custom message for ALB no healthy instances monitor | string | `` | no | +| alb_no_healthy_instances_silenced | Groups to mute for ALB no healthy instances monitor | map | `` | no | | delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | -| filter_tags_use_defaults | Use default filter tags convention | string | `*` | no | +| filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | +| httpcode_elb_4xx_message | Custom message for ALB httpcode 4xx monitor | string | `` | no | +| httpcode_elb_4xx_silenced | Groups to mute for ALB httpcode 4xx monitor | map | `` | no | | httpcode_elb_4xx_threshold_critical | loadbalancer 4xx critical threshold in percentage | string | `80` | no | | httpcode_elb_4xx_threshold_warning | loadbalancer 4xx warning threshold in percentage | string | `60` | no | -| httpcode_elb_5xx_threshold_critical | loadbalancer 5xx critical threshold in percentage | string | `80` | no | +| httpcode_elb_5xx_message | Custom message for ALB httpcode 5xx monitor | string | `` | no | +| httpcode_elb_5xx_silenced | Groups to mute for ALB httpcode 5xx monitor | map | `` | no | +| httpcode_elb_5xx_threshold_critical | loadbalancer 5xxcritical threshold in percentage | string | `80` | no | | httpcode_elb_5xx_threshold_warning | loadbalancer 5xx warning threshold in percentage | string | `60` | no | +| httpcode_target_4xx_message | Custom message for ALB target httpcode 4xx monitor | string | `` | no | +| httpcode_target_4xx_silenced | Groups to mute for ALB target httpcode 4xx monitor | map | `` | no | | httpcode_target_4xx_threshold_critical | target 4xx critical threshold in percentage | string | `80` | no | | httpcode_target_4xx_threshold_warning | target 4xx warning threshold in percentage | string | `60` | no | +| httpcode_target_5xx_message | Custom message for ALB target httpcode 5xx monitor | string | `` | no | +| httpcode_target_5xx_silenced | Groups to mute for ALB target httpcode 5xx monitor | map | `` | no | | httpcode_target_5xx_threshold_critical | target 5xx critical threshold in percentage | string | `80` | no | | httpcode_target_5xx_threshold_warning | target 5xx warning threshold in percentage | string | `60` | no | -| message | Message sent when a monitor is triggered | string | - | yes | +| latency_message | Custom message for ALB latency monitor | string | `` | no | +| latency_silenced | Groups to mute for ALB latency monitor | map | `` | no | | latency_threshold_critical | latency critical threshold in milliseconds | string | `1000` | no | | latency_threshold_warning | latency warning threshold in milliseconds | string | `500` | no | +| message | Message sent when a monitor is triggered | string | - | yes | Related documentation --------------------- diff --git a/cloud/aws/alb/inputs.tf b/cloud/aws/alb/inputs.tf index 4320ce2..32a7278 100644 --- a/cloud/aws/alb/inputs.tf +++ b/cloud/aws/alb/inputs.tf @@ -26,6 +26,30 @@ variable "delay" { # Datadog monitors variables +variable "alb_no_healthy_instances_silenced" { + description = "Groups to mute for ALB no healthy instances monitor" + type = "map" + default = {} +} + +variable "alb_no_healthy_instances_message" { + description = "Custom message for ALB no healthy instances monitor" + type = "string" + default = "" +} + +variable "latency_silenced" { + description = "Groups to mute for ALB latency monitor" + type = "map" + default = {} +} + +variable "latency_message" { + description = "Custom message for ALB latency monitor" + type = "string" + default = "" +} + variable "latency_threshold_critical" { default = 1000 description = "latency critical threshold in milliseconds" @@ -36,6 +60,18 @@ variable "latency_threshold_warning" { description = "latency warning threshold in milliseconds" } +variable "httpcode_elb_4xx_silenced" { + description = "Groups to mute for ALB httpcode 4xx monitor" + type = "map" + default = {} +} + +variable "httpcode_elb_4xx_message" { + description = "Custom message for ALB httpcode 4xx monitor" + type = "string" + default = "" +} + variable "httpcode_elb_4xx_threshold_critical" { default = 80 description = "loadbalancer 4xx critical threshold in percentage" @@ -46,6 +82,18 @@ variable "httpcode_elb_4xx_threshold_warning" { description = "loadbalancer 4xx warning threshold in percentage" } +variable "httpcode_target_4xx_silenced" { + description = "Groups to mute for ALB target httpcode 4xx monitor" + type = "map" + default = {} +} + +variable "httpcode_target_4xx_message" { + description = "Custom message for ALB target httpcode 4xx monitor" + type = "string" + default = "" +} + variable "httpcode_target_4xx_threshold_critical" { default = 80 description = "target 4xx critical threshold in percentage" @@ -56,6 +104,18 @@ variable "httpcode_target_4xx_threshold_warning" { description = "target 4xx warning threshold in percentage" } +variable "httpcode_elb_5xx_silenced" { + description = "Groups to mute for ALB httpcode 5xx monitor" + type = "map" + default = {} +} + +variable "httpcode_elb_5xx_message" { + description = "Custom message for ALB httpcode 5xx monitor" + type = "string" + default = "" +} + variable "httpcode_elb_5xx_threshold_critical" { default = 80 description = "loadbalancer 5xxcritical threshold in percentage" @@ -66,6 +126,18 @@ variable "httpcode_elb_5xx_threshold_warning" { description = "loadbalancer 5xx warning threshold in percentage" } +variable "httpcode_target_5xx_silenced" { + description = "Groups to mute for ALB target httpcode 5xx monitor" + type = "map" + default = {} +} + +variable "httpcode_target_5xx_message" { + description = "Custom message for ALB target httpcode 5xx monitor" + type = "string" + default = "" +} + variable "httpcode_target_5xx_threshold_critical" { default = 80 description = "target 5xx critical threshold in percentage" diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf index 8bc7de3..79479b8 100644 --- a/cloud/aws/alb/monitors-alb.tf +++ b/cloud/aws/alb/monitors-alb.tf @@ -11,7 +11,7 @@ data "template_file" "filter" { resource "datadog_monitor" "ALB_no_healthy_instances" { name = "[${var.environment}] ALB no healthy instances" type = "metric alert" - message = "${var.message}" + message = "${coalesce(var.alb_no_healthy_instances_message, var.message)}" query = <