Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
67e44ef
refactor: tempo ๋™์ž‘ ์—ฌ๋ถ€ ๋ฏธ๊ฒ€์ฆ
hyxklee May 2, 2026
f6d904d
refactor: ์šด์˜ ์„œ๋ฒ„ MySQL ์ปจํ…Œ์ด๋„ˆ ์„ค์ • ์ œ๊ฑฐ
hyxklee May 4, 2026
9bc74c3
refactor: caddy ๋นŒ๋“œ ์Šคํฌ๋ฆฝํŠธ ์ˆ˜์ •
hyxklee May 4, 2026
d7260b5
refactor: caddy ์•ฑ ์„ค์ •์ด ๋ฎ์–ด์จ์ง€๋Š” ๋ฌธ์ œ ํ•ด์†Œ
hyxklee May 4, 2026
319fd1d
refactor: ํ—ฌ์Šค์ฒดํฌ ์‹คํŒจ์‹œ ์ƒˆ๋กœ์šด ๋ฒ„์ „ ์ •๋ฆฌ ๋กœ์ง ์ถ”๊ฐ€
hyxklee May 4, 2026
6b6482d
chore: ๊ฐœ๋ฐœ ๋ชจ๋‹ˆํ„ฐ๋ง compose๋ฅผ ๋กœ๊ทธ ์ „์šฉ์œผ๋กœ ๋‹จ์ˆœํ™”
soo0711 May 4, 2026
81bcc95
chore: ๊ฐœ๋ฐœ Alloy ์„ค์ •์—์„œ ํŠธ๋ ˆ์ด์Šค ์ˆ˜์‹  ์ œ๊ฑฐ
soo0711 May 4, 2026
acca0c2
chore: ๊ฐœ๋ฐœ Grafana ๋ฐ์ดํ„ฐ์†Œ์Šค์—์„œ Prometheus์™€ Tempo ์ œ๊ฑฐ
soo0711 May 4, 2026
daa4042
chore: ๊ฐœ๋ฐœ Grafana์—์„œ ๋กœ๊ทธ ์™ธ ๋Œ€์‹œ๋ณด๋“œ ์ œ๊ฑฐ
soo0711 May 4, 2026
4b452be
chore: ๊ฐœ๋ฐœ ๋ชจ๋‹ˆํ„ฐ๋ง ๋ฐฐํฌ ํ—ฌ์Šค์ฒดํฌ ๋Œ€์ƒ ์ •๋ฆฌ
soo0711 May 4, 2026
ed82d64
chore: ๊ฐœ๋ฐœ ์•ฑ ๊ธฐ๋ณธ ํŠธ๋ ˆ์ด์Šค ์ „์†ก ๋น„ํ™œ์„ฑํ™”
soo0711 May 4, 2026
ea4cc0d
chore: ๊ฐœ๋ฐœ ๋ชจ๋‹ˆํ„ฐ๋ง์—์„œ ๋ฏธ์‚ฌ์šฉ Prometheus์™€ Tempo ์„ค์ • ์ œ๊ฑฐ
soo0711 May 4, 2026
a0f446e
chore: ๊ฐœ๋ฐœ ์•ฑ compose์—์„œ ๋ฏธ์‚ฌ์šฉ OTLP ์„ค์ • ์ œ๊ฑฐ
soo0711 May 4, 2026
9d31ec9
Merge pull request #69 from Team-Weeth/chore/WTH-368-์šด์˜-DB-RDS๋กœ-์ด์ „
hyxklee May 5, 2026
b2c45c0
fix: ๋งค ๋ฐฐํฌ์‹œ Caddy๊ฐ€ Reload ๋˜๊ฑฐ๋‚˜ Restart ๋˜๋„๋ก ๋กœ์ง ์ถ”๊ฐ€
hyxklee May 6, 2026
30f92b4
Merge pull request #70 from Team-Weeth/fix/WTH-371-๋ธ”๋ฃจ-๊ทธ๋ฆฐ-๋ฐฐํฌ์‹œ-Caddy-์žฌ์‹คโ€ฆ
hyxklee May 8, 2026
90280ee
[WTH-376] ๊ณต์ง€ ์ฝ์€ ์‚ฌ๋žŒ club member๋กœ ์ˆ˜์ • (#71)
soo0711 May 8, 2026
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ out/
.vscode/
/.idea/

### Caddy upstream (runtime-managed by deploy.sh) ###
infra/*/caddy/upstream.conf

### Environment Variables ###
src/main/resources/*.env
src/main/resources/*.p8
Expand Down
1 change: 0 additions & 1 deletion infra/dev/caddy/upstream.conf

This file was deleted.

10 changes: 2 additions & 8 deletions infra/dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,12 @@ services:
OTEL_JAVAAGENT_ENABLED: ${OTEL_JAVAAGENT_ENABLED:-true}
OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME:-weeth-server}
OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES:-deployment.environment=dev}
OTEL_TRACES_EXPORTER: ${OTEL_TRACES_EXPORTER:-otlp}
OTEL_TRACES_EXPORTER: ${OTEL_TRACES_EXPORTER:-none}
OTEL_TRACES_SAMPLER: ${OTEL_TRACES_SAMPLER:-parentbased_traceidratio}
OTEL_TRACES_SAMPLER_ARG: ${OTEL_TRACES_SAMPLER_ARG:-0.1}
OTEL_BSP_SCHEDULE_DELAY: ${OTEL_BSP_SCHEDULE_DELAY:-15000}
OTEL_METRICS_EXPORTER: ${OTEL_METRICS_EXPORTER:-none}
OTEL_LOGS_EXPORTER: ${OTEL_LOGS_EXPORTER:-none}
OTEL_EXPORTER_OTLP_ENDPOINT: ${OTEL_EXPORTER_OTLP_ENDPOINT:-http://alloy:4318}
OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-http/protobuf}
OTEL_EXPORTER_OTLP_COMPRESSION: ${OTEL_EXPORTER_OTLP_COMPRESSION:-gzip}
volumes:
- ${HOME}/keys:/app/keys:ro
ports:
Expand Down Expand Up @@ -98,15 +95,12 @@ services:
OTEL_JAVAAGENT_ENABLED: ${OTEL_JAVAAGENT_ENABLED:-true}
OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME:-weeth-server}
OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES:-deployment.environment=dev}
OTEL_TRACES_EXPORTER: ${OTEL_TRACES_EXPORTER:-otlp}
OTEL_TRACES_EXPORTER: ${OTEL_TRACES_EXPORTER:-none}
OTEL_TRACES_SAMPLER: ${OTEL_TRACES_SAMPLER:-parentbased_traceidratio}
OTEL_TRACES_SAMPLER_ARG: ${OTEL_TRACES_SAMPLER_ARG:-0.1}
OTEL_BSP_SCHEDULE_DELAY: ${OTEL_BSP_SCHEDULE_DELAY:-15000}
OTEL_METRICS_EXPORTER: ${OTEL_METRICS_EXPORTER:-none}
OTEL_LOGS_EXPORTER: ${OTEL_LOGS_EXPORTER:-none}
OTEL_EXPORTER_OTLP_ENDPOINT: ${OTEL_EXPORTER_OTLP_ENDPOINT:-http://alloy:4318}
OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-http/protobuf}
OTEL_EXPORTER_OTLP_COMPRESSION: ${OTEL_EXPORTER_OTLP_COMPRESSION:-gzip}
volumes:
- ${HOME}/keys:/app/keys:ro
ports:
Expand Down
18 changes: 0 additions & 18 deletions infra/dev/monitoring/alloy/config.alloy
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,3 @@ loki.write "default" {
url = "http://loki:3100/loki/api/v1/push"
}
}

otelcol.receiver.otlp "default" {
http {
endpoint = "0.0.0.0:4318"
}
output {
traces = [otelcol.exporter.otlp.tempo.input]
}
}

otelcol.exporter.otlp "tempo" {
client {
endpoint = "tempo:4317"
tls {
insecure = true
}
}
}
74 changes: 0 additions & 74 deletions infra/dev/monitoring/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ services:
command: ["run", "--server.http.listen-addr=0.0.0.0:12345", "/etc/alloy/config.alloy"]
ports:
- "127.0.0.1:12345:12345"
- "127.0.0.1:4318:4318"
depends_on:
- loki
- tempo
networks:
- monitoring
- weeth-app
Expand All @@ -37,74 +35,6 @@ services:
- monitoring
restart: unless-stopped

tempo:
image: grafana/tempo:2.7.1
env_file:
- ${MONITORING_ENV_FILE:-../.env.monitoring}
volumes:
- ./tempo/tempo-config.yaml:/etc/tempo/tempo-config.yaml:ro
- tempo_data:/var/tempo
command: ["-config.file=/etc/tempo/tempo-config.yaml", "-config.expand-env=true"]
ports:
- "127.0.0.1:3200:3200"
networks:
- monitoring
restart: unless-stopped

redis-exporter:
image: oliver006/redis_exporter:v1.67.0
environment:
REDIS_ADDR: redis:6379
REDIS_PASSWORD: ${REDIS_PASSWORD:-}
networks:
- monitoring
- weeth-app
restart: unless-stopped

prometheus:
image: prom/prometheus:v2.53.0
volumes:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
- prometheus_data:/prometheus
ports:
- "127.0.0.1:9090:9090"
networks:
- monitoring
- weeth-app
restart: unless-stopped

node-exporter:
image: prom/node-exporter:v1.9.0
pid: host
volumes:
- /proc:/host/proc:ro
- /sys:/host/sys:ro
- /:/rootfs:ro
command:
- "--path.procfs=/host/proc"
- "--path.sysfs=/host/sys"
- "--path.rootfs=/rootfs"
- "--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)"
networks:
- monitoring
restart: unless-stopped

cadvisor:
image: gcr.io/cadvisor/cadvisor:v0.51.0
privileged: true
devices:
- /dev/kmsg
volumes:
- /:/rootfs:ro
- /var/run:/var/run:ro
- /sys:/sys:ro
- /var/lib/docker:/var/lib/docker:ro
- /dev/disk:/dev/disk:ro
networks:
- monitoring
- weeth-app
restart: unless-stopped

grafana:
image: grafana/grafana:11.5.2
env_file:
Expand All @@ -122,8 +52,6 @@ services:
- "127.0.0.1:3000:3000"
depends_on:
- loki
- prometheus
- tempo
networks:
- monitoring
- weeth-app
Expand All @@ -139,5 +67,3 @@ networks:
volumes:
grafana_data:
loki_data:
prometheus_data:
tempo_data:
Loading
Loading