Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions environment/stage/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ module "stage_stack" {
redis_version = var.redis_version
redis_exporter_version = var.redis_exporter_version
alloy_version = var.alloy_version
node_exporter_enabled = true
node_exporter_managed = true
}
2 changes: 2 additions & 0 deletions modules/app_stack/ec2.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ module "app" {
redis_version = var.redis_version
redis_exporter_version = var.redis_exporter_version
alloy_version = var.alloy_version
node_exporter_enabled = var.node_exporter_enabled
node_exporter_managed = var.node_exporter_managed
}
6 changes: 6 additions & 0 deletions modules/app_stack/modules/app/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,15 @@ locals {
})

side_infra_script_b64 = base64encode(templatefile("${path.module}/../../scripts/side_infra_setup.sh.tftpl", {
api_private_ip = aws_instance.api_server.private_ip
work_dir = var.work_dir
alloy_env_name = var.alloy_env_name
alloy_config_content = local.alloy_config
redis_version = var.redis_version
redis_exporter_version = var.redis_exporter_version
alloy_version = var.alloy_version
node_exporter_enabled = var.node_exporter_enabled
node_exporter_managed = var.node_exporter_managed
}))

nginx_install_ssm_params = jsonencode({
Expand Down Expand Up @@ -241,6 +244,7 @@ resource "null_resource" "update_side_infra" {

triggers = {
script_hash = sha256(templatefile("${path.module}/../../scripts/side_infra_setup.sh.tftpl", {
api_private_ip = aws_instance.api_server.private_ip
work_dir = var.work_dir
alloy_env_name = var.alloy_env_name
alloy_config_content = templatefile("${path.module}/../../../../config/side-infra/config.alloy.tftpl", {
Expand All @@ -249,6 +253,8 @@ resource "null_resource" "update_side_infra" {
redis_version = var.redis_version
redis_exporter_version = var.redis_exporter_version
alloy_version = var.alloy_version
node_exporter_enabled = var.node_exporter_enabled
node_exporter_managed = var.node_exporter_managed
}))
}

Expand Down
8 changes: 8 additions & 0 deletions modules/app_stack/modules/app/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,11 @@ variable "redis_exporter_version" {
variable "alloy_version" {
type = string
}

variable "node_exporter_enabled" {
type = bool
}

variable "node_exporter_managed" {
type = bool
}
35 changes: 35 additions & 0 deletions modules/app_stack/scripts/side_infra_setup.sh.tftpl
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,45 @@ services:
network_mode: "host"
restart: always

%{ if node_exporter_enabled ~}
node-exporter:
image: prom/node-exporter:v1.9.1
container_name: node-exporter
network_mode: "host"
pid: "host"
restart: always
read_only: true
volumes:
- /proc:/host/proc:ro
- /sys:/host/sys:ro
- /:/host/root:ro,rslave
command:
- --path.procfs=/host/proc
- --path.sysfs=/host/sys
- --path.rootfs=/host/root
- --web.listen-address=${api_private_ip}:9100

%{ endif ~}
EOF

# 4. Start containers
cd "$WORK_DIR"

%{ if node_exporter_managed ~}
# Validate and download the exporter before changing any running service.
docker compose -f docker-compose.side-infra.yml config --quiet
%{ if node_exporter_enabled ~}
docker compose -f docker-compose.side-infra.yml pull node-exporter
%{ else ~}
docker rm -f node-exporter || true
%{ endif ~}

# Compose recreates services only when their configuration changed. Adding or
# removing Node Exporter leaves the existing Redis container and its data intact.
docker compose -f docker-compose.side-infra.yml up -d
Comment thread
Hexeong marked this conversation as resolved.
Resolved
# Alloy's bind-mounted config can change without changing its Compose service.
docker compose -f docker-compose.side-infra.yml restart alloy
%{ else ~}
# Cleanup potential conflicts where ports might be locked by other Docker Compose instances.
# 'rm -f' is executed first to ensure cleanup of any lingering network resources attached to existing containers.
echo "Cleanup: Force removing leftover containers..."
Expand All @@ -73,5 +107,6 @@ docker compose -f docker-compose.side-infra.yml down || true

echo "Starting containers..."
docker compose -f docker-compose.side-infra.yml up -d
%{ endif ~}

echo "Side Infrastructure Setup Complete!"
12 changes: 12 additions & 0 deletions modules/app_stack/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,18 @@ variable "alloy_version" {
type = string
}

variable "node_exporter_enabled" {
description = "Enable host metrics on the API EC2 instance"
type = bool
default = false
}

variable "node_exporter_managed" {
description = "Remove an existing Node Exporter container when this environment disables it"
type = bool
default = false
}

variable "internal_alarm_api_ports" {
description = "DB EC2가 백업 실패 알림을 보내는 API 서버의 Blue/Green app 포트"
type = list(number)
Expand Down
3 changes: 3 additions & 0 deletions scripts/verify/render/templates.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@ locals {
conf_file_name = "api.conf"
})
"app_stack-side_infra_setup.sh" = templatefile("${local.repo}/modules/app_stack/scripts/side_infra_setup.sh.tftpl", {
api_private_ip = "10.0.0.20"
work_dir = "/home/ubuntu/side-infra"
alloy_env_name = "verify"
alloy_config_content = local.alloy_config
redis_version = "7.2"
redis_exporter_version = "v1.62.0"
alloy_version = "v1.4.0"
node_exporter_enabled = true
node_exporter_managed = true
})

# modules/monitoring_stack/ec2.tf
Expand Down
Loading