NRL-693 remove vars and make them defaults

Author: eesa456

terraform/account-wide-infrastructure/dev/cloudwatch.tf

@@ -2,13 +2,7 @@ module "lambda_errors_cloudwatch_metric_alarm_dev" {
   source      = "../modules/lambda-errors-metric-alarm"
   name_prefix = "nhsd-nrlf--dev"
 
-  comparison_operator = "GreaterThanOrEqualToThreshold"
-  evaluation_periods  = 1
-  metric_name         = "Errors"
-  namespace           = "AWS/Lambda"
-  period              = 60
-  statistic           = "Maximum"
-  threshold           = 1
-  unit                = "Count"
-  alarm_description   = "This metric monitors the number of Lambda errors that have occurred"
+  evaluation_periods = 1
+  period             = 60
+  threshold          = 1
 }

terraform/account-wide-infrastructure/modules/lambda-errors-metric-alarm/cloudwatch.tf

@@ -1,17 +1,17 @@
 resource "aws_cloudwatch_metric_alarm" "metric_alarm" {
   alarm_name        = "${var.name_prefix}--lambda-errors-metric-alarm"
-  alarm_description = var.alarm_description
+  alarm_description = "This metric monitors the number of Lambda errors that have occurred"
 
   alarm_actions = [aws_sns_topic.sns_topic.arn]
 
-  comparison_operator = var.comparison_operator
+  comparison_operator = "GreaterThanOrEqualToThreshold"
   evaluation_periods  = var.evaluation_periods
   threshold           = var.threshold
-  unit                = var.unit
+  unit                = "Count"
 
-  metric_name = var.metric_name
-  namespace   = var.namespace
+  metric_name = "Errors"
+  namespace   = "AWS/Lambda"
   period      = var.period
-  statistic   = var.statistic
+  statistic   = "Sum"
 
 }

terraform/account-wide-infrastructure/modules/lambda-errors-metric-alarm/vars.tf

@@ -1,14 +1,3 @@
-variable "alarm_description" {
-  description = "The description for the alarm."
-  type        = string
-  default     = null
-}
-
-variable "comparison_operator" {
-  description = "The arithmetic operation to use when comparing the specified Statistic and Threshold. The specified Statistic value is used as the first operand. Either of the following is supported: GreaterThanOrEqualToThreshold, GreaterThanThreshold, LessThanThreshold, LessThanOrEqualToThreshold."
-  type        = string
-}
-
 variable "evaluation_periods" {
   description = "The number of periods over which data is compared to the specified threshold."
   type        = number
@@ -20,36 +9,12 @@ variable "threshold" {
   default     = null
 }
 
-variable "unit" {
-  description = "The unit for the alarm's associated metric."
-  type        = string
-  default     = null
-}
-
-variable "metric_name" {
-  description = "The name for the alarm's associated metric. See docs for supported metrics."
-  type        = string
-  default     = null
-}
-
-variable "namespace" {
-  description = "The namespace for the alarm's associated metric. See docs for the list of namespaces. See docs for supported metrics."
-  type        = string
-  default     = null
-}
-
 variable "period" {
   description = "The period in seconds over which the specified statistic is applied."
   type        = string
   default     = null
 }
 
-variable "statistic" {
-  description = "The statistic to apply to the alarm's associated metric. Either of the following is supported: SampleCount, Average, Sum, Minimum, Maximum"
-  type        = string
-  default     = null
-}
-
 variable "name_prefix" {
   type        = string
   description = "The prefix to apply to all resources in the module."

terraform/account-wide-infrastructure/prod/cloudwatch.tf

@@ -2,13 +2,7 @@ module "lambda_errors_cloudwatch_metric_alarm_dev" {
   source      = "../modules/lambda-errors-metric-alarm"
   name_prefix = "nhsd-nrlf--prod"
 
-  comparison_operator = "GreaterThanOrEqualToThreshold"
-  evaluation_periods  = 1
-  metric_name         = "Errors"
-  namespace           = "AWS/Lambda"
-  period              = 60
-  statistic           = "Maximum"
-  threshold           = 1
-  unit                = "Count"
-  alarm_description   = "This metric monitors the number of Lambda errors that have occurred"
+  evaluation_periods = 1
+  period             = 60
+  threshold          = 1
 }

terraform/account-wide-infrastructure/test/cloudwatch.tf

@@ -2,13 +2,7 @@ module "lambda_errors_cloudwatch_metric_alarm_dev" {
   source      = "../modules/lambda-errors-metric-alarm"
   name_prefix = "nhsd-nrlf--test"
 
-  comparison_operator = "GreaterThanOrEqualToThreshold"
-  evaluation_periods  = 1
-  metric_name         = "Errors"
-  namespace           = "AWS/Lambda"
-  period              = 60
-  statistic           = "Maximum"
-  threshold           = 1
-  unit                = "Count"
-  alarm_description   = "This metric monitors the number of Lambda errors that have occurred"
+  evaluation_periods = 1
+  period             = 60
+  threshold          = 1
 }