From 6af25e65136b6ea88d2f0f355045db13c1887d97 Mon Sep 17 00:00:00 2001 From: Rafael Romero Carmona Date: Mon, 13 Aug 2018 15:32:13 +0200 Subject: [PATCH] MON-271 Split delay in evaluation and new_host delays --- middleware/redis/README.md | 3 ++- middleware/redis/inputs.tf | 9 +++++-- middleware/redis/monitors-redis.tf | 38 +++++++++++++++--------------- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/middleware/redis/README.md b/middleware/redis/README.md index 9de3971..3e5f7c8 100644 --- a/middleware/redis/README.md +++ b/middleware/redis/README.md @@ -37,8 +37,8 @@ Creates DataDog monitors with the following checks: | blocked_clients_threshold_warning | Blocked clients rate (warning threshold) | string | `10` | no | | blocked_clients_time_aggregator | Monitor aggregator for Redis Blocked clients [available values: min, max or avg] | string | `min` | no | | blocked_clients_timeframe | Monitor timeframe for Redis Blocked clients [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | -| delay | Delay in seconds for the metric evaluation | string | `900` | no | | environment | Architecture environment | string | - | yes | +| evaluation_delay | Delay in seconds for the metric evaluation | string | `15` | no | | evictedkeys_change_message | Custom message for Redis evicted keys monitor | string | `` | no | | evictedkeys_change_silenced | Groups to mute for Redis evicted keys monitor | map | `` | no | | evictedkeys_change_threshold_critical | Evicted keys change (critical threshold) | string | `100` | no | @@ -84,6 +84,7 @@ Creates DataDog monitors with the following checks: | mem_used_time_aggregator | Monitor aggregator for Redis RAM memory used [available values: min, max or avg] | string | `min` | no | | mem_used_timeframe | Monitor timeframe for Redis RAM memory used [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | | message | Message sent when a Redis monitor is triggered | string | - | yes | +| new_host_delay | Delay in seconds for the metric evaluation | string | `300` | no | | not_responding_by | Group by for the service check | string | `"host","redis_host","redis_port"` | no | | not_responding_last | Parameter 'last' for the service check | string | `6` | no | | not_responding_message | Custom message for Redis does not respond monitor | string | `` | no | diff --git a/middleware/redis/inputs.tf b/middleware/redis/inputs.tf index cc52f8b..2c781bc 100644 --- a/middleware/redis/inputs.tf +++ b/middleware/redis/inputs.tf @@ -9,9 +9,14 @@ variable "message" { description = "Message sent when a Redis monitor is triggered" } -variable "delay" { +variable "evaluation_delay" { description = "Delay in seconds for the metric evaluation" - default = 900 + default = 15 +} + +variable "new_host_delay" { + description = "Delay in seconds for the metric evaluation" + default = 300 } variable "filter_tags_use_defaults" { diff --git a/middleware/redis/monitors-redis.tf b/middleware/redis/monitors-redis.tf index 72115f3..c1e3e57 100644 --- a/middleware/redis/monitors-redis.tf +++ b/middleware/redis/monitors-redis.tf @@ -30,14 +30,14 @@ EOL silenced = "${var.evictedkeys_change_silenced}" 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 = true - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = [ "created_by:terraform", @@ -70,14 +70,14 @@ EOL silenced = "${var.expirations_silenced}" 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}" tags = [ "created_by:terraform", @@ -111,14 +111,14 @@ EOL silenced = "${var.blocked_clients_silenced}" 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}" tags = [ "created_by:terraform", @@ -151,14 +151,14 @@ EOL silenced = "${var.keyspace_silenced}" 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}" tags = [ "created_by:terraform", @@ -192,14 +192,14 @@ EOL silenced = "${var.mem_used_silenced}" 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}" tags = [ "created_by:terraform", @@ -232,14 +232,14 @@ EOL silenced = "${var.mem_frag_silenced}" 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}" tags = [ "created_by:terraform", @@ -272,14 +272,14 @@ EOL silenced = "${var.rejected_con_silenced}" 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}" tags = [ "created_by:terraform", @@ -312,14 +312,14 @@ EOL silenced = "${var.latency_silenced}" 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}" tags = [ "created_by:terraform", @@ -354,14 +354,14 @@ EOL silenced = "${var.hitrate_silenced}" 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}" tags = [ "created_by:terraform", @@ -399,7 +399,7 @@ EOL notify_no_data = true renotify_interval = 0 - new_host_delay = "${var.delay}" + new_host_delay = "${var.new_host_delay}" tags = [ "created_by:terraform",