From 34a43b6bd70321888df6578d25112945fb57ffe3 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 1 Aug 2025 14:40:26 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20grafana,=20prometheus=20=EC=9D=98?= =?UTF-8?q?=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nowait-app-user-api/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nowait-app-user-api/build.gradle b/nowait-app-user-api/build.gradle index df5fb1ab..c87e07e1 100644 --- a/nowait-app-user-api/build.gradle +++ b/nowait-app-user-api/build.gradle @@ -74,6 +74,13 @@ dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' + // actuator + implementation 'org.springframework.boot:spring-boot-starter-actuator' + + // prometheus + implementation 'io.micrometer:micrometer-registry-prometheus' + + // test testImplementation 'org.springframework.boot:spring-boot-starter-test' } From 139d26be593e8d22ffa343d21de21b19e320b5f5 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 1 Aug 2025 14:40:37 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20grafana,=20prometheus=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=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 --- scripts/deploy-user-docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/deploy-user-docker.sh b/scripts/deploy-user-docker.sh index aa537c8b..b4cbd711 100644 --- a/scripts/deploy-user-docker.sh +++ b/scripts/deploy-user-docker.sh @@ -17,8 +17,8 @@ else fi echo "3. start container" -sudo docker-compose -f docker-compose.user.yml -p nowait_dev pull nowait-app-user-api -sudo docker-compose -f docker-compose.user.yml -p nowait_dev up -d nowait-app-user-api +sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev pull nowait-app-user-api prometheus grafana +sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev up -d nowait-app-user-api prometheus grafana echo "4. check container status" NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api") From 2853d954f5af1018d4591bbb4ad69f616fb452d7 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 1 Aug 2025 14:40:58 +0900 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-user-docker.yml | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy-user-docker.yml b/.github/workflows/deploy-user-docker.yml index 3836cb6b..6b05af82 100644 --- a/.github/workflows/deploy-user-docker.yml +++ b/.github/workflows/deploy-user-docker.yml @@ -47,7 +47,7 @@ jobs: run: ./gradlew clean :nowait-app-user-api:bootJar -x test - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} @@ -67,28 +67,28 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Copy docker-compose.user.yml to EC2 - uses: appleboy/scp-action@master - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USER }} - key: ${{ secrets.EC2_SSH_KEY }} - port: ${{ secrets.EC2_PORT }} - source: "docker-compose.user.yml" - target: ${{ env.EC2_DEPLOY_PATH }} + - name: Set Prometheus YML + run: | + echo "${{ secrets.PROMETHEUS_DEV_YML }}" \ + | base64 --decode \ + > prometheus.yml - - name: Copy deploy-user-docker to EC2 + - name: Copy compose, prometheus.yml & deploy script to EC2 uses: appleboy/scp-action@master with: host: ${{ secrets.EC2_HOST }} username: ${{ secrets.EC2_USER }} key: ${{ secrets.EC2_SSH_KEY }} port: ${{ secrets.EC2_PORT }} - source: "scripts/deploy-user-docker.sh" - target: "${{ env.EC2_DEPLOY_PATH }}" + source: + - "docker-compose.user.yml" + - "docker-compose.user-monitoring.yml" + - "prometheus.yml" + - "scripts/deploy-user-docker.sh" + target: ${{ env.EC2_DEPLOY_PATH }} - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} From 118ebbdacdf28f881d5e53beb354aa8fd4a04505 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 1 Aug 2025 14:41:17 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20=EA=B2=BD=EB=A1=9C=20=EA=B6=8C=ED=95=9C=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 --- .../nowait/applicationuser/config/security/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java index 56afcbd6..0fa65142 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/SecurityConfig.java @@ -69,7 +69,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { "/swagger-resources/**", "/webjars/**", "/demo-ui.html", - "/v1/menus//all-menus/stores/**" + "/v1/menus/all-menus/stores/**", + "/nowait/management/**" ) .permitAll() .anyRequest().authenticated() // 그외 요청은 허가된 사람만 인가