working with default exports from instances

Author: chpy04

infrastructure/environments/production/main.tf

@@ -34,6 +34,11 @@ provider "aws" {
 locals {
   project_name = "finishline"
   environment  = "production"
+  
+  # Extract ALB ARN suffix for CloudWatch metrics
+  # Full ARN: arn:aws:elasticloadbalancing:region:account:loadbalancer/app/name/id
+  # Suffix needed: app/name/id
+  alb_arn_suffix = try(split("loadbalancer/", data.aws_lb.eb_alb.arn)[1], "")
 }
 
 #############
@@ -253,6 +258,31 @@ resource "aws_sns_topic" "alerts" {
   }
 }
 
+#############
+# Data Source: Fetch Autoscaling Group Name
+#############
+# Query AWS directly to get the actual autoscaling group name
+data "aws_autoscaling_groups" "eb_asg" {
+  filter {
+    name   = "tag:elasticbeanstalk:environment-name"
+    values = [module.elasticbeanstalk.environment_name]
+  }
+
+  depends_on = [module.elasticbeanstalk]
+}
+
+#############
+# Data Source: Fetch Application Load Balancer
+#############
+# Query AWS directly to get the actual ALB for metrics
+data "aws_lb" "eb_alb" {
+  tags = {
+    "elasticbeanstalk:environment-name" = module.elasticbeanstalk.environment_name
+  }
+
+  depends_on = [module.elasticbeanstalk]
+}
+
 #############
 # Monitoring Module
 #############
@@ -263,7 +293,8 @@ module "monitoring" {
   environment                = local.environment
   aws_region                 = var.aws_region
   eb_environment_name        = module.elasticbeanstalk.environment_name
-  eb_autoscaling_group_name  = module.elasticbeanstalk.autoscaling_groups[0]
+  eb_autoscaling_group_name  = data.aws_autoscaling_groups.eb_asg.names[0]
+  alb_arn_suffix             = local.alb_arn_suffix
   rds_instance_id            = module.rds.db_instance_id
   log_retention_days         = 30
   sns_topic_arn              = aws_sns_topic.alerts.arn

infrastructure/modules/monitoring/main.tf

@@ -27,44 +27,24 @@ resource "aws_cloudwatch_dashboard" "main" {
           }
         }
       },
-      # EC2 Memory Utilization
       {
         type = "metric"
         properties = {
           metrics = [
-            ["CWAgent", "mem_used_percent", "AutoScalingGroupName", var.eb_autoscaling_group_name, { stat = "Average" }]
-          ]
-          period = 300
-          stat   = "Average"
-          region = var.aws_region
-          title  = "EC2 Memory Utilization (%)"
-          yAxis = {
-            left = {
-              min = 0
-              max = 100
-            }
-          }
-        }
-      },
-      # EB Request Count
-      {
-        type = "metric"
-        properties = {
-          metrics = [
-            ["AWS/ElasticBeanstalk", "RequestCount", "EnvironmentName", var.eb_environment_name, { stat = "Sum" }]
+            ["AWS/ApplicationELB", "RequestCount", "LoadBalancer", var.alb_arn_suffix, { stat = "Sum" }]
           ]
           period = 300
           stat   = "Sum"
           region = var.aws_region
           title  = "Request Count"
         }
       },
-      # HTTP 5xx Errors
+      # HTTP 5xx Errors (Target Responses)
       {
         type = "metric"
         properties = {
           metrics = [
-            ["AWS/ElasticBeanstalk", "ApplicationRequests5xx", "EnvironmentName", var.eb_environment_name, { stat = "Sum" }]
+            ["AWS/ApplicationELB", "HTTPCode_Target_5XX_Count", "LoadBalancer", var.alb_arn_suffix, { stat = "Sum" }]
           ]
           period = 300
           stat   = "Sum"
@@ -176,68 +156,22 @@ resource "aws_cloudwatch_metric_alarm" "eb_cpu_high" {
   }
 }
 
-# High Memory Alarm
-resource "aws_cloudwatch_metric_alarm" "eb_memory_high" {
-  alarm_name          = "${var.project_name}-${var.environment}-eb-memory-high"
-  comparison_operator = "GreaterThanThreshold"
-  evaluation_periods  = 2
-  metric_name         = "mem_used_percent"
-  namespace           = "CWAgent"
-  period              = 300
-  statistic           = "Average"
-  threshold           = 80
-  alarm_description   = "This metric monitors EC2 memory utilization"
-  alarm_actions       = [var.sns_topic_arn]
-
-  dimensions = {
-    AutoScalingGroupName = var.eb_autoscaling_group_name
-  }
-
-  tags = {
-    Environment = var.environment
-    Project     = var.project_name
-  }
-}
-
-# Critical Memory Alarm
-resource "aws_cloudwatch_metric_alarm" "eb_memory_critical" {
-  alarm_name          = "${var.project_name}-${var.environment}-eb-memory-critical"
-  comparison_operator = "GreaterThanThreshold"
-  evaluation_periods  = 2
-  metric_name         = "mem_used_percent"
-  namespace           = "CWAgent"
-  period              = 300
-  statistic           = "Average"
-  threshold           = 90
-  alarm_description   = "This metric monitors EC2 memory utilization - CRITICAL"
-  alarm_actions       = [var.sns_topic_arn]
-
-  dimensions = {
-    AutoScalingGroupName = var.eb_autoscaling_group_name
-  }
-
-  tags = {
-    Environment = var.environment
-    Project     = var.project_name
-  }
-}
-
 # HTTP 5xx Error Rate Alarm
 # This monitors server errors which indicate application health issues
-resource "aws_cloudwatch_metric_alarm" "eb_http_5xx_errors" {
-  alarm_name          = "${var.project_name}-${var.environment}-eb-http-5xx-high"
+resource "aws_cloudwatch_metric_alarm" "alb_http_5xx_errors" {
+  alarm_name          = "${var.project_name}-${var.environment}-alb-http-5xx-high"
   comparison_operator = "GreaterThanThreshold"
   evaluation_periods  = 2
-  metric_name         = "ApplicationRequests5xx"
-  namespace           = "AWS/ElasticBeanstalk"
+  metric_name         = "HTTPCode_Target_5XX_Count"
+  namespace           = "AWS/ApplicationELB"
   period              = 300
   statistic           = "Sum"
   threshold           = 10  # Alert if more than 10 5xx errors in 5 minutes
   alarm_description   = "High rate of HTTP 5xx errors indicates application issues"
   alarm_actions       = [var.sns_topic_arn]
 
   dimensions = {
-    EnvironmentName = var.eb_environment_name
+    LoadBalancer = var.alb_arn_suffix
   }
 
   tags = {

infrastructure/modules/monitoring/variables.tf

@@ -25,6 +25,11 @@ variable "eb_autoscaling_group_name" {
   type        = string
 }
 
+variable "alb_arn_suffix" {
+  description = "Application Load Balancer ARN suffix for metrics"
+  type        = string
+}
+
 variable "rds_instance_id" {
   description = "RDS instance ID"
   type        = string

infrastructure/modules/rds/main.tf

@@ -80,7 +80,7 @@ resource "aws_cloudwatch_metric_alarm" "database_cpu" {
   alarm_actions       = var.alarm_actions
 
   dimensions = {
-    DBInstanceIdentifier = aws_db_instance.main.id
+    DBInstanceIdentifier = aws_db_instance.main.identifier
   }
 
   tags = {
@@ -102,7 +102,7 @@ resource "aws_cloudwatch_metric_alarm" "database_memory" {
   alarm_actions       = var.alarm_actions
 
   dimensions = {
-    DBInstanceIdentifier = aws_db_instance.main.id
+    DBInstanceIdentifier = aws_db_instance.main.identifier
   }
 
   tags = {
@@ -124,7 +124,7 @@ resource "aws_cloudwatch_metric_alarm" "database_storage" {
   alarm_actions       = var.alarm_actions
 
   dimensions = {
-    DBInstanceIdentifier = aws_db_instance.main.id
+    DBInstanceIdentifier = aws_db_instance.main.identifier
   }
 
   tags = {
@@ -146,7 +146,7 @@ resource "aws_cloudwatch_metric_alarm" "database_connections" {
   alarm_actions       = var.alarm_actions
 
   dimensions = {
-    DBInstanceIdentifier = aws_db_instance.main.id
+    DBInstanceIdentifier = aws_db_instance.main.identifier
   }
 
   tags = {

infrastructure/modules/rds/outputs.tf

@@ -1,7 +1,12 @@
 # RDS Module Outputs
 
 output "db_instance_id" {
-  description = "The RDS instance ID"
+  description = "The RDS instance identifier (for CloudWatch metrics)"
+  value       = aws_db_instance.main.identifier
+}
+
+output "db_instance_resource_id" {
+  description = "The RDS instance resource ID (DbiResourceId)"
   value       = aws_db_instance.main.id
 }