Merge branch 'MON-561-ALB-targetgroup-grouping' into 'master'

MON-561 Fix grouping for target groups monitors

Closes MON-561

See merge request claranet/pt-monitoring/projects/datadog/terraform/monitors!163
This commit is contained in:
Quentin Manfroi 2020-01-23 16:09:33 +01:00
commit 0c2d256bff

View File

@ -139,8 +139,8 @@ resource "datadog_monitor" "ALB_httpcode_target_5xx" {
query = <<EOQ
${var.httpcode_target_5xx_time_aggregator}(${var.httpcode_target_5xx_timeframe}):
default(avg:aws.applicationelb.httpcode_target_5xx${module.filter-tags.query_alert} by {region,loadbalancer}.as_rate(), 0) / (
default(avg:aws.applicationelb.request_count${module.filter-tags.query_alert} by {region,loadbalancer}.as_rate() + ${var.artificial_requests_count}, 1))
default(avg:aws.applicationelb.httpcode_target_5xx${module.filter-tags.query_alert} by {region,loadbalancer,targetgroup}.as_rate(), 0) / (
default(avg:aws.applicationelb.request_count${module.filter-tags.query_alert} by {region,loadbalancer,targetgroup}.as_rate() + ${var.artificial_requests_count}, 1))
* 100 > ${var.httpcode_target_5xx_threshold_critical}
EOQ
@ -172,8 +172,8 @@ resource "datadog_monitor" "ALB_httpcode_target_4xx" {
query = <<EOQ
${var.httpcode_target_4xx_time_aggregator}(${var.httpcode_target_4xx_timeframe}):
default(avg:aws.applicationelb.httpcode_target_4xx${module.filter-tags.query_alert} by {region,loadbalancer}.as_rate(), 0) / (
default(avg:aws.applicationelb.request_count${module.filter-tags.query_alert} by {region,loadbalancer}.as_rate() + ${var.artificial_requests_count}, 1))
default(avg:aws.applicationelb.httpcode_target_4xx${module.filter-tags.query_alert} by {region,loadbalancer,targetgroup}.as_rate(), 0) / (
default(avg:aws.applicationelb.request_count${module.filter-tags.query_alert} by {region,loadbalancer,targetgroup}.as_rate() + ${var.artificial_requests_count}, 1))
* 100 > ${var.httpcode_target_4xx_threshold_critical}
EOQ