From c791766020320f270b23ee81f51ad5aff581ba1e Mon Sep 17 00:00:00 2001
From: Gauthier <gauthier.ampe@fr.clara.net>
Date: Wed, 10 Oct 2018 13:56:41 +0200
Subject: [PATCH 1/3] MON-330 remove useless as_rate() function from servicebus
 monitors

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

diff --git a/cloud/azure/servicebus/monitors-service-bus.tf b/cloud/azure/servicebus/monitors-service-bus.tf
index 7e7fb2f..79cd4ae 100644
--- a/cloud/azure/servicebus/monitors-service-bus.tf
+++ b/cloud/azure/servicebus/monitors-service-bus.tf
@@ -64,8 +64,8 @@ resource "datadog_monitor" "service_bus_user_errors" {
 
   query = <<EOF
       ${var.user_errors_time_aggregator}(${var.user_errors_timeframe}): (
-        default(avg:azure.servicebus_namespaces.user_errors.preview${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) /
-        default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1)
+        default(avg:azure.servicebus_namespaces.user_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)
       ) * 100 > ${var.user_errors_threshold_critical}
   EOF
 
@@ -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}.as_rate(), 0) /
-        default(avg:azure.servicebus_namespaces.incoming_requests_preview${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 1)
+        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)
       ) * 100 > ${var.server_errors_threshold_critical}
   EOF
 

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 2/3] 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
 

From a280394555537937b57d0736b0a0dd7276ccddde Mon Sep 17 00:00:00 2001
From: Gauthier <gauthier.ampe@fr.clara.net>
Date: Mon, 15 Apr 2019 18:41:31 +0200
Subject: [PATCH 3/3] Add entityname for service_bus_user_errors

---
 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 3dc29ca..ee3e1e6 100644
--- a/cloud/azure/servicebus/monitors-service-bus.tf
+++ b/cloud/azure/servicebus/monitors-service-bus.tf
@@ -64,8 +64,8 @@ resource "datadog_monitor" "service_bus_user_errors" {
 
   query = <<EOF
       ${var.user_errors_time_aggregator}(${var.user_errors_timeframe}): (
-        default(avg:azure.servicebus_namespaces.user_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.user_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.user_errors_threshold_critical}
   EOF