From b3f58734e6819f5346db9b113df04f431c9222e1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Gillier <pierre-yves.gillier@fr.clara.net>
Date: Wed, 22 Jan 2020 17:47:11 +0100
Subject: [PATCH] MON-561 Fix grouping for target groups monitors

---
 cloud/aws/alb/monitors-alb.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cloud/aws/alb/monitors-alb.tf b/cloud/aws/alb/monitors-alb.tf
index d17f1c9..5b0a4cd 100644
--- a/cloud/aws/alb/monitors-alb.tf
+++ b/cloud/aws/alb/monitors-alb.tf
@@ -138,8 +138,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
 
@@ -171,8 +171,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