From 18614fab8ffd525d70bf06b778503e3ac8cec10b Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Sun, 3 Aug 2025 22:48:21 +0900 Subject: [PATCH] =?UTF-8?q?refactor(APM):=20admin=20=EB=8C=80=EC=8B=9C?= =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=A0=91=EA=B7=BC=EA=B6=8C=ED=95=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nowait/ApiAdminApplication.java | 1 + .../config/security/SecurityConfig.java | 1 + .../main/java/com/nowait/ApiUserApplication.java | 1 - scripts/deploy-admin-docker.sh | 14 -------------- scripts/deploy-user-docker.sh | 14 -------------- 5 files changed, 2 insertions(+), 29 deletions(-) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java index 1d8d85f7..ae757172 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java @@ -14,3 +14,4 @@ public static void main(String[] args) { org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args); } } + diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/config/security/SecurityConfig.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/config/security/SecurityConfig.java index 77febda6..6d1084f7 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/config/security/SecurityConfig.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/config/security/SecurityConfig.java @@ -55,6 +55,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { "/swagger-resources/**", "/webjars/**", "/demo-ui.html", + "/nowait/management", "/nowait/management/**", "/health-check" ) diff --git a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java index 2460ef23..a08337be 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java +++ b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java @@ -13,4 +13,3 @@ public static void main(String[] args) { SpringApplication.run(ApiUserApplication.class, args); } } - diff --git a/scripts/deploy-admin-docker.sh b/scripts/deploy-admin-docker.sh index e6f93c30..0e1dadde 100644 --- a/scripts/deploy-admin-docker.sh +++ b/scripts/deploy-admin-docker.sh @@ -18,20 +18,6 @@ else echo "No admin container found." fi -if [ -n "$CONTAINER_PROMETHEUS_ID" ]; then - echo "Stopping container $CONTAINER_PROMETHEUS_ID" - docker rm -f "$CONTAINER_PROMETHEUS_ID" -else - echo "No admin container found." -fi - -if [ -n "$CONTAINER_GRAFANA_ID" ]; then - echo "Stopping container $CONTAINER_GRAFANA_ID" - docker rm -f "$CONTAINER_GRAFANA_ID" -else - echo "No admin container found." -fi - echo "3. start container" sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev pull nowait-app-admin-api prometheus-admin grafana-admin sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev up -d nowait-app-admin-api prometheus-admin grafana-admin diff --git a/scripts/deploy-user-docker.sh b/scripts/deploy-user-docker.sh index 7ca8c177..ad31b0f8 100644 --- a/scripts/deploy-user-docker.sh +++ b/scripts/deploy-user-docker.sh @@ -18,20 +18,6 @@ else echo "No admin container found." fi -if [ -n "$CONTAINER_PROMETHEUS_ID" ]; then - echo "Stopping container $CONTAINER_PROMETHEUS_ID" - docker rm -f "$CONTAINER_PROMETHEUS_ID" -else - echo "No admin container found." -fi - -if [ -n "$CONTAINER_GRAFANA_ID" ]; then - echo "Stopping container $CONTAINER_GRAFANA_ID" - docker rm -f "$CONTAINER_GRAFANA_ID" -else - echo "No admin container found." -fi - echo "3. start container" sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev pull nowait-app-user-api prometheus-user grafana-user sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev up -d nowait-app-user-api prometheus-user grafana-user