MON-32 split delay

cloud/aws/elasticache/common/inputs.tf

@@ -5,16 +5,28 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "delay" {
+variable "evaluation_delay" {
   description = "Delay in seconds for the metric evaluation"
+  default     = 900
+}
+
+variable "new_host_delay" {
+  description = "Delay in seconds before monitor new resource"
+  default     = 300
 }
 
 variable "message" {
   description = "Message sent when an alert is triggered"
 }
 
-variable "filter_tags" {
+variable "filter_tags_use_defaults" {
-  description = "Tags used for filtering"
+  description = "Use default filter tags convention"
+  default     = "true"
+}
+
+variable "filter_tags_custom" {
+  description = "Tags used for custom filtering when filter_tags_use_defaults is false"
+  default     = "*"
 }
 
 # Elasticache specific

cloud/aws/elasticache/common/monitors-elasticache.tf

@@ -11,14 +11,14 @@ resource "datadog_monitor" "elasticache_eviction" {
   EOF
 
   notify_no_data      = false
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.eviction_silenced}"
 
@@ -38,14 +38,14 @@ resource "datadog_monitor" "elasticache_max_connection" {
   EOF
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.max_connection_silenced}"
 
@@ -65,14 +65,14 @@ resource "datadog_monitor" "elasticache_no_connection" {
   EOF
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.no_connection_silenced}"
 
@@ -97,14 +97,14 @@ resource "datadog_monitor" "elasticache_swap" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.swap_silenced}"
 
@@ -130,14 +130,14 @@ resource "datadog_monitor" "elasticache_free_memory" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.free_memory_silenced}"
 
@@ -162,14 +162,14 @@ resource "datadog_monitor" "elasticache_eviction_growing" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.eviction_growing_silenced}"
 

cloud/aws/elasticache/memcached/inputs.tf

@@ -5,11 +5,16 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "delay" {
+variable "evaluation_delay" {
   description = "Delay in seconds for the metric evaluation"
   default     = 900
 }
 
+variable "new_host_delay" {
+  description = "Delay in seconds before monitor new resource"
+  default     = 300
+}
+
 variable "message" {
   description = "Message sent when an alert is triggered"
 }

cloud/aws/elasticache/memcached/monitors-memcached.tf

@@ -14,7 +14,7 @@ module "datadog-monitors-aws-elasticache-common" {
   filter_tags = "${data.template_file.filter.rendered}"
   resource    = "memcached"
 
-  delay = "${var.delay}"
+  delay = "${var.evaluation_delay}"
 
   eviction_message         = "${var.eviction_message}"
   eviction_silenced        = "${var.eviction_silenced}"
@@ -77,14 +77,14 @@ resource "datadog_monitor" "memcached_get_hits" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.get_hits_silenced}"
 
@@ -113,14 +113,14 @@ resource "datadog_monitor" "memcached_cpu_high" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.cpu_high_silenced}"
 

cloud/aws/elasticache/redis/inputs.tf

@@ -5,11 +5,16 @@ variable "environment" {
 }
 
 # Global DataDog
-variable "delay" {
+variable "evaluation_delay" {
   description = "Delay in seconds for the metric evaluation"
   default     = 900
 }
 
+variable "new_host_delay" {
+  description = "Delay in seconds before monitor new resource"
+  default     = 300
+}
+
 variable "message" {
   description = "Message sent when an alert is triggered"
 }

cloud/aws/elasticache/redis/monitors-redis.tf

@@ -14,7 +14,7 @@ module "datadog-monitors-aws-elasticache-common" {
   filter_tags = "${data.template_file.filter.rendered}"
   resource    = "redis"
 
-  delay = "${var.delay}"
+  delay = "${var.evaluation_delay}"
 
   eviction_message         = "${var.eviction_message}"
   eviction_silenced        = "${var.eviction_silenced}"
@@ -77,14 +77,14 @@ resource "datadog_monitor" "redis_cache_hits" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.cache_hits_silenced}"
 
@@ -108,14 +108,14 @@ resource "datadog_monitor" "redis_cpu_high" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.cpu_high_silenced}"
 
@@ -144,14 +144,14 @@ resource "datadog_monitor" "redis_replication_lag" {
   }
 
   notify_no_data      = false
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.replication_lag_silenced}"
 
@@ -176,14 +176,14 @@ resource "datadog_monitor" "redis_commands" {
   }
 
   notify_no_data      = true
-  evaluation_delay    = "${var.delay}"
+  evaluation_delay    = "${var.evaluation_delay}"
   renotify_interval   = 0
   notify_audit        = false
   timeout_h           = 0
   include_tags        = true
   locked              = false
   require_full_window = false
-  new_host_delay      = "${var.delay}"
+  new_host_delay      = "${var.new_host_delay}"
 
   silenced = "${var.commands_silenced}"