From d8d9e2df03d04d1e35dee38df0cb756965599934 Mon Sep 17 00:00:00 2001
From: Laurent Piroelle <laurent.piroelle@fr.clara.net>
Date: Thu, 15 Mar 2018 18:50:24 +0100
Subject: [PATCH] MON-79 Improve Azure Storage No Data management

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

diff --git a/cloud/azure/storage/monitors-azure-storage.tf b/cloud/azure/storage/monitors-azure-storage.tf
index df5f5c4..0435913 100644
--- a/cloud/azure/storage/monitors-azure-storage.tf
+++ b/cloud/azure/storage/monitors-azure-storage.tf
@@ -11,9 +11,9 @@ resource "datadog_monitor" "availability" {
   message = "${coalesce(var.availability_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.availability{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) < ${var.availability_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.availability{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    100)) < ${var.availability_threshold_critical}
 EOF
 
   thresholds {
@@ -26,7 +26,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -43,9 +43,9 @@ resource "datadog_monitor" "successful_requests" {
   message = "${coalesce(var.successful_requests_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.percent_success{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) < ${var.successful_requests_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.percent_success{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    100)) < ${var.successful_requests_threshold_critical}
 EOF
 
   thresholds {
@@ -58,7 +58,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -75,9 +75,9 @@ resource "datadog_monitor" "latency" {
   message = "${coalesce(var.latency_message, var.message)}"
 
   query = <<EOF
-    max(last_5m): (
-      avg:azure.storage.average_e2_e_latency{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) > ${var.latency_threshold_critical}
+    min(last_5m): (default(
+      avg:azure.storage.average_e2_e_latency{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    0)) > ${var.latency_threshold_critical}
 EOF
 
   thresholds {
@@ -90,7 +90,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -107,9 +107,9 @@ resource "datadog_monitor" "timeout_error_requests" {
   message = "${coalesce(var.timeout_error_requests_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.percent_timeout_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) > ${var.timeout_error_requests_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.percent_timeout_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    0)) > ${var.timeout_error_requests_threshold_critical}
 EOF
 
   thresholds {
@@ -122,7 +122,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -139,9 +139,9 @@ resource "datadog_monitor" "network_error_requests" {
   message = "${coalesce(var.network_error_requests_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.percent_network_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) > ${var.network_error_requests_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.percent_network_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    0)) > ${var.network_error_requests_threshold_critical}
 EOF
 
   thresholds {
@@ -154,7 +154,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -171,9 +171,9 @@ resource "datadog_monitor" "throttling_error_requests" {
   message = "${coalesce(var.throttling_error_requests_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.percent_throttling_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) > ${var.throttling_error_requests_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.percent_throttling_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    0)) > ${var.throttling_error_requests_threshold_critical}
 EOF
 
   thresholds {
@@ -186,7 +186,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -203,9 +203,9 @@ resource "datadog_monitor" "server_other_error_requests" {
   message = "${coalesce(var.server_other_error_requests_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.percent_server_other_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) > ${var.server_other_error_requests_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.percent_server_other_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    0)) > ${var.server_other_error_requests_threshold_critical}
 EOF
 
   thresholds {
@@ -218,7 +218,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -235,9 +235,9 @@ resource "datadog_monitor" "client_other_error_requests" {
   message = "${coalesce(var.client_other_error_requests_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.percent_client_other_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) > ${var.client_other_error_requests_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.percent_client_other_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    0)) > ${var.client_other_error_requests_threshold_critical}
 EOF
 
   thresholds {
@@ -250,7 +250,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
@@ -267,9 +267,9 @@ resource "datadog_monitor" "authorization_error_requests" {
   message = "${coalesce(var.authorization_error_requests_message, var.message)}"
 
   query = <<EOF
-    avg(last_5m): (
-      avg:azure.storage.percent_authorization_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name}
-    ) > ${var.authorization_error_requests_threshold_critical}
+    avg(last_5m): (default(
+      avg:azure.storage.percent_authorization_error{${data.template_file.filter.rendered},transaction_type:all} by {resource_group,storage_type,name},
+    0)) > ${var.authorization_error_requests_threshold_critical}
 EOF
 
   thresholds {
@@ -282,7 +282,7 @@ EOF
   type                = "metric alert"
   notify_no_data      = false
   notify_audit        = false
-  timeout_h           = 1
+  timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false