From d8bfbe086dfd6da0635983497f586c75995d9568 Mon Sep 17 00:00:00 2001 From: Quentin Manfroi Date: Thu, 20 Sep 2018 14:30:57 +0200 Subject: [PATCH] MON-32 add missing default --- cloud/aws/elasticache/common/inputs.tf | 44 +++++++++++++++++++++++ cloud/aws/elasticache/memcached/inputs.tf | 6 ++++ cloud/aws/elasticache/redis/inputs.tf | 10 ++++++ 3 files changed, 60 insertions(+) diff --git a/cloud/aws/elasticache/common/inputs.tf b/cloud/aws/elasticache/common/inputs.tf index 1a48f4e..9c9600b 100644 --- a/cloud/aws/elasticache/common/inputs.tf +++ b/cloud/aws/elasticache/common/inputs.tf @@ -33,6 +33,7 @@ variable "filter_tags_custom" { variable "eviction_silenced" { description = "Groups to mute for Elasticache eviction monitor" type = "map" + default = {} } variable "eviction_enabled" { @@ -50,20 +51,25 @@ variable "eviction_extra_tags" { variable "eviction_message" { description = "Custom message for Elasticache eviction monitor" type = "string" + default = "" } variable "eviction_time_aggregator" { description = "Monitor aggregator for Elasticache eviction [available values: min, max or avg]" type = "string" + default = "min" } variable "eviction_timeframe" { description = "Monitor timeframe for Elasticache eviction [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" + default = "last_5m" } variable "max_connection_silenced" { description = "Groups to mute for Elasticache max connection monitor" type = "map" + default = {} } variable "max_connection_enabled" { @@ -81,20 +87,25 @@ variable "max_connection_extra_tags" { variable "max_connection_message" { description = "Custom message for Elasticache max connection monitor" type = "string" + default = "" } variable "max_connection_time_aggregator" { description = "Monitor aggregator for Elasticache max connection [available values: min, max or avg]" type = "string" + default = "max" } variable "max_connection_timeframe" { description = "Monitor timeframe for Elasticache max connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" + default = "last_5m" } variable "no_connection_silenced" { description = "Groups to mute for Elasticache no connection monitor" type = "map" + default = {} } variable "no_connection_enabled" { @@ -112,20 +123,25 @@ variable "no_connection_extra_tags" { variable "no_connection_message" { description = "Custom message for Elasticache no connection monitor" type = "string" + default = "" } variable "no_connection_time_aggregator" { description = "Monitor aggregator for Elasticache no connection [available values: min, max or avg]" type = "string" + default = "min" } variable "no_connection_timeframe" { description = "Monitor timeframe for Elasticache no connection [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" + default = "last_5m" } variable "swap_silenced" { description = "Groups to mute for Elasticache swap monitor" type = "map" + default = {} } variable "swap_enabled" { @@ -143,28 +159,37 @@ variable "swap_extra_tags" { variable "swap_message" { description = "Custom message for Elasticache swap monitor" type = "string" + default = "" } variable "swap_time_aggregator" { description = "Monitor aggregator for Elasticache memcached swap [available values: min, max or avg]" type = "string" + default = "min" } variable "swap_timeframe" { description = "Monitor timeframe for Elasticache swap [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = = "string" + default = "last_5m" } variable "swap_threshold_warning" { description = "Elasticache swap warning threshold in bytes" + type = = "string" + default = 0 } variable "swap_threshold_critical" { description = "Elasticache swap critical threshold in bytes" + type = = "string" + default = 50000000 } variable "free_memory_silenced" { description = "Groups to mute for Elasticache free memory monitor" type = "map" + default = {} } variable "free_memory_enabled" { @@ -182,27 +207,37 @@ variable "free_memory_extra_tags" { variable "free_memory_message" { description = "Custom message for Elasticache free memory monitor" type = "string" + default = "" } variable "free_memory_condition_timeframe" { description = "Monitor condition timeframe for Elasticache free memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" + default = "last_15m" } variable "free_memory_timeframe" { description = "Monitor timeframe for Elasticache free memory [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" + default = "last_15m" } variable "free_memory_threshold_warning" { description = "Elasticache free memory warning threshold in percentage" + type = "string" + default = -50 } variable "free_memory_threshold_critical" { description = "Elasticache free memory critical threshold in percentage" + type = "string" + default = -70 } variable "eviction_growing_silenced" { description = "Groups to mute for Elasticache eviction growing monitor" type = "map" + default = {} } variable "eviction_growing_enabled" { @@ -220,20 +255,29 @@ variable "eviction_growing_extra_tags" { variable "eviction_growing_message" { description = "Custom message for Elasticache eviction growing monitor" type = "string" + default = "" } variable "eviction_growing_condition_timeframe" { description = "Monitor condition timeframe for Elasticache eviction growing [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" + default = "last_5m" } variable "eviction_growing_timeframe" { description = "Monitor timeframe for Elasticache eviction growing [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" + default = "last_5m" } variable "eviction_growing_threshold_warning" { description = "Elasticache eviction growing warning threshold in percentage" + type = "string" + default = 10 } variable "eviction_growing_threshold_critical" { description = "Elasticache eviction growing critical threshold in percentage" + type = "string" + default = 30 } diff --git a/cloud/aws/elasticache/memcached/inputs.tf b/cloud/aws/elasticache/memcached/inputs.tf index fd8330c..4f23bca 100644 --- a/cloud/aws/elasticache/memcached/inputs.tf +++ b/cloud/aws/elasticache/memcached/inputs.tf @@ -56,16 +56,19 @@ variable "get_hits_message" { variable "get_hits_timeframe" { description = "Monitor timeframe for Elasticache memcached get hits [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" default = "last_15m" } variable "get_hits_threshold_warning" { description = "Elasticache memcached get hits warning threshold in percentage" + type = "string" default = 20 } variable "get_hits_threshold_critical" { description = "Elasticache memcached get hits critical threshold in percentage" + type = "string" default = 10 } @@ -101,15 +104,18 @@ variable "cpu_high_time_aggregator" { variable "cpu_high_timeframe" { description = "Monitor timeframe for Elasticache memcached cpu high [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" default = "last_15m" } variable "cpu_high_threshold_warning" { description = "Elasticache memcached cpu high warning threshold in percentage" + type = "string" default = 75 } variable "cpu_high_threshold_critical" { description = "Elasticache memcached cpu high critical threshold in percentage" + type = "string" default = 90 } diff --git a/cloud/aws/elasticache/redis/inputs.tf b/cloud/aws/elasticache/redis/inputs.tf index 4573abf..edfc238 100644 --- a/cloud/aws/elasticache/redis/inputs.tf +++ b/cloud/aws/elasticache/redis/inputs.tf @@ -56,16 +56,19 @@ variable "cache_hits_message" { variable "cache_hits_timeframe" { description = "Monitor timeframe for Elasticache redis cache hits [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" default = "last_15m" } variable "cache_hits_threshold_warning" { description = "Elasticache redis cache hits warning threshold in percentage" + type = "string" default = 20 } variable "cache_hits_threshold_critical" { description = "Elasticache redis cache hits critical threshold in percentage" + type = "string" default = 10 } @@ -101,16 +104,19 @@ variable "cpu_high_time_aggregator" { variable "cpu_high_timeframe" { description = "Monitor timeframe for Elasticache redis cpu high [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" default = "last_15m" } variable "cpu_high_threshold_warning" { description = "Elasticache redis cpu high warning threshold in percentage" + type = "string" default = 75 } variable "cpu_high_threshold_critical" { description = "Elasticache redis cpu high critical threshold in percentage" + type = "string" default = 90 } @@ -146,16 +152,19 @@ variable "replication_lag_time_aggregator" { variable "replication_lag_timeframe" { description = "Monitor timeframe for Elasticache redis replication lag [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" default = "last_5m" } variable "replication_lag_threshold_warning" { description = "Elasticache redis replication lag warning threshold in seconds" + type = "string" default = 0 } variable "replication_lag_threshold_critical" { description = "Elasticache redis replication lag critical threshold in seconds" + type = "string" default = 1 } @@ -185,5 +194,6 @@ variable "commands_message" { variable "commands_timeframe" { description = "Monitor timeframe for Elasticache redis commands [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + type = "string" default = "last_5m" }