[#113] Remove autoscaling group

packer/cloudwatch.json

@@ -5,14 +5,14 @@
   },
   "metrics": {
     "append_dimensions": {
-      "AutoScalingGroupName": "${aws:AutoScalingGroupName}",
+      "RijuInstanceGroup": "Webserver",
       "ImageId": "${aws:ImageId}",
       "InstanceId": "${aws:InstanceId}",
       "InstanceType": "${aws:InstanceType}"
     },
     "aggregation_dimensions": [
-      ["AutoScalingGroupName"],
+      ["RijuInstanceGroup"],
-      ["AutoScalingGroupName", "path"]
+      ["RijuInstanceGroup", "path"]
     ],
     "metrics_collected": {
       "cpu": {

tf/alb.tf

@@ -77,8 +77,3 @@ resource "aws_lb_listener" "server_https" {
     target_group_arn = aws_lb_target_group.server.arn
   }
 }
-
-resource "aws_autoscaling_attachment" "server" {
-  autoscaling_group_name = aws_autoscaling_group.server.name
-  alb_target_group_arn   = aws_lb_target_group.server.arn
-}

tf/asg.tf

@@ -1,112 +0,0 @@
-resource "aws_security_group" "server" {
-  name        = "riju-server"
-  description = "Security group for Riju server"
-
-  ingress {
-    description = "SSH"
-    from_port   = 22
-    to_port     = 22
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
-  ingress {
-    description = "HTTP"
-    from_port   = 80
-    to_port     = 80
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
-  ingress {
-    description = "HTTPS"
-    from_port   = 443
-    to_port     = 443
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
-  egress {
-    from_port   = 0
-    to_port     = 0
-    protocol    = "-1"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-}
-
-resource "aws_launch_template" "server" {
-  name          = "riju-server"
-  image_id      = data.aws_ami.server.id
-  instance_type = "t3.medium"
-
-  security_group_names = [aws_security_group.server.name]
-  iam_instance_profile {
-    name = aws_iam_instance_profile.server.name
-  }
-
-  update_default_version = true
-
-  block_device_mappings {
-    device_name = "/dev/sdh"
-    ebs {
-      volume_type = "gp3"
-      volume_size = 256
-    }
-  }
-
-  tags = {
-    Name = "Riju server"
-  }
-
-  tag_specifications {
-    resource_type = "instance"
-    tags = merge(local.tags, {
-      Name               = "Riju server"
-      BillingSubcategory = "Riju:EC2:Webserver"
-    })
-  }
-
-  tag_specifications {
-    resource_type = "volume"
-    tags = merge(local.tags, {
-      Name               = "Riju server"
-      BillingSubcategory = "Riju:EBS:Webserver"
-    })
-  }
-}
-
-resource "aws_autoscaling_group" "server" {
-  name = "riju-server"
-
-  availability_zones = [local.primary_az]
-  desired_capacity   = 1
-  min_size           = 0
-  max_size           = 3
-
-  launch_template {
-    id = aws_launch_template.server.id
-  }
-
-  termination_policies = [
-    "OldestLaunchTemplate",
-    "OldestInstance",
-  ]
-
-  tags = concat(
-    [
-      {
-        key                 = "Name"
-        value               = "Riju server"
-        propagate_at_launch = false
-      }
-    ]
-  )
-
-  lifecycle {
-    ignore_changes = [
-      desired_capacity,
-      target_group_arns,
-    ]
-  }
-
-}

tf/cloudwatch.tf

@@ -13,7 +13,7 @@ resource "aws_cloudwatch_metric_alarm" "server_cpu" {
   alarm_actions             = [aws_sns_topic.riju.arn]
   insufficient_data_actions = [aws_sns_topic.riju.arn]
   dimensions = {
-    AutoScalingGroupName = aws_autoscaling_group.server.name
+    RijuInstanceGroup = "Webserver"
   }
 
   tags = {
@@ -36,7 +36,7 @@ resource "aws_cloudwatch_metric_alarm" "server_memory" {
   alarm_actions             = [aws_sns_topic.riju.arn]
   insufficient_data_actions = [aws_sns_topic.riju.arn]
   dimensions = {
-    AutoScalingGroupName = aws_autoscaling_group.server.name
+    RijuInstanceGroup = "Webserver"
   }
 
   tags = {
@@ -59,8 +59,8 @@ resource "aws_cloudwatch_metric_alarm" "server_data_volume_disk_space" {
   alarm_actions             = [aws_sns_topic.riju.arn]
   insufficient_data_actions = [aws_sns_topic.riju.arn]
   dimensions = {
-    AutoScalingGroupName = aws_autoscaling_group.server.name
+    RijuInstanceGroup = "Webserver"
-    path                 = "/mnt/riju"
+    path              = "/mnt/riju"
   }
 
   tags = {
@@ -83,8 +83,8 @@ resource "aws_cloudwatch_metric_alarm" "server_root_volume_disk_space" {
   alarm_actions             = [aws_sns_topic.riju.arn]
   insufficient_data_actions = [aws_sns_topic.riju.arn]
   dimensions = {
-    AutoScalingGroupName = aws_autoscaling_group.server.name
+    RijuInstanceGroup = "Webserver"
-    path                 = "/"
+    path              = "/"
   }
 
   tags = {

tf/ec2.tf

@@ -1,3 +1,80 @@
+resource "aws_security_group" "server" {
+  name        = "riju-server"
+  description = "Security group for Riju server"
+
+  ingress {
+    description = "SSH"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  ingress {
+    description = "HTTP"
+    from_port   = 80
+    to_port     = 80
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  ingress {
+    description = "HTTPS"
+    from_port   = 443
+    to_port     = 443
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}
+
+resource "aws_launch_template" "server" {
+  name          = "riju-server"
+  image_id      = data.aws_ami.server.id
+  instance_type = "t3.medium"
+
+  security_group_names = [aws_security_group.server.name]
+  iam_instance_profile {
+    name = aws_iam_instance_profile.server.name
+  }
+
+  update_default_version = true
+
+  block_device_mappings {
+    device_name = "/dev/sdh"
+    ebs {
+      volume_type = "gp3"
+      volume_size = 256
+    }
+  }
+
+  tags = {
+    Name = "Riju server"
+  }
+
+  tag_specifications {
+    resource_type = "instance"
+    tags = merge(local.tags, {
+      Name               = "Riju server"
+      BillingSubcategory = "Riju:EC2:Webserver"
+    })
+  }
+
+  tag_specifications {
+    resource_type = "volume"
+    tags = merge(local.tags, {
+      Name               = "Riju server"
+      BillingSubcategory = "Riju:EBS:Webserver"
+    })
+  }
+}
+
 resource "aws_security_group" "deploy" {
   name        = "riju-deploy"
   description = "Security group for Riju CI"

tf/ssm.tf

@@ -29,9 +29,3 @@ resource "aws_ssm_parameter" "s3_bucket" {
   type  = "String"
   value = aws_s3_bucket.riju.bucket
 }
-
-resource "aws_ssm_parameter" "asg_desired_capacity" {
-  name  = "riju-asg-desired-capacity"
-  type  = "String"
-  value = aws_autoscaling_group.server.desired_capacity
-}