From 0593f75d84aa0075d20be296cc7a825476ec449a Mon Sep 17 00:00:00 2001
From: Rafael Romero Carmona <rafael.romero.carmona@fr.clara.net>
Date: Tue, 22 Jan 2019 11:00:38 +0100
Subject: [PATCH] MON-386 Query fixed to avoid error when deploying.

---
 caas/kubernetes/ingress/monitors-ingress.tf | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/caas/kubernetes/ingress/monitors-ingress.tf b/caas/kubernetes/ingress/monitors-ingress.tf
index 5be3c67..cff209d 100644
--- a/caas/kubernetes/ingress/monitors-ingress.tf
+++ b/caas/kubernetes/ingress/monitors-ingress.tf
@@ -4,10 +4,12 @@ resource "datadog_monitor" "nginx_ingress_too_many_5xx" {
   message = "${coalesce(var.ingress_5xx_message, var.message)}"
 
   query = <<EOF
-    ${var.ingress_5xx_time_aggregator}(${var.ingress_5xx_timeframe}): (
-      default(avg:nginx_ingress.nginx_upstream_responses_total{module.filter-tags-5xx.query_alert} by {upstream,ingress_class}.as_rate(), 0) / (
-      default(avg:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count}, 1))
-      * 100 > ${var.ingress_5xx_threshold_critical}
+    ${var.ingress_5xx_time_aggregator}(${var.ingress_5xx_timeframe}):
+      (default(avg:nginx_ingress.nginx_upstream_responses_total${module.filter-tags-5xx.query_alert} by {upstream,ingress_class}.as_rate(), 0))
+      /
+      (default(avg:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count}, 1))
+      * 100
+      > ${var.ingress_5xx_threshold_critical}
   EOF
 
   type = "metric alert"
@@ -38,10 +40,12 @@ resource "datadog_monitor" "nginx_ingress_too_many_4xx" {
   message = "${coalesce(var.ingress_4xx_message, var.message)}"
 
   query = <<EOF
-    ${var.ingress_4xx_time_aggregator}(${var.ingress_4xx_timeframe}): (
-      default(avg:nginx_ingress.nginx_upstream_responses_total{module.filter-tags-4xx.query_alert} by {upstream,ingress_class}.as_rate(), 0) / (
-      default(avg:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count}, 1))
-      * 100 > ${var.ingress_4xx_threshold_critical}
+    ${var.ingress_4xx_time_aggregator}(${var.ingress_4xx_timeframe}):
+    (default(avg:nginx_ingress.nginx_upstream_responses_total${module.filter-tags-4xx.query_alert} by {upstream,ingress_class}.as_rate(), 0))
+    /
+    (default(avg:nginx_ingress.nginx_upstream_requests_total${module.filter-tags.query_alert} by {upstream,ingress_class}.as_rate() + ${var.artificial_requests_count}, 1))
+    * 100
+    > ${var.ingress_4xx_threshold_critical}
   EOF
 
   type = "metric alert"