From fffe483eeb1dd249c423b0ea8139b8f083432928 Mon Sep 17 00:00:00 2001
From: Gauthier <gauthier.ampe@fr.clara.net>
Date: Wed, 10 Oct 2018 15:24:38 +0200
Subject: [PATCH] MON-330 add entityname in group by for servicebus monitor

---
 cloud/azure/servicebus/monitors-service-bus.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud/azure/servicebus/monitors-service-bus.tf b/cloud/azure/servicebus/monitors-service-bus.tf
index 79cd4ae..3dc29ca 100644
--- a/cloud/azure/servicebus/monitors-service-bus.tf
+++ b/cloud/azure/servicebus/monitors-service-bus.tf
@@ -99,8 +99,8 @@ resource "datadog_monitor" "service_bus_server_errors" {
 
   query = <<EOF
       ${var.server_errors_time_aggregator}(${var.server_errors_timeframe}): (
-        default(avg:azure.servicebus_namespaces.server_errors.preview${module.filter-tags.query_alert} by {resource_group,region,name}, 0) /
-        default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name}, 1)
+        default(avg:azure.servicebus_namespaces.server_errors.preview${module.filter-tags.query_alert} by {resource_group,region,name,entityname}, 0) /
+        default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name,entityname}, 1)
       ) * 100 > ${var.server_errors_threshold_critical}
   EOF