From 803f0ed25186f0773539a4692d6ab9300aaf410f Mon Sep 17 00:00:00 2001
From: Boris Rousseau <boris.rousseau@fr.clara.net>
Date: Tue, 6 Mar 2018 09:21:14 +0100
Subject: [PATCH] MON-128: wrong group by, should be loadbalancername

---
 cloud/aws/elb/monitors-elb.tf | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/cloud/aws/elb/monitors-elb.tf b/cloud/aws/elb/monitors-elb.tf
index de58131..70a316e 100644
--- a/cloud/aws/elb/monitors-elb.tf
+++ b/cloud/aws/elb/monitors-elb.tf
@@ -12,7 +12,7 @@ resource "datadog_monitor" "ELB_no_healthy_instances" {
 
   query = <<EOF
     avg(last_5m): (
-      avg:aws.elb.healthy_host_count{${data.template_file.filter.rendered}} by {region,loadbalancer}
+      avg:aws.elb.healthy_host_count{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) < 1
   EOF
 
@@ -38,8 +38,8 @@ resource "datadog_monitor" "ELB_too_much_4xx" {
 
   query = <<EOF
     avg(last_5m): (
-      avg:aws.elb.httpcode_elb_4xx{${data.template_file.filter.rendered}} by {region,loadbalancer} /
-      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}
+      avg:aws.elb.httpcode_elb_4xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
+      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) * 100 > ${var.elb_4xx_threshold_critical}
   EOF
 
@@ -70,8 +70,8 @@ resource "datadog_monitor" "ELB_too_much_5xx" {
 
   query = <<EOF
     avg(last_5m): (
-      avg:aws.elb.httpcode_elb_5xx{${data.template_file.filter.rendered}} by {region,loadbalancer} /
-      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}
+      avg:aws.elb.httpcode_elb_5xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
+      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) * 100 > ${var.elb_5xx_threshold_critical}
   EOF
 
@@ -102,8 +102,8 @@ resource "datadog_monitor" "ELB_too_much_4xx_backend" {
 
   query = <<EOF
     avg(last_5m): (
-      avg:aws.elb.httpcode_backend_4xx{${data.template_file.filter.rendered}} by {region,loadbalancer} /
-      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}
+      avg:aws.elb.httpcode_backend_4xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
+      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) * 100 > ${var.elb_backend_4xx_threshold_critical}
   EOF
 
@@ -134,8 +134,8 @@ resource "datadog_monitor" "ELB_too_much_5xx_backend" {
 
   query = <<EOF
     avg(last_5m): (
-      avg:aws.elb.httpcode_backend_5xx{${data.template_file.filter.rendered}} by {region,loadbalancer} /
-      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancer}
+      avg:aws.elb.httpcode_backend_5xx{${data.template_file.filter.rendered}} by {region,loadbalancername} /
+      avg:aws.elb.request_count{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) * 100 > ${var.elb_backend_5xx_threshold_critical}
   EOF
 
@@ -166,7 +166,7 @@ resource "datadog_monitor" "ELB_backend_latency" {
 
   query = <<EOF
     min(last_5m): (
-      avg:aws.elb.latency{${data.template_file.filter.rendered}} by {region,loadbalancer}
+      avg:aws.elb.latency{${data.template_file.filter.rendered}} by {region,loadbalancername}
     ) > ${var.elb_backend_latency_critical}
   EOF