From 3ce5b9c829ba641c15b61eb4fb95c2a3f2dbefda Mon Sep 17 00:00:00 2001
From: Laurent Piroelle <laurent.piroelle@fr.clara.net>
Date: Tue, 30 Oct 2018 11:08:34 +0100
Subject: [PATCH] MON-335 Remove useless `default` functions

---
 .../azure/apimanagement/monitors-azure-apimanagement.tf  | 9 +++++----
 cloud/azure/app-services/monitors-app_services.tf        | 2 +-
 cloud/azure/keyvault/monitors-keyvault.tf                | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
index 63bd41d..bc3b63a 100644
--- a/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
+++ b/cloud/azure/apimanagement/monitors-azure-apimanagement.tf
@@ -134,10 +134,11 @@ resource "datadog_monitor" "apimgt_successful_requests" {
 
   query = <<EOF
     ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-    default( (
-      default(avg:azure.apimanagement_service.successful_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) /
-      default(avg:azure.apimanagement_service.total_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0)
-    ) * 100, 100) < ${var.successful_requests_threshold_critical}
+    default(
+      avg:azure.apimanagement_service.successful_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate() /
+      avg:azure.apimanagement_service.total_requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate()
+      * 100
+    , 100) < ${var.successful_requests_threshold_critical}
   EOF
 
   thresholds {
diff --git a/cloud/azure/app-services/monitors-app_services.tf b/cloud/azure/app-services/monitors-app_services.tf
index a70fed5..72e996e 100644
--- a/cloud/azure/app-services/monitors-app_services.tf
+++ b/cloud/azure/app-services/monitors-app_services.tf
@@ -139,7 +139,7 @@ resource "datadog_monitor" "appservices_http_success_status_rate" {
     ${var.http_successful_requests_time_aggregator}(${var.http_successful_requests_timeframe}):
     default( (
       (default(avg:azure.app_services.http2xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) +
-      default(avg:azure.app_services.http3xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) ) /
+       default(avg:azure.app_services.http3xx${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0) ) /
       default(avg:azure.app_services.requests${module.filter-tags.query_alert} by {resource_group,region,name}.as_rate(), 0)
     ) * 100, 100) < ${var.http_successful_requests_threshold_critical}
   EOF
diff --git a/cloud/azure/keyvault/monitors-keyvault.tf b/cloud/azure/keyvault/monitors-keyvault.tf
index c5d5ad1..58d0b3d 100644
--- a/cloud/azure/keyvault/monitors-keyvault.tf
+++ b/cloud/azure/keyvault/monitors-keyvault.tf
@@ -35,10 +35,11 @@ resource "datadog_monitor" "keyvault_api_result" {
 
   query = <<EOF
       ${var.api_result_time_aggregator}(${var.api_result_timeframe}):
-      default( (
-        default(avg:azure.keyvault_vaults.service_api_result${format(module.filter-tags-statuscode.query_alert, "200")} by {name,resource_group,region}.as_rate(), 0) /
-        default(avg:azure.keyvault_vaults.service_api_result${module.filter-tags.query_alert} by {name,resource_group,region}.as_rate(), 0)
-      ) * 100, 100) < ${var.api_result_threshold_critical}
+      default(
+        avg:azure.keyvault_vaults.service_api_result${format(module.filter-tags-statuscode.query_alert, "200")} by {name,resource_group,region}.as_rate() /
+        avg:azure.keyvault_vaults.service_api_result${module.filter-tags.query_alert} by {name,resource_group,region}.as_rate()
+        * 100
+      , 100) < ${var.api_result_threshold_critical}
   EOF
 
   thresholds {