From c849ab183b2d8cca989c891861bbbc65b33f4516 Mon Sep 17 00:00:00 2001 From: yongsik Date: Wed, 2 Jul 2025 19:46:33 +0900 Subject: [PATCH 1/3] =?UTF-8?q?(fix)=20application=20=EA=B5=AC=EA=B8=80=20?= =?UTF-8?q?redirect=20url=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onair/domain/member/service/MemberServiceImpl.java | 2 +- src/main/resources/application.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sejong/project/onair/domain/member/service/MemberServiceImpl.java b/src/main/java/com/sejong/project/onair/domain/member/service/MemberServiceImpl.java index a7a18ca..7f41921 100644 --- a/src/main/java/com/sejong/project/onair/domain/member/service/MemberServiceImpl.java +++ b/src/main/java/com/sejong/project/onair/domain/member/service/MemberServiceImpl.java @@ -95,7 +95,7 @@ private void addTokenCookies(HttpServletResponse response, TokenResponse tokenRe ResponseCookie refreshCookie = ResponseCookie.from(JWT_REFRESH_TOKEN_COOKIE_NAME, tokenResponse.accessToken().token()) .httpOnly(true) .secure(true) - .path("/member/refresh") // 리프레시 전용 엔드포인트에만 전송 + .path("/api/v1/member/refresh") // 리프레시 전용 엔드포인트에만 전송 .maxAge(REFRESH_TOKEN_EXPIRE_TIME) .sameSite("none") .build(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 543fb54..d3d0fb3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -38,8 +38,8 @@ spring: scope: - emails - profile - redirect-uri : http://localhost:5173/loadingAuth -# - https://onair-lime.vercel.app/loadingAuth + redirect-uri : https://onair-lime.vercel.app/loadingAuth +# - http://localhost:5173/loadingAuth servlet: From 51c45d803540d91a63aefe7b6f0a6c7e9290d673 Mon Sep 17 00:00:00 2001 From: yongsik Date: Wed, 2 Jul 2025 19:49:48 +0900 Subject: [PATCH 2/3] =?UTF-8?q?(feat)=20grafana,=20promethus,=20cadvisor?= =?UTF-8?q?=20docker-compose.yml=EC=97=90=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/docker-compose.yml | 42 ++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/resources/docker-compose.yml b/src/main/resources/docker-compose.yml index d0277fc..fe61213 100644 --- a/src/main/resources/docker-compose.yml +++ b/src/main/resources/docker-compose.yml @@ -14,7 +14,7 @@ services: volumes: - mysql-data:/var/lib/mysql networks: - - backend + - resources_backend spring: image: yong6/onair:latest @@ -28,11 +28,45 @@ services: env_file: - db.env networks: - - backend - - + - resources_backend + + cadvisor: + image: gcr.io/cadvisor/cadvisor:latest + container_name: cadvisor + ports: + - "8081:8080" + volumes: + - /:/rootfs:ro + - /var/run:/var/run:ro + - /sys:/sys:ro + - /var/lib/docker/:/var/lib/docker:ro + networks: + - resources_backend + + prometheus: + image: prom/prometheus:latest + container_name: prometheus + ports: + - "9090:9090" + volumes: + - ./prometheus.yml:/etc/prometheus/prometheus.yml + networks: + - resources_backend + + grafana: + image: grafana/grafana:latest + container_name: grafana + ports: + - "3000:3000" + networks: + - resources_backend + volumes: + - grafana-storage:/var/lib/grafana volumes: mysql-data: + grafana-storage: networks: - backend: + resources_backend: + external: true From 134650fcf187d11663c8f69430a8943361756cda Mon Sep 17 00:00:00 2001 From: yongsik Date: Wed, 2 Jul 2025 19:53:28 +0900 Subject: [PATCH 3/3] =?UTF-8?q?(feat)=20spring=20promethus=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++++ src/main/resources/application.yml | 14 ++++++++++++++ src/main/resources/prometheus.yml | 8 ++++++++ 3 files changed, 26 insertions(+) create mode 100644 src/main/resources/prometheus.yml diff --git a/build.gradle b/build.gradle index 76e317e..9344d66 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,10 @@ dependencies { implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8' implementation 'org.springframework.boot:spring-boot-starter-cache' + //prometheus + implementation 'io.micrometer:micrometer-registry-prometheus' + implementation 'org.springframework.boot:spring-boot-starter-actuator' + } tasks.named('test') { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d3d0fb3..b57ea4b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -64,5 +64,19 @@ springdoc: jwt: secret: ZGZsbTJwM2ttZndlb2lmbjEzOTRnbnVxZWYxMjM1Zmdhc2RmZzQ0NHdkZjM0YXNkZjhhc2RmOTM0ZA== +management: + endpoints: + web: + exposure: + include: prometheus, health, metrics + endpoint: + prometheus: + enabled: true + metrics: + export: + prometheus: + enabled: true + server: port: ${PORT:8080} + diff --git a/src/main/resources/prometheus.yml b/src/main/resources/prometheus.yml new file mode 100644 index 0000000..f90278b --- /dev/null +++ b/src/main/resources/prometheus.yml @@ -0,0 +1,8 @@ +global: + scrape_interval: 5s + +scrape_configs: + - job_name: 'spring-app' + metrics_path: '/actuator/prometheus' + static_configs: + - targets: ['spring-app:8080'] \ No newline at end of file