From 8c7feeb2452615d44607f20efef02c8ca7f70b54 Mon Sep 17 00:00:00 2001 From: jhan0121 Date: Tue, 6 Jan 2026 20:57:18 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20loki,=20tempo=20=EC=97=B0=EA=B2=B0?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alloy/config.alloy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/alloy/config.alloy b/alloy/config.alloy index db20ad8..c395853 100644 --- a/alloy/config.alloy +++ b/alloy/config.alloy @@ -36,8 +36,7 @@ prometheus.scrape "node" { local.file_match "local_files" { path_targets = [ { - __path__ = "/var/log/app/*.json", - env = "dev", + __path__ = "/app/log/*.log", app = "recycle-study-server", }, ] @@ -85,6 +84,6 @@ otelcol.processor.memory_limiter "default" { otelcol.exporter.otlphttp "default" { client { - endpoint = sys.env("TEMPO_HOST") + "/v1/traces" + endpoint = sys.env("TEMPO_HOST") } } From 0900dad7bbbf4c0bbbb41f6f935b50d36d215d02 Mon Sep 17 00:00:00 2001 From: jhan0121 Date: Tue, 6 Jan 2026 21:02:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=EC=9A=A9=20=EC=BB=A8=ED=85=8C=EC=9D=B4=EB=84=88=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=BD=94=EB=93=9C=20=EB=B3=91=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alloy/docker-compose.yml | 31 ------------------------------- docker-compose.prod.yaml | 33 +++++++++++++++++++++++++++++++++ docker-compose.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 31 deletions(-) delete mode 100644 alloy/docker-compose.yml diff --git a/alloy/docker-compose.yml b/alloy/docker-compose.yml deleted file mode 100644 index 58ee940..0000000 --- a/alloy/docker-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ -services: - alloy: - image: grafana/alloy:latest - container_name: alloy - restart: unless-stopped - env_file: - - ../.env - volumes: - - ./config.alloy:/etc/alloy/config.alloy - - /app/log:/var/log/app - command: - - "run" - - "--server.http.listen-addr=0.0.0.0:12345" - - "--storage.path=/var/lib/alloy" - - "--stability.level=experimental" - - "/etc/alloy/config.alloy" - ports: - - "12345:12345" # Alloy UI - - "4317:4317" # OTLP gRPC - networks: - - observability - - node-exporter: - image: quay.io/prometheus/node-exporter:latest - container_name: node-exporter - restart: unless-stopped - networks: - - observability - -networks: - observability: diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index 4bec73e..00718ac 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -9,3 +9,36 @@ services: - .env volumes: - /app/log:/app/log + networks: + - observability + + alloy: + image: grafana/alloy:latest + container_name: alloy + restart: unless-stopped + env_file: + - .env + volumes: + - ./alloy/config.alloy:/etc/alloy/config.alloy + - /app/log:/app/log + command: + - "run" + - "--server.http.listen-addr=0.0.0.0:12345" + - "--storage.path=/var/lib/alloy" + - "--stability.level=experimental" + - "/etc/alloy/config.alloy" + ports: + - "12345:12345" # Alloy UI + - "4317:4317" # OTLP gRPC + networks: + - observability + + node-exporter: + image: quay.io/prometheus/node-exporter:latest + container_name: node-exporter + restart: unless-stopped + networks: + - observability + +networks: + observability: diff --git a/docker-compose.yaml b/docker-compose.yaml index 892f0cd..5e9575f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,10 +7,42 @@ services: - "8080:8080" env_file: - .env + volumes: + - app_log:/app/log + networks: + - observability depends_on: mysql: condition: service_healthy + alloy: + image: grafana/alloy:latest + container_name: alloy + restart: unless-stopped + env_file: + - .env + volumes: + - ./alloy/config.alloy:/etc/alloy/config.alloy + - app_log:/app/log + command: + - "run" + - "--server.http.listen-addr=0.0.0.0:12345" + - "--storage.path=/var/lib/alloy" + - "--stability.level=experimental" + - "/etc/alloy/config.alloy" + ports: + - "12345:12345" # Alloy UI + - "14317:4317" # OTLP gRPC + networks: + - observability + + node-exporter: + image: quay.io/prometheus/node-exporter:latest + container_name: node-exporter + restart: unless-stopped + networks: + - observability + mysql: container_name: recycle-study-mysql image: mysql:8.4 @@ -29,6 +61,12 @@ services: interval: 10s timeout: 5s retries: 5 + networks: + - observability volumes: mysql_volume: + app_log: + +networks: + observability: