MARIO-2195 make cloudwatch memory check optional

albumprinter · Jul 23, 2019 · 6e9954c · 6e9954c
1 parent 867d9c4
commit 6e9954c
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 3 deletions.
diff --git a/apps/cloudwatch_lambda/cloudwatch.tf b/apps/cloudwatch_lambda/cloudwatch.tf
@@ -31,4 +31,5 @@ resource "aws_cloudwatch_metric_alarm" "lambda_memory_alert" {
   alarm_actions = ["${var.alarm_action_arn}"]
   actions_enabled = "${var.alarm_action_enabled}"
   tags = "${local.tags}"
+  count = "${var.enable_cloudwatch_alarms}"
 }
diff --git a/apps/cloudwatch_lambda/variables.tf b/apps/cloudwatch_lambda/variables.tf
@@ -30,4 +30,5 @@ variable "pattern" {
 }
 variable "alarm_action_enabled" {
   default = "true"
-}
+}
+variable "enable_cloudwatch_alarms" {}
diff --git a/apps/lambda_function/cloudwatch.tf b/apps/lambda_function/cloudwatch.tf
@@ -11,7 +11,8 @@ module "lambda_app_cloudwatch" {
   tags_purpose = "${var.tags_purpose}"
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
-  retention_days = "${var.retention_days}"    
+  retention_days = "${var.retention_days}"
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"    
   providers = {
    aws = "aws"
   }

diff --git a/apps/lambda_function/variables.tf b/apps/lambda_function/variables.tf
@@ -140,4 +140,7 @@ variable "lambda_memory_alert_threshold" {
 
 variable "alarm_action_arn" {
   default = ""
+}
+variable "enable_cloudwatch_alarms" {
+  default = 1
 }
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/cloudwatch.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   }

diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf
@@ -148,4 +148,7 @@ variable "swagger_api_key" {
 
 variable "api_gateway_type" {
   default = "EDGE"
+}
+variable "enable_cloudwatch_alarms" {
+  default = "1"
 }
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/cloudwatch.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   } 

diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc/variables.tf
@@ -141,4 +141,7 @@ variable "swagger_api_key" {
 
 variable "api_gateway_type" {
   default = "EDGE"
+}
+variable "enable_cloudwatch_alarms" {
+  default = "1"
 }
diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/cloudwatch.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/cloudwatch.tf
@@ -11,7 +11,8 @@ module "lambda_app_cloudwatch" {
   tags_domain = "${var.tags_domain}"
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
-  retention_days = "${var.retention_days}"  
+  retention_days = "${var.retention_days}"
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   } 

diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/variables.tf
@@ -144,4 +144,7 @@ variable "swagger_api_key" {
 
 variable "api_gateway_type" {
   default = "EDGE"
+}
+variable "enable_cloudwatch_alarms" {
+  default = 1
 }
diff --git a/...da_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/cloudwatch.tf b/...da_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   } 

diff --git a/...bda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/variables.tf b/...bda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/variables.tf
@@ -156,3 +156,6 @@ variable "swagger_api_key" {
 variable "api_gateway_type" {
   default = "EDGE"
 }
+variable "enable_cloudwatch_alarms" {
+  default = "1"
+}
diff --git a/apps/lambda_function_scheduled_vpc/cloudwatch.tf b/apps/lambda_function_scheduled_vpc/cloudwatch.tf
@@ -24,6 +24,7 @@ module "lambda_app_cloudwatch" {
   tags_purpose = "${var.tags_purpose}"
   description = "${var.description}"  
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   }

diff --git a/apps/lambda_function_scheduled_vpc/variables.tf b/apps/lambda_function_scheduled_vpc/variables.tf
@@ -112,4 +112,7 @@ variable "alarm_action_arn" {
 
 variable "retention_days" {
   default = "30"
+}
+variable "enable_cloudwatch_alarms" {
+  default = "1"
 }
diff --git a/apps/lambda_function_sns/cloudwatch.tf b/apps/lambda_function_sns/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
   retention_days = "${var.retention_days}" 
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   }

diff --git a/apps/lambda_function_sns/variables.tf b/apps/lambda_function_sns/variables.tf
@@ -120,3 +120,6 @@ variable "reserved_concurrent_executions" {
 variable "sns_subscription_filters" {
   default = ""
 }
+variable "enable_cloudwatch_alarms" {
+  default = "1"
+}
diff --git a/apps/lambda_function_sns_no_vpc/cloudwatch.tf b/apps/lambda_function_sns_no_vpc/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   } 

diff --git a/apps/lambda_function_sns_no_vpc/variables.tf b/apps/lambda_function_sns_no_vpc/variables.tf
@@ -126,4 +126,7 @@ variable "reserved_concurrent_executions" {
 }
 variable "sns_subscription_filters" {
   default = ""
+}
+variable "enable_cloudwatch_alarms" {
+  default = "1"
 }
diff --git a/apps/lambda_function_sqs_no_vpc/cloudwatch.tf b/apps/lambda_function_sqs_no_vpc/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   }

diff --git a/apps/lambda_function_sqs_vpc/cloudwatch.tf b/apps/lambda_function_sqs_vpc/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_cost_center = "${var.tags_cost_center}"
   description = "${var.description}"
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
    aws = "aws"
   }

diff --git a/apps/lambda_function_vpc/cloudwatch.tf b/apps/lambda_function_vpc/cloudwatch.tf
@@ -12,6 +12,7 @@ module "lambda_app_cloudwatch" {
   tags_purpose = "${var.tags_purpose}"
   description = "${var.description}"
   retention_days = "${var.retention_days}"  
+  enable_cloudwatch_alarms = "${var.enable_cloudwatch_alarms}"
   providers = {
     aws = "aws"
   }

diff --git a/apps/lambda_function_vpc/variables.tf b/apps/lambda_function_vpc/variables.tf
@@ -149,3 +149,6 @@ variable "alarm_action_arn" {
 variable "reserved_concurrent_executions" {
   default = -1
 }
+variable "enable_cloudwatch_alarms" {
+  default = 1
+}