nginx cloudwatch logs from the nginx_configuration module

Author: pmatsinopoulos

terraform/celo_nginx_configuration.tf

@@ -8,10 +8,14 @@ module "celo_nginx_configuration" {
     module.celo_create_system_d_service
   ]
 
+  project     = var.project
+  environment = var.environment
+
   nginx = {
-    backend            = var.nginx.backend
-    port               = var.nginx.port
-    worker_connections = var.nginx.worker_connections
+    backend                           = var.nginx.backend
+    cloudwatch_logs_retention_in_days = var.nginx.cloudwatch_logs_retention_in_days
+    port                              = var.nginx.port
+    worker_connections                = var.nginx.worker_connections
   }
 
   node = {

terraform/ethereum_nginx_cloudwatch_logs.tf

@@ -8,10 +8,14 @@ module "ethereum_nginx_configuration" {
     terraform_data.ethereum_ec2_install_reth
   ]
 
+  project     = var.project
+  environment = var.environment
+
   nginx = {
-    backend            = var.nginx.backend
-    port               = var.nginx.port
-    worker_connections = var.nginx.worker_connections
+    backend                           = var.nginx.backend
+    cloudwatch_logs_retention_in_days = var.nginx.cloudwatch_logs_retention_in_days
+    port                              = var.nginx.port
+    worker_connections                = var.nginx.worker_connections
   }
 
   node = {

terraform/ethereum_nginx_configuration.tf

@@ -55,8 +55,8 @@ locals {
     chain                          = var.ethereum_node.chain
     lighthouse_log_group_name      = aws_cloudwatch_log_group.ethereum_lighthouse.name
     namespace                      = local.cloudwatch_namespace
-    nginx_log_group_name_access    = aws_cloudwatch_log_group.ethereum_nginx_access.name
-    nginx_log_group_name_error     = aws_cloudwatch_log_group.ethereum_nginx_error.name
+    nginx_log_group_name_access    = module.ethereum_nginx_configuration.cloudwatch_log_group_nginx_access_name
+    nginx_log_group_name_error     = module.ethereum_nginx_configuration.cloudwatch_log_group_nginx_error_name
     reth_log_group_name            = aws_cloudwatch_log_group.ethereum_reth.name
     ssm_agent_log_group_name       = module.ethereum_ssm_agent_cloudwatch.cloudwatch_log_group_ssm_agent_name
     ssm_agent_log_group_name_error = module.ethereum_ssm_agent_cloudwatch.cloudwatch_log_group_ssm_agent_error_name

terraform/locals.tf

@@ -8,10 +8,14 @@ module "nginx_configuration" {
     terraform_data.install_reth
   ]
 
+  project     = var.project
+  environment = var.environment
+
   nginx = {
-    backend            = var.nginx.backend
-    port               = var.nginx.port
-    worker_connections = var.nginx.worker_connections
+    backend                           = var.nginx.backend
+    cloudwatch_logs_retention_in_days = var.nginx.cloudwatch_logs_retention_in_days
+    port                              = var.nginx.port
+    worker_connections                = var.nginx.worker_connections
   }
 
   node = {

terraform/modules/l2_op_stack_chains/nginx_configuration.tf

@@ -2,8 +2,6 @@ resource "aws_cloudwatch_log_group" "nginx_access" {
   name              = "${var.project}-${var.environment}-${var.node_name}-nginx-access"
   retention_in_days = var.nginx.cloudwatch_logs_retention_in_days
 
-  depends_on = [module.nginx_configuration]
-
   tags = {
     "Name" = "${var.project}-${var.environment}-${var.node_name}-nginx-access"
   }
@@ -13,8 +11,6 @@ resource "aws_cloudwatch_log_group" "nginx_error" {
   name              = "${var.project}-${var.environment}-${var.node_name}-nginx-error"
   retention_in_days = var.nginx.cloudwatch_logs_retention_in_days
 
-  depends_on = [module.nginx_configuration]
-
   tags = {
     "Name" = "${var.project}-${var.environment}-${var.node_name}-nginx-error"
   }

…op_stack_chains/nginx_cloudwatch_logs.tf …s/nginx_configuration/cloudwatch_logs.tfterraform/modules/l2_op_stack_chains/nginx_cloudwatch_logs.tf renamed to terraform/modules/nginx_configuration/cloudwatch_logs.tf terraform/modules/l2_op_stack_chains/nginx_cloudwatch_logs.tf renamed to terraform/modules/nginx_configuration/cloudwatch_logs.tf

@@ -0,0 +1,7 @@
+output "cloudwatch_log_group_nginx_access_name" {
+  value = aws_cloudwatch_log_group.nginx_access.name
+}
+
+output "cloudwatch_log_group_nginx_error_name" {
+  value = aws_cloudwatch_log_group.nginx_error.name
+}

terraform/modules/nginx_configuration/outputs.tf

@@ -1,8 +1,17 @@
+variable "project" {
+  type = string
+}
+
+variable "environment" {
+  type = string
+}
+
 variable "nginx" {
   type = object({
-    backend            = string
-    port               = number
-    worker_connections = number
+    backend                           = string
+    cloudwatch_logs_retention_in_days = number
+    port                              = number
+    worker_connections                = number
   })
 }