From a1c014cfd443e8e97f0feb6e205da979e978686f Mon Sep 17 00:00:00 2001 From: Alexandre Gaillet Date: Tue, 22 May 2018 14:41:47 +0200 Subject: [PATCH] MON-191 - Merge diff from MON-198 --- cloud/aws/alb/inputs.tf | 12 ++++++------ cloud/aws/apigateway/inputs.tf | 6 +++--- cloud/aws/elb/inputs.tf | 10 +++++----- system/generic/inputs.tf | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cloud/aws/alb/inputs.tf b/cloud/aws/alb/inputs.tf index fdead0b..de2c7cd 100644 --- a/cloud/aws/alb/inputs.tf +++ b/cloud/aws/alb/inputs.tf @@ -47,7 +47,7 @@ variable "alb_no_healthy_instances_aggregator" { variable "alb_no_healthy_instances_timeframe" { description = "Monitor timeframe for ALB no healthy instances [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" type = "string" - default = "last_1m" + default = "last_5m" } variable "latency_silenced" { @@ -65,7 +65,7 @@ variable "latency_message" { variable "latency_aggregator" { description = "Monitor aggregator for ALB latency [available values: min, max, sum or avg]" type = "string" - default = "max" + default = "min" } variable "latency_timeframe" { @@ -99,7 +99,7 @@ variable "httpcode_elb_4xx_message" { variable "httpcode_elb_4xx_aggregator" { description = "Monitor aggregator for ALB httpcode 4xx [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "httpcode_elb_4xx_timeframe" { @@ -133,7 +133,7 @@ variable "httpcode_target_4xx_message" { variable "httpcode_target_4xx_aggregator" { description = "Monitor aggregator for ALB target httpcode 4xx [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "httpcode_target_4xx_timeframe" { @@ -167,7 +167,7 @@ variable "httpcode_elb_5xx_message" { variable "httpcode_elb_5xx_aggregator" { description = "Monitor aggregator for ALB httpcode 5xx [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "httpcode_elb_5xx_timeframe" { @@ -201,7 +201,7 @@ variable "httpcode_target_5xx_message" { variable "httpcode_target_5xx_aggregator" { description = "Monitor aggregator for ALB target httpcode 5xx [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "httpcode_target_5xx_timeframe" { diff --git a/cloud/aws/apigateway/inputs.tf b/cloud/aws/apigateway/inputs.tf index 6890408..461fd1c 100644 --- a/cloud/aws/apigateway/inputs.tf +++ b/cloud/aws/apigateway/inputs.tf @@ -36,7 +36,7 @@ variable "latency_message" { variable "latency_aggregator" { description = "Monitor aggregator for API Gateway latency [available values: min, max, sum or avg]" type = "string" - default = "max" + default = "min" } variable "latency_timeframe" { @@ -74,7 +74,7 @@ variable "http_5xx_requests_message" { variable "http_5xx_requests_aggregator" { description = "Monitor aggregator for API Gateway HTTP 5xx requests [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "http_5xx_requests_timeframe" { @@ -112,7 +112,7 @@ variable "http_4xx_requests_message" { variable "http_4xx_requests_aggregator" { description = "Monitor aggregator for API Gateway HTTP 4xx requests [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "http_4xx_requests_timeframe" { diff --git a/cloud/aws/elb/inputs.tf b/cloud/aws/elb/inputs.tf index 056aeb8..d311ca3 100644 --- a/cloud/aws/elb/inputs.tf +++ b/cloud/aws/elb/inputs.tf @@ -64,7 +64,7 @@ variable "elb_4xx_message" { variable "elb_4xx_aggregator" { description = "Monitor aggregator for ELB 4xx errors [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "elb_4xx_timeframe" { @@ -98,7 +98,7 @@ variable "elb_5xx_message" { variable "elb_5xx_aggregator" { description = "Monitor aggregator for ELB 5xx errors [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "elb_5xx_timeframe" { @@ -132,7 +132,7 @@ variable "elb_backend_4xx_message" { variable "elb_backend_4xx_aggregator" { description = "Monitor aggregator for ELB backend 4xx errors [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "elb_backend_4xx_timeframe" { @@ -166,7 +166,7 @@ variable "elb_backend_5xx_message" { variable "elb_backend_5xx_aggregator" { description = "Monitor aggregator for ELB backend 5xx errors [available values: min, max, sum or avg]" type = "string" - default = "min" + default = "sum" } variable "elb_backend_5xx_timeframe" { @@ -200,7 +200,7 @@ variable "elb_backend_latency_message" { variable "elb_backend_latency_aggregator" { description = "Monitor aggregator for ELB backend latency [available values: min, max, sum or avg]" type = "string" - default = "max" + default = "min" } variable "elb_backend_latency_timeframe" { diff --git a/system/generic/inputs.tf b/system/generic/inputs.tf index 8765a36..fec8a81 100644 --- a/system/generic/inputs.tf +++ b/system/generic/inputs.tf @@ -47,7 +47,7 @@ variable "cpu_high_aggregator" { variable "cpu_high_timeframe" { description = "Monitor timeframe for 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_5m" + default = "last_10m" } variable "cpu_high_threshold_warning" { @@ -182,7 +182,7 @@ variable "free_memory_aggregator" { variable "free_memory_timeframe" { description = "Monitor timeframe for 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_1m" + default = "last_15m" } variable "free_memory_threshold_warning" {