Fix grafana health check point and port for ECS

Author: mehr74

ops/ecs/modules/cluster/main.tf

@@ -29,9 +29,9 @@ resource "aws_autoscaling_group" "ecs_instance_asg" {
   launch_configuration = aws_launch_configuration.ecs_cfg.name
 
   vpc_zone_identifier = var.vpc_public_subnets
-  min_size            = 1
-  max_size            = 1
-  desired_capacity    = 1
+  min_size            = 2
+  max_size            = 2
+  desired_capacity    = 2
 
   tag {
     key                 = "AmazonECSManaged"

ops/ecs/modules/grafana/main.tf

@@ -15,16 +15,17 @@ resource "aws_ecs_task_definition" "task" {
   family                   = "grafana"
   network_mode             = "awsvpc"
   requires_compatibilities = ["EC2"]
-  cpu                      = 256 
+  cpu                      = 512
   memory                   = 512
   execution_role_arn       = aws_iam_role.execution_role.arn
 
   container_definitions = jsonencode([
     {
       name : "grafana",
       image : data.aws_ecr_repository.repository.repository_url,
+      container_name: "grafana",
       essential : true,
-      cpu : 256,
+      cpu : 512,
       memory : 512,
       environment : [
         {
@@ -54,8 +55,8 @@ resource "aws_ecs_task_definition" "task" {
       },
       portMappings : [
         {
-          containerPort : 8000,
-          hostPort : 8000,
+          containerPort : 3000,
+          hostPort : 3000,
         },
       ],
     },
@@ -94,7 +95,7 @@ resource "aws_ecs_service" "service" {
   load_balancer {
     target_group_arn = aws_lb_target_group.target_group.arn
     container_name   = "grafana"
-    container_port   = 8000
+    container_port   = 3000
   }
 
   service_registries {
@@ -145,13 +146,13 @@ resource "aws_lb_listener" "https" {
 
 resource "aws_lb_target_group" "target_group" {
   name        = "alb-tg"
-  port        = 8000
+  port        = 3000
   protocol    = "HTTP"
   vpc_id      = var.vpc_id
   target_type = "ip"
 
   health_check {
-    path                = "/"
+    path                = "/api/health"
     protocol            = "HTTP"
     port                = "traffic-port"
     healthy_threshold   = 2

ops/ecs/modules/postgres/main.tf

@@ -15,17 +15,26 @@ resource "aws_ecs_task_definition" "task" {
   family                   = "postgres"
   network_mode             = "awsvpc"
   requires_compatibilities = ["EC2"]
-  cpu                      = 256 
-  memory                   = 512
+  cpu                      = 512
+  memory                   = 1024
   execution_role_arn       = aws_iam_role.execution_role.arn
 
   container_definitions = jsonencode([
     {
       name : "postgres",
       image : data.aws_ecr_repository.repository.repository_url,
+      container_name: "postgres",
+      container_port: 5432,
       essential : true,
-      cpu : 256,
-      memory : 512,
+      cpu : 512,
+      memory : 1024,
+      portMappings : [
+        {
+          containerPort : 5432,
+          hostPort      : 5432,
+          protocol      : "tcp"
+        }
+      ],
       logConfiguration : {
         logDriver : "awslogs",
         options : {

ops/ecs/modules/vpc/vpc.tf

@@ -32,13 +32,6 @@ resource "aws_security_group" "sg" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  ingress {
-    from_port   = 2049
-    to_port     = 2049
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
   ingress {
     description = "Allow HTTP traffic"
     from_port   = 80
@@ -57,8 +50,8 @@ resource "aws_security_group" "sg" {
 
   ingress {
     description = "Allow HTTP traffic"
-    from_port   = 8000
-    to_port     = 8000
+    from_port   = 3000
+    to_port     = 3000
     protocol    = "tcp"
     cidr_blocks = ["0.0.0.0/0"]
   }