From df45723478d887c278da14ecf5ace99770e66fc6 Mon Sep 17 00:00:00 2001
From: "gauthier.ampe@fr.clara.net" <gauthier.ampe@fr.clara.net>
Date: Mon, 23 Sep 2019 17:25:52 +0200
Subject: [PATCH] MON-366 Remove instance from query filter

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

diff --git a/cloud/azure/app-gateway/monitors-app_services.tf b/cloud/azure/app-gateway/monitors-app_services.tf
index bdfb76b..f8e1810 100644
--- a/cloud/azure/app-gateway/monitors-app_services.tf
+++ b/cloud/azure/app-gateway/monitors-app_services.tf
@@ -129,8 +129,8 @@ resource "datadog_monitor" "appgateway_http_4xx_errors" {
 
   query = <<EOQ
     ${var.appgateway_http_4xx_errors_time_aggregator}(${var.appgateway_http_4xx_errors_timeframe}):
-      default((default(sum:azure.network_applicationgateways.response_status${module.filter-tags-4xx-error.query_alert} by {resource_group,region,name,instance}.as_rate(), 0) /
-      default(sum:azure.network_applicationgateways.response_status${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(),0)
+      default((default(sum:azure.network_applicationgateways.response_status${module.filter-tags-4xx-error.query_alert} by {resource_group,region,name}.as_rate(), 0) /
+      default(sum:azure.network_applicationgateways.response_status${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(),0)
       * 100),0) > ${var.appgateway_http_4xx_errors_threshold_critical}
 EOQ
 
@@ -164,8 +164,8 @@ resource "datadog_monitor" "appgateway_http_5xx_errors" {
 
   query = <<EOQ
     ${var.appgateway_http_5xx_errors_time_aggregator}(${var.appgateway_http_5xx_errors_timeframe}):
-      default((default(sum:azure.network_applicationgateways.response_status${module.filter-tags-5xx-error.query_alert} by {resource_group,region,name,instance}.as_rate(), 0) /
-      default(sum:azure.network_applicationgateways.response_status${module.filter-tags.query_alert} by {resource_group,region,name,instance}.as_rate(),0)
+      default((default(sum:azure.network_applicationgateways.response_status${module.filter-tags-5xx-error.query_alert} by {resource_group,region,name}.as_rate(), 0) /
+      default(sum:azure.network_applicationgateways.response_status${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(),0)
       * 100),0) > ${var.appgateway_http_5xx_errors_threshold_critical}
 EOQ