From e989ea57c44d548e9ddf566a06124efb8337fe96 Mon Sep 17 00:00:00 2001
From: Rafael Romero Carmona <rafael.romero.carmona@fr.clara.net>
Date: Thu, 29 Aug 2019 16:26:18 +0100
Subject: [PATCH] MON-400 All improvents from the MR added

---
 cloud/gcp/pubsub/subscription/monitors-subscription.tf | 6 +++---
 cloud/gcp/pubsub/topic/inputs.tf                       | 2 +-
 cloud/gcp/pubsub/topic/monitors-topics.tf              | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cloud/gcp/pubsub/subscription/monitors-subscription.tf b/cloud/gcp/pubsub/subscription/monitors-subscription.tf
index 5ce3e8f..19b9d02 100644
--- a/cloud/gcp/pubsub/subscription/monitors-subscription.tf
+++ b/cloud/gcp/pubsub/subscription/monitors-subscription.tf
@@ -7,7 +7,7 @@
 #
 resource "datadog_monitor" "oldest_unacked_message_age" {
   count   = var.oldest_unacked_message_age_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Pub/Sub Subscription Oldest unacked message is {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}s old"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Pub/Sub Subscription Oldest unacknowledged message {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
   message = coalesce(var.oldest_unacked_message_age_message, var.message)
   type    = "query alert"
 
@@ -48,7 +48,7 @@ EOQ
 #
 resource "datadog_monitor" "subscription_push_latency" {
   count   = var.subscription_push_latency_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Pub/Sub Subscription Latency on push endpoint {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Pub/Sub Subscription Latency on push endpoint {{#is_alert}}{{{comparator}}} {{threshold}}s ({{value}}s){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}s ({{value}}s){{/is_warning}}"
   message = coalesce(var.subscription_push_latency_message, var.message)
   type    = "query alert"
 
@@ -85,7 +85,7 @@ EOQ
 #
 resource "datadog_monitor" "subscription_push_latency_anomaly" {
   count   = var.subscription_push_latency_anomaly_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Pub/Sub Subscription Anomaly latency on push endpoint {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Pub/Sub Subscription Latency on push endpoint changed abnormally {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = coalesce(var.subscription_push_latency_anomaly_message, var.message)
   type    = "query alert"
 
diff --git a/cloud/gcp/pubsub/topic/inputs.tf b/cloud/gcp/pubsub/topic/inputs.tf
index 5908214..11cf64e 100644
--- a/cloud/gcp/pubsub/topic/inputs.tf
+++ b/cloud/gcp/pubsub/topic/inputs.tf
@@ -105,7 +105,7 @@ variable "unavailable_sending_operations_count_threshold_critical" {
 variable "unavailable_sending_operations_count_enabled" {
   description = "Flag to enable GCP Pub/Sub Unavailable Sending Operations Count monitor"
   type        = string
-  default     = "true"
+  default     = "false"
 }
 
 variable "unavailable_sending_operations_count_extra_tags" {
diff --git a/cloud/gcp/pubsub/topic/monitors-topics.tf b/cloud/gcp/pubsub/topic/monitors-topics.tf
index d65e682..e698c1d 100644
--- a/cloud/gcp/pubsub/topic/monitors-topics.tf
+++ b/cloud/gcp/pubsub/topic/monitors-topics.tf
@@ -3,7 +3,7 @@
 #
 resource "datadog_monitor" "sending_operations_count" {
   count   = var.sending_operations_count_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Pub/Sub Topic sending messages operations {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Pub/Sub Topic sending messages operations {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = coalesce(var.sending_operations_count_message, var.message)
   type    = "query alert"
 
@@ -39,7 +39,7 @@ EOQ
 #
 resource "datadog_monitor" "unavailable_sending_operations_count" {
   count   = var.unavailable_sending_operations_count_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Pub/Sub Topic sending messages with result unavailable {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Pub/Sub Topic sending messages with result unavailable {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = coalesce(var.unavailable_sending_operations_count_message, var.message)
   type    = "query alert"
 
@@ -76,7 +76,7 @@ EOQ
 #
 resource "datadog_monitor" "unavailable_sending_operations_ratio" {
   count   = var.unavailable_sending_operations_ratio_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] GCP Pub/Sub Topic ratio of sending messages with result unavailable {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Pub/Sub Topic ratio of sending messages with result unavailable {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = coalesce(var.unavailable_sending_operations_ratio_message, var.message)
   type    = "query alert"