From 8c5be4ad274515a9d5f2d48cc4d5748728eadec2 Mon Sep 17 00:00:00 2001
From: "gauthier.ampe@fr.clara.net" <gauthier.ampe@fr.clara.net>
Date: Thu, 26 Sep 2019 17:46:59 +0200
Subject: [PATCH] MON-366 Improve 4xx and 5xx backend monitor

---
 cloud/azure/app-gateway/monitors-app_gateway.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cloud/azure/app-gateway/monitors-app_gateway.tf b/cloud/azure/app-gateway/monitors-app_gateway.tf
index 49995ab..7ba011f 100644
--- a/cloud/azure/app-gateway/monitors-app_gateway.tf
+++ b/cloud/azure/app-gateway/monitors-app_gateway.tf
@@ -234,8 +234,8 @@ resource "datadog_monitor" "appgateway_backend_http_4xx_errors" {
 
   query = <<EOQ
     ${var.appgateway_backend_http_4xx_errors_time_aggregator}(${var.appgateway_backend_http_4xx_errors_timeframe}):
-      default((default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags-backend-4xx-error.query_alert} by {resource_group,region,name}.as_rate(), 0) /
-      default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(),0)
+      default((default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags-backend-4xx-error.query_alert} by {resource_group,region,name,backendserver}.as_rate(), 0) /
+      default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags.query_alert} by {resource_group,region,name,backendserver}.as_rate(),0)
       * 100),0) > ${var.appgateway_backend_http_4xx_errors_threshold_critical}
 EOQ
 
@@ -269,8 +269,8 @@ resource "datadog_monitor" "appgateway_backend_http_5xx_errors" {
 
   query = <<EOQ
     ${var.appgateway_backend_http_5xx_errors_time_aggregator}(${var.appgateway_backend_http_5xx_errors_timeframe}):
-      default((default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags-backend-5xx-error.query_alert} by {resource_group,region,name}.as_rate(), 0) /
-      default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(),0)
+      default((default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags-backend-5xx-error.query_alert} by {resource_group,region,name,backendserver}.as_rate(), 0) /
+      default(sum:azure.network_applicationgateways.backend_response_status${module.filter-tags.query_alert} by {resource_group,region,name,backendserver}.as_rate(),0)
       * 100),0) > ${var.appgateway_backend_http_5xx_errors_threshold_critical}
 EOQ