Merge pull request #384 from ooni/cost-optimize

Cost optimize

Author: hellais

tf/environments/dev/main.tf

@@ -153,7 +153,7 @@ module "oonipg" {
   # see https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html
   # With 1GiB of ram you get ~112 connections:
   # 1074000000 / 9531392 = 112.68
-  db_instance_class        = "db.t3.micro" # 2GiB => ~224 max_connections
+  db_instance_class        = "db.t4g.micro" # 2GiB => ~224 max_connections
   db_storage_type          = "standard"
   db_allocated_storage     = "5"
   db_max_allocated_storage = null

tf/modules/ec2/main.tf

@@ -92,7 +92,7 @@ resource "aws_instance" "ooni_ec2" {
 
   root_block_device {
     volume_size = var.disk_size # Size in GB
-    volume_type = "gp2"
+    volume_type = "gp3"
   }
 
   tags = merge(var.tags, { MonitoringActive = var.monitoring_active })

tf/modules/ecs_cluster/main.tf

@@ -19,7 +19,7 @@ resource "aws_ecs_cluster" "main" {
 
 
 data "aws_ssm_parameter" "ecs_optimized_ami" {
-  name = "/aws/service/ecs/optimized-ami/amazon-linux-2/recommended"
+  name = "/aws/service/ecs/optimized-ami/amazon-linux-2023/recommended"
 }
 
 resource "aws_iam_role" "container_host" {
@@ -172,15 +172,6 @@ resource "aws_launch_template" "container_host" {
     ]
   }
 
-  block_device_mappings {
-    device_name = "/dev/sdf"
-
-    ebs {
-      volume_size           = var.instance_volume_size
-      delete_on_termination = true
-    }
-  }
-
   tag_specifications {
     resource_type = "instance"
     tags = merge(