API still up for now

Signed-off-by: Irving Popovetsky <[email protected]>

Author: irvingpop

terraform/apps.tf

@@ -19,31 +19,31 @@ resource "aws_iam_role_policy_attachment" "ecs_task_execution_role_attach" {
 ################################################################################
 
 # Backend Prod
-# module "python_backend_prod" {
-#   source = "./python_backend"
+module "python_backend_prod" {
+  source = "./python_backend"
 
-#   env                 = "prod"
-#   vpc_id              = data.aws_vpc.use2.id
-#   logs_group          = aws_cloudwatch_log_group.ecslogs.name
-#   ecs_cluster_id      = module.ecs.cluster_id
-#   task_execution_role = data.aws_iam_role.ecs_task_execution_role.arn
-#   image_tag           = "latest"
-# }
+  env                 = "prod"
+  vpc_id              = data.aws_vpc.use2.id
+  logs_group          = aws_cloudwatch_log_group.ecslogs.name
+  ecs_cluster_id      = module.ecs.cluster_id
+  task_execution_role = data.aws_iam_role.ecs_task_execution_role.arn
+  image_tag           = "latest"
+}
 
-# resource "aws_lb_listener_rule" "python_backend_prod" {
-#   listener_arn = aws_lb_listener.default_https.arn
+resource "aws_lb_listener_rule" "python_backend_prod" {
+  listener_arn = aws_lb_listener.default_https.arn
 
-#   action {
-#     type             = "forward"
-#     target_group_arn = module.python_backend_prod.lb_tg_arn
-#   }
+  action {
+    type             = "forward"
+    target_group_arn = module.python_backend_prod.lb_tg_arn
+  }
 
-#   condition {
-#     host_header {
-#       values = ["backend.operationcode.org", "api.operationcode.org"]
-#     }
-#   }
-# }
+  condition {
+    host_header {
+      values = ["backend.operationcode.org", "api.operationcode.org"]
+    }
+  }
+}
 
 # Backend Staging
 # module "python_backend_staging" {
@@ -92,8 +92,6 @@ resource "aws_lb_listener_rule" "shutdown_sites_redirector" {
       values = [
         "resources.operationcode.org",
         "resources-staging.operationcode.org",
-        "api.operationcode.org",
-        "backend.operationcode.org",
         "api.staging.operationcode.org",
       ]
     }

terraform/asg.tf

@@ -107,6 +107,21 @@ module "autoscaling" {
   # reduce cloudwatch costs
   enable_monitoring = false
 
+  # Enable essential autoscaling metrics
+  enabled_metrics = [
+    "GroupDesiredCapacity",
+    "GroupInServiceCapacity",
+    "GroupInServiceInstances",
+    "GroupMaxSize",
+    "GroupMinSize",
+    "GroupPendingCapacity",
+    "GroupPendingInstances",
+    "GroupTerminatingCapacity",
+    "GroupTerminatingInstances",
+    "GroupTotalCapacity",
+    "GroupTotalInstances"
+  ]
+
   tags = local.tags
 }
 

terraform/pybot/main.tf

@@ -11,7 +11,7 @@ locals {
 
   # CHANGEME once infra scales up
   cpu    = var.env == "prod" ? 256 : 256
-  memory = var.env == "prod" ? 512 : 256
+  memory = var.env == "prod" ? 256 : 128
   count  = var.env == "prod" ? 1 : 1
 
 
@@ -52,13 +52,13 @@ resource "aws_ecs_task_definition" "pybot" {
         }
       }
 
-      # healthCheck = {
-      #   command     = ["CMD-SHELL", "wget -q http://localhost:5000/health || exit 1"]
-      #   interval    = 30
-      #   timeout     = 5
-      #   retries     = 3
-      #   startPeriod = 60
-      # }
+      healthCheck = {
+        command     = ["CMD-SHELL", "wget -q -O /dev/null http://localhost:5000/health"]
+        interval    = 30
+        timeout     = 5
+        retries     = 3
+        startPeriod = 60
+      }
 
       secrets = local.secrets_env
 

terraform/python_backend/main.tf

@@ -53,13 +53,13 @@ resource "aws_ecs_task_definition" "python_backend" {
         }
       }
 
-      # healthCheck = {
-      #   command     = ["CMD-SHELL", "wget -q http://localhost:8000/healthz || exit 1"]
-      #   interval    = 30
-      #   timeout     = 5
-      #   retries     = 3
-      #   startPeriod = 60
-      # }
+      healthCheck = {
+        command     = ["CMD-SHELL", "wget -q -O /dev/null http://localhost:8000/healthz"]
+        interval    = 30
+        timeout     = 5
+        retries     = 3
+        startPeriod = 60
+      }
 
       environment = [
         {