Revert "making these conditional for our production rollout. Need the…

…m to work on staging first only for a while"

This reverts commit 621d0fe.

aws/eks/cloudwatch_log.tf

@@ -3,25 +3,25 @@
 ###
 
 resource "aws_cloudwatch_log_group" "notification-canada-ca-eks-cluster-logs" {
-  count             = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count             = var.cloudwatch_enabled ? 1 : 0
   name              = "/aws/eks/${var.eks_cluster_name}/cluster"
   retention_in_days = var.log_retention_period_days
 }
 
 resource "aws_cloudwatch_log_group" "notification-canada-ca-eks-application-logs" {
-  count             = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count             = var.cloudwatch_enabled ? 1 : 0
   name              = "/aws/containerinsights/${var.eks_cluster_name}/application"
   retention_in_days = var.log_retention_period_days
 }
 
 resource "aws_cloudwatch_log_group" "notification-canada-ca-eks-prometheus-logs" {
-  count             = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count             = var.cloudwatch_enabled ? 1 : 0
   name              = "/aws/containerinsights/${var.eks_cluster_name}/prometheus"
   retention_in_days = var.log_retention_period_days
 }
 
 resource "aws_cloudwatch_log_group" "blazer" {
-  count             = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count             = var.cloudwatch_enabled ? 1 : 0
   name              = "blazer"
   retention_in_days = 1827 # 5 years
 }
@@ -31,7 +31,7 @@ resource "aws_cloudwatch_log_group" "blazer" {
 # AWS EKS Cloudwatch log metric filters
 ###
 resource "aws_cloudwatch_log_metric_filter" "web-500-errors" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "web-500-errors"
   pattern        = "\"\\\" 500 \""
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name
@@ -44,7 +44,7 @@ resource "aws_cloudwatch_log_metric_filter" "web-500-errors" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "celery-error" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "celery-error"
   pattern        = "%ERROR/.*Worker|ERROR/MainProcess%"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name
@@ -57,7 +57,7 @@ resource "aws_cloudwatch_log_metric_filter" "celery-error" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "malware-detected" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "malware-detected"
   pattern        = jsonencode("Malicious content detected! Download and attachment failed")
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name
@@ -70,7 +70,7 @@ resource "aws_cloudwatch_log_metric_filter" "malware-detected" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "scanfiles-timeout" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "scanfiles-timeout"
   pattern        = "Malware scan timed out for notification.id"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name
@@ -83,7 +83,7 @@ resource "aws_cloudwatch_log_metric_filter" "scanfiles-timeout" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "bounce-rate-critical" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "bounce-rate-critical"
   pattern        = "critical bounce rate threshold of 10"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name
@@ -96,7 +96,7 @@ resource "aws_cloudwatch_log_metric_filter" "bounce-rate-critical" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "api-evicted-pods" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "api-evicted-pods"
   pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-api-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
@@ -109,7 +109,7 @@ resource "aws_cloudwatch_log_metric_filter" "api-evicted-pods" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "celery-evicted-pods" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "celery-evicted-pods"
   pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-celery-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
@@ -122,7 +122,7 @@ resource "aws_cloudwatch_log_metric_filter" "celery-evicted-pods" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "admin-evicted-pods" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "admin-evicted-pods"
   pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-admin-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
@@ -135,7 +135,7 @@ resource "aws_cloudwatch_log_metric_filter" "admin-evicted-pods" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "document-download-evicted-pods" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "document-download-evicted-pods"
   pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-document-download-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
@@ -148,7 +148,7 @@ resource "aws_cloudwatch_log_metric_filter" "document-download-evicted-pods" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "documentation-evicted-pods" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "documentation-evicted-pods"
   pattern        = "{ ($.reason = \"Evicted\") && ($.kube_pod_status_reason = 1) && ($.pod = \"notify-documentation-*\") }"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-prometheus-logs[0].name
@@ -161,7 +161,7 @@ resource "aws_cloudwatch_log_metric_filter" "documentation-evicted-pods" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "aggregating-queues-are-active" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "aggregating-queues-are-active"
   pattern        = "Batch saving with"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name
@@ -174,7 +174,7 @@ resource "aws_cloudwatch_log_metric_filter" "aggregating-queues-are-active" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "callback-request-failures" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "callback-request-failures"
   pattern        = "send_delivery_status_to_service request failed for notification_id"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name
@@ -187,7 +187,7 @@ resource "aws_cloudwatch_log_metric_filter" "callback-request-failures" {
 }
 
 resource "aws_cloudwatch_log_metric_filter" "throttling-exceptions" {
-  count          = var.cloudwatch_enabled && var.env != "production" ? 1 : 0
+  count          = var.cloudwatch_enabled ? 1 : 0
   name           = "throttling-exceptions"
   pattern        = "ThrottlingException"
   log_group_name = aws_cloudwatch_log_group.notification-canada-ca-eks-application-logs[0].name