diff --git a/cloud/aws/alb/README.md b/cloud/aws/alb/README.md index d08137f..9aa2189 100644 --- a/cloud/aws/alb/README.md +++ b/cloud/aws/alb/README.md @@ -16,10 +16,10 @@ module "datadog-monitors-cloud-aws-alb" { Creates DataDog monitors with the following checks: +- ALB healthy instances - ALB HTTP code 4xx - ALB HTTP code 5xx - ALB latency -- ALB no healthy instances - ALB target HTTP code 4xx - ALB target HTTP code 5xx diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf index 70631f7..43f6103 100644 --- a/cloud/aws/alb/monitors-alb.tf +++ b/cloud/aws/alb/monitors-alb.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "ALB_no_healthy_instances" { count = "${var.alb_no_healthy_instances_enabled ? 1 : 0}" - name = "[${var.environment}] ALB {{#is_alert}}no healthy instances{{/is_alert}}{{#is_warning}}{{value}}% of healthy instances{{/is_warning}}" + name = "[${var.environment}] ALB healthy instances {{#is_alert}}at 0{{/is_alert}}{{#is_warning}}{{value}}at {{value}}%{{/is_warning}}" type = "metric alert" message = "${coalesce(var.alb_no_healthy_instances_message, var.message)}" @@ -17,7 +17,7 @@ resource "datadog_monitor" "ALB_no_healthy_instances" { thresholds { critical = 1 - warning = 100 + warning = 100 } notify_no_data = true diff --git a/cloud/aws/elb/README.md b/cloud/aws/elb/README.md index 04ff713..b4a8ee9 100644 --- a/cloud/aws/elb/README.md +++ b/cloud/aws/elb/README.md @@ -20,8 +20,8 @@ Creates DataDog monitors with the following checks: - ELB 5xx errors too high - ELB backend 4xx errors too high - ELB backend 5xx errors too high +- ELB healthy instances - ELB latency too high -- ELB no healthy instances ## Inputs diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf index 7f6dccd..60837b5 100644 --- a/cloud/aws/elb/monitors-elb.tf +++ b/cloud/aws/elb/monitors-elb.tf @@ -1,6 +1,6 @@ resource "datadog_monitor" "ELB_no_healthy_instances" { count = "${var.elb_no_healthy_instance_enabled ? 1 : 0}" - name = "[${var.environment}] ELB {{#is_alert}}no healthy instances{{/is_alert}}{{#is_warning}}{{value}}% of healthy instances{{/is_warning}}" + name = "[${var.environment}] ELB healthy instances {{#is_alert}}at 0{{/is_alert}}{{#is_warning}}{{value}}at {{value}}%{{/is_warning}}" message = "${coalesce(var.elb_no_healthy_instance_message, var.message)}" query = <