From 33421acc3e498055d62ca43310fb8e84bf490bfb Mon Sep 17 00:00:00 2001
From: "gauthier.ampe@fr.clara.net" <gauthier.ampe@fr.clara.net>
Date: Tue, 30 Jul 2019 09:47:42 +0200
Subject: [PATCH] AZ-97 improve requests_error monitor

---
 cloud/azure/storage/monitors-azure-storage.tf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index 9579999..926c18d 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -39,9 +39,9 @@ resource "datadog_monitor" "blobservices_requests_error" {
 
   query = <<EOQ
       ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-        100-(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-success.query_alert} by {name}.as_count() /
-        sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_count()
-      * 100) > ${var.successful_storage_requests_threshold_critical}
+        default(100-(default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-success.query_alert} by {name}.as_rate(),0) /
+        default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+      * 100),0) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
 
@@ -77,9 +77,9 @@ resource "datadog_monitor" "fileservices_requests_error" {
 
 query = <<EOQ
       ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-        100-(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-success.query_alert} by {name}.as_count() /
-        sum:azure.azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_count()
-      * 100) > ${var.successful_storage_requests_threshold_critical}
+        default(100-(default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags-success.query_alert} by {name}.as_rate(),0) /
+        default(sum:azure.storage_storageaccounts_fileservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+      * 100),0) > ${var.successful_storage_requests_threshold_critical}
 EOQ
 
 
@@ -115,9 +115,9 @@ resource "datadog_monitor" "queueservices_requests_error" {
 
 query = <<EOQ
       ${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
-        100-(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-success.query_alert} by {name}.as_count() /
-        sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_count()
-      * 100) > ${var.successful_storage_requests_threshold_critical}
+        default(100-(default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags-success.query_alert} by {name}.as_rate(),0 /
+        default(sum:azure.storage_storageaccounts_queueservices.transactions${module.filter-tags.query_alert} by {name}.as_rate(),0)
+      * 100),0) > ${var.successful_storage_requests_threshold_critical}
 EOQ