From 7e39b2870351284f4b801c6d3b653ec50e876f32 Mon Sep 17 00:00:00 2001 From: Rafael Romero Carmona Date: Thu, 28 Jun 2018 14:11:58 +0200 Subject: [PATCH] MON-32 Updated SWAP default WARNING threshold to 40MB, which is 80% of the 50MB recommendation for alerts according to AWS documentation --- cloud/aws/elasticache/memcached/README.md | 8 +++++--- cloud/aws/elasticache/memcached/inputs.tf | 6 +++--- cloud/aws/elasticache/redis/README.md | 9 ++++++--- cloud/aws/elasticache/redis/inputs.tf | 6 +++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/cloud/aws/elasticache/memcached/README.md b/cloud/aws/elasticache/memcached/README.md index b744370..3b4f2fc 100644 --- a/cloud/aws/elasticache/memcached/README.md +++ b/cloud/aws/elasticache/memcached/README.md @@ -80,8 +80,8 @@ Inputs | no_connection_timeframe | 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`] | string | `last_5m` | no | | swap_message | Custom message for Elasticache swap monitor | string | `` | no | | swap_silenced | Groups to mute for Elasticache swap monitor | map | `` | no | -| swap_threshold_critical | Elasticache swap critical threshold in percentage | string | `50000000` | no | -| swap_threshold_warning | Elasticache swap warning threshold in percentage | string | `0` | no | +| swap_threshold_critical | Elasticache swap critical threshold in Bytes | string | `50000000` | no | +| swap_threshold_warning | Elasticache swap warning threshold in Bytes | string | `40000000` | no | | swap_time_aggregator | Monitor aggregator for Elasticache memcached swap [available values: min, max or avg] | string | `min` | no | | swap_timeframe | Monitor timeframe for Elasticache swap [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | @@ -94,4 +94,6 @@ DataDog documentation: * [https://www.datadoghq.com/blog/monitoring-elasticache-performance-metrics-with-redis-or-memcached/](https://www.datadoghq.com/blog/monitoring-elasticache-performance-metrics-with-redis-or-memcached/) -AWS ElasticSearch Service Instance metrics documentation: [https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html) +AWS ElasticSearch Service Instance metrics documentation: [https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html) + + diff --git a/cloud/aws/elasticache/memcached/inputs.tf b/cloud/aws/elasticache/memcached/inputs.tf index 345e1f5..c0d9413 100644 --- a/cloud/aws/elasticache/memcached/inputs.tf +++ b/cloud/aws/elasticache/memcached/inputs.tf @@ -179,12 +179,12 @@ variable "swap_timeframe" { } variable "swap_threshold_warning" { - description = "Elasticache swap warning threshold in percentage" - default = 0 + description = "Elasticache swap warning threshold in Bytes" + default = 40000000 } variable "swap_threshold_critical" { - description = "Elasticache swap critical threshold in percentage" + description = "Elasticache swap critical threshold in Bytes" default = 50000000 } diff --git a/cloud/aws/elasticache/redis/README.md b/cloud/aws/elasticache/redis/README.md index 7eb58ca..e9a8b76 100644 --- a/cloud/aws/elasticache/redis/README.md +++ b/cloud/aws/elasticache/redis/README.md @@ -90,8 +90,8 @@ Inputs | replication_lag_timeframe | 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`] | string | `last_5m` | no | | swap_message | Custom message for Elasticache swap monitor | string | `` | no | | swap_silenced | Groups to mute for Elasticache swap monitor | map | `` | no | -| swap_threshold_critical | Elasticache swap critical threshold in percentage | string | `50000000` | no | -| swap_threshold_warning | Elasticache swap warning threshold in percentage | string | `0` | no | +| swap_threshold_critical | Elasticache swap critical threshold in Bytes | string | `50000000` | no | +| swap_threshold_warning | Elasticache swap warning threshold in Bytes | string | `40000000` | no | | swap_time_aggregator | Monitor aggregator for Elasticache memcached swap [available values: min, max or avg] | string | `min` | no | | swap_timeframe | Monitor timeframe for Elasticache swap [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | @@ -105,4 +105,7 @@ DataDog documentation: * [https://www.datadoghq.com/dashboards/elasticache-dashboard-redis/](https://www.datadoghq.com/dashboards/elasticache-dashboard-redis/) * [https://www.datadoghq.com/blog/monitoring-elasticache-performance-metrics-with-redis-or-memcached/](https://www.datadoghq.com/blog/monitoring-elasticache-performance-metrics-with-redis-or-memcached/) -AWS ElasticSearch Service Instance metrics documentation: [https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html) +AWS ElasticSearch Service Instance metrics documentation: [https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/elasticache-metricscollected.html) + + + diff --git a/cloud/aws/elasticache/redis/inputs.tf b/cloud/aws/elasticache/redis/inputs.tf index a2baf75..ed7dbaf 100644 --- a/cloud/aws/elasticache/redis/inputs.tf +++ b/cloud/aws/elasticache/redis/inputs.tf @@ -229,12 +229,12 @@ variable "swap_timeframe" { } variable "swap_threshold_warning" { - description = "Elasticache swap warning threshold in percentage" - default = 0 + description = "Elasticache swap warning threshold in Bytes" + default = 40000000 } variable "swap_threshold_critical" { - description = "Elasticache swap critical threshold in percentage" + description = "Elasticache swap critical threshold in Bytes" default = 50000000 }