diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6f1f26e..66424d3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -87,7 +87,7 @@ jobs: PUBLISHED_CONTAINERS=$(sudo docker ps -q --filter publish=9000) if [ -n "$PUBLISHED_CONTAINERS" ]; then sudo docker rm -f $PUBLISHED_CONTAINERS; fi sudo docker pull ${{ secrets.DOCKER_REPO }}/eatssu-prod - sudo docker run -d --name eatssu-prod --restart unless-stopped -p 9000:9000 \ + sudo docker run -d --name eatssu-prod --restart unless-stopped -p 9000:9000 -p 127.0.0.1:9001:9001 \ --log-driver=awslogs \ --log-opt awslogs-region=ap-northeast-2 \ --log-opt awslogs-group=prod-ec2-group \ @@ -118,7 +118,7 @@ jobs: PUBLISHED_CONTAINERS=$(sudo docker ps -q --filter publish=9000) if [ -n "$PUBLISHED_CONTAINERS" ]; then sudo docker rm -f $PUBLISHED_CONTAINERS; fi sudo docker pull ${{ secrets.DOCKER_REPO }}/eatssu-dev - sudo docker run -d --name eatssu-dev --restart unless-stopped -p 9000:9000 \ + sudo docker run -d --name eatssu-dev --restart unless-stopped -p 9000:9000 -p 127.0.0.1:9001:9001 \ --log-driver=awslogs \ --log-opt awslogs-region=ap-northeast-2 \ --log-opt awslogs-group=dev-ec2-group \ diff --git a/src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java b/src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java index 3072cee..3e85dd1 100644 --- a/src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java +++ b/src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java @@ -29,7 +29,7 @@ public class SecurityConfig { private static final String[] AUTH_WHITELIST = { "/", "/oauths/kakao", "/oauths/apple", "/menus/**", "/meals/**", "/admin/login", "/oauths/v2/kakao","/oauths/v2/apple", "/reviews", "/reviews/menus/**", "/reviews/meals/**", "/v2/reviews/statistics/**", - "/v2/reviews/menus/**", "/v2/reviews/meals/**", "/actuator/**", "/error-test/**" + "/v2/reviews/menus/**", "/v2/reviews/meals/**", "/actuator/health", "/actuator/prometheus", "/error-test/**" }; private static final String[] ADMIN_PAGE_LIST = { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 239f8e1..017f705 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -94,6 +94,10 @@ logging: com.zaxxer.hikari: INFO management: + server: + port: 9001 + address: 0.0.0.0 + endpoint: metrics: enabled: true @@ -104,3 +108,7 @@ management: web: exposure: include: health, info, metrics, prometheus + + metrics: + tags: + application: eatssu-dev diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index aa2221a..d7eb680 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -100,6 +100,10 @@ logging: management: + server: + port: 9001 + address: 0.0.0.0 + endpoint: metrics: enabled: true @@ -111,3 +115,7 @@ management: exposure: include: health, info, metrics, prometheus + metrics: + tags: + application: eatssu-prod +