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
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
18 changes: 16 additions & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}

42 changes: 38 additions & 4 deletions src/main/resources/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
volumes:
- mysql-data:/var/lib/mysql
networks:
- backend
- resources_backend

spring:
image: yong6/onair:latest
Expand All @@ -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

8 changes: 8 additions & 0 deletions src/main/resources/prometheus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
global:
scrape_interval: 5s

scrape_configs:
- job_name: 'spring-app'
metrics_path: '/actuator/prometheus'
static_configs:
- targets: ['spring-app:8080']