Skip to content

Feature: admin 모니터링 추가 #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jjiggu merged 3 commits into from
Aug 3, 2025
Merged

Feature: admin 모니터링 추가 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89c6d94
refactor(APM): 유저 추가
Jjiggu Aug 3, 2025
0c9da02
refactor(APM): prometheus, grafana 설정 추가
Jjiggu Aug 3, 2025
5ed7cfb
refactor(APM): prometheus, grafana 설정 수정
Jjiggu Aug 3, 2025
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
30 changes: 28 additions & 2 deletions .github/workflows/deploy-admin-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: ./gradlew clean :nowait-app-admin-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 }}
Expand All @@ -70,6 +70,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set Prometheus YML
run: |
echo "${{ secrets.PROMETHEUS_DEV_ADMIN_YML }}" \
| base64 --decode \
> prometheus-admin.yml

- name: Copy docker-compose.admin.yml to EC2
uses: appleboy/scp-action@master
with:
Expand All @@ -80,6 +86,26 @@ jobs:
source: "docker-compose.admin.yml"
target: ${{ env.EC2_DEPLOY_PATH }}

- name: Copy docker-compose.admin-monitoring.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.admin-monitoring.yml"
target: ${{ env.EC2_DEPLOY_PATH }}

- name: Copy prometheus-admin.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: "prometheus-admin.yml"
target: ${{ env.EC2_DEPLOY_PATH }}

- name: Copy deploy-admin-docker.sh to EC2
uses: appleboy/scp-action@master
with:
Expand All @@ -91,7 +117,7 @@ jobs:
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 }}
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/deploy-user-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,9 @@ jobs:

- name: Set Prometheus YML
run: |
echo "${{ secrets.PROMETHEUS_DEV_YML }}" \
echo "${{ secrets.PROMETHEUS_DEV_USER_YML }}" \
| base64 --decode \
> prometheus.yml

- name: Debug workspace
run: |
echo "현재 작업 디렉터리: $(pwd)"
echo "파일 목록 전체:"
ls -l scripts

> prometheus-user.yml

- name: Copy docker-compose.user.yml to EC2
uses: appleboy/scp-action@master
Expand Down Expand Up @@ -107,7 +100,7 @@ jobs:
username: ${{ secrets.EC2_USER }}
key: ${{ secrets.EC2_SSH_KEY }}
port: ${{ secrets.EC2_PORT }}
source: "prometheus.yml"
source: "prometheus-user.yml"
target: ${{ env.EC2_DEPLOY_PATH }}

- name: Copy deploy-user-docker to EC2
Expand Down
27 changes: 27 additions & 0 deletions docker-compose.admin-monitoring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
services:
prometheus:
image: prom/prometheus:latest
container_name: prometheus-admin
ports:
- "9091:9090"
volumes:
- ./prometheus-admin.yml:/etc/prometheus/prometheus.yml:ro
command:
- '--config.file=/etc/prometheus/prometheus.yml'
depends_on:
- nowait-app-admin-api
restart: always

grafana:
image: grafana/grafana:latest
container_name: grafana-admin
ports:
- "3004:3000"
volumes:
- grafana-admin-data:/var/lib/grafana
depends_on:
- prometheus
restart: always

volumes:
grafana-admin-data:
10 changes: 5 additions & 5 deletions docker-compose.user-monitoring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
services:
prometheus:
image: prom/prometheus
container_name: prometheus
container_name: prometheus-user
ports:
- "9090:9090"
volumes:
- ./prometheus.yml:/etc/prometheus/prometheus.yml
- ./prometheus-user.yml:/etc/prometheus/prometheus.yml:ro
command:
- '--config.file=/etc/prometheus/prometheus.yml'
depends_on:
Expand All @@ -14,14 +14,14 @@ services:

grafana:
image: grafana/grafana
container_name: grafana
container_name: grafana-user
ports:
- "3003:3000"
volumes:
- grafana_data:/var/lib/grafana
- grafana-user-data:/var/lib/grafana
depends_on:
- prometheus
restart: always

volumes:
grafana_data:
grafana-user-data:
6 changes: 6 additions & 0 deletions nowait-app-admin-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ 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'

testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

Expand Down
12 changes: 10 additions & 2 deletions scripts/deploy-admin-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,26 @@ START_LOG="$REPOSITORY/start.log"

echo "1. find container id"
CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-admin-api")
CONTAINER_PROMETHEUS_ID=$(docker ps -aq --filter "name=prometheus-admin")
CONTAINER_GRAFANA_ID=$(docker ps -aq --filter "name=grafana-admin")

echo "2. stop container"
if [ -n "$CONTAINER_ID" ]; then
echo "Stopping container $CONTAINER_ID"
docker rm -f "$CONTAINER_ID"

echo "Stopping container $CONTAINER_PROMETHEUS_ID"
docker rm -f "$CONTAINER_PROMETHEUS_ID"

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 -p nowait_dev pull nowait-app-admin-api
sudo docker-compose -f docker-compose.admin.yml -p nowait_dev up -d nowait-app-admin-api
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

echo "4. check container status"
NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-admin-api")
Expand Down
12 changes: 6 additions & 6 deletions scripts/deploy-user-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ START_LOG="$REPOSITORY/start.log"

echo "1. find container id"
CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api")
CONTAINER_PROMETHEUS_ID=$(docker ps -q --filter "name=prometheus")
CONTAINER_GRAFANA_ID=$(docker ps -q --filter "name=grafana")
CONTAINER_PROMETHEUS_ID=$(docker ps -aq --filter "name=prometheus-user")
CONTAINER_GRAFANA_ID=$(docker ps -aq --filter "name=grafana-user")

echo "2. stop container"
if [ -n "$CONTAINER_ID" ]; then
Expand All @@ -18,15 +18,15 @@ if [ -n "$CONTAINER_ID" ]; then
echo "Stopping container $CONTAINER_PROMETHEUS_ID"
docker rm -f "$CONTAINER_PROMETHEUS_ID"

echo "Stopping container $CONTAINER_GRAFANA_ID"
docker rm -f "$CONTAINER_GRAFANA_ID"
echo "Stopping container $CONTAINER_GRAFANA_ID"
docker rm -f "$CONTAINER_GRAFANA_ID"
else
echo "No user 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 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
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

echo "4. check container status"
NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api")
Expand Down