Merge pull request #14 from TEAM-SAMSION/PET-98

PET-98 chore : 모니터링에 로그 수집 통합
TEAM-SAMSION · Sep 12, 2023 · f40fbce · f40fbce
2 parents 9dd2684 + e28c9c1
commit f40fbce
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 135 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -12,82 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'corretto'
-
-      - name: make application.yml
-        run: |
-          cd ./src/main/resources
-          touch ./application.yml
-          echo "${{ secrets.APPLICATION }}" > ./application.yml
-        shell: bash
-
-      - name: make prometheus.yml
-        run: |
-          cd ./monitoring
-          touch ./prometheus.yml
-          echo "${{ secrets.PROMETHEUS }}" > ./prometheus.yml
-
-      - name: Set .env for configuration
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.HOST }}
-          username: ubuntu
-          key: ${{ secrets.KEY }}
-          script: |
-            rm -rf ./.env
-            touch ./.env
-            echo "MONGO_USERNAME=${{ secrets.MONGO_USERNAME }}" >> ./.env
-            echo "MONGO_PASSWORD=${{ secrets.MONGO_PASSWORD }}" >> ./.env
-            echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> ./.env
-            echo "DOCKER_REPOSITORY=${{ secrets.DOCKER_REPOSITORY }}" >> ./.env
-
-      - name: Build With Gradle
-        run: ./gradlew build
-
-      - name: Docker build
-        run: docker build -f ./deploy/Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }} .
-
-      - name: Docker Hub Login
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Docker push
-        run: docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}
-
-      - name: deploy-docker-compose push
-        uses: appleboy/scp-action@master
-        with:
-          host: ${{ secrets.HOST }}
-          username: ubuntu
-          key: ${{ secrets.KEY }}
-          source: "./deploy/docker-compose.yml"
-          target: "/home/ubuntu"
-          strip_components: 2
-
       - name: monitoring-docker-compose push
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.HOST }}
           username: ubuntu
           key: ${{ secrets.KEY }}
           source: "./monitoring"
-          target: "/home/ubuntu"
-
-      - name: Deploy
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.HOST }}
-          username: ubuntu
-          key: ${{ secrets.KEY }}
-          script: |
-            docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}
-            docker stop ${{ secrets.DOCKER_REPOSITORY }}
-            docker rm -f ${{ secrets.DOCKER_REPOSITORY }}
-            docker-compose up -d
-            docker image prune -f
+          target: "/home/ubuntu"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,25 +1,25 @@
-name: CI
-
-on:
-  pull_request:
-    branches:
-      - dev
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'corretto'
-
-      - name: Grant Execute Permission For Gradlew
-        run: chmod +x gradlew
-
-      - name: Build With Gradle
-        run: ./gradlew build
+#name: CI
+#
+#on:
+#  pull_request:
+#    branches:
+#      - dev
+#
+#jobs:
+#  build:
+#    runs-on: ubuntu-22.04
+#
+#    steps:
+#      - uses: actions/checkout@v2
+#
+#      - name: Setup JDK 17
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '17'
+#          distribution: 'corretto'
+#
+#      - name: Grant Execute Permission For Gradlew
+#        run: chmod +x gradlew
+#
+#      - name: Build With Gradle
+#        run: ./gradlew build
diff --git a/.gitignore b/.gitignore
@@ -38,5 +38,4 @@ out/
 
 ### application ###
 
-/src/main/resources/application.yml
-/monitoring/prometheus.yml
+/src/main/resources/application.yml
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
     networks:
       - monitoring_network
+    restart: always
 
   grafana:
     image: grafana/grafana
@@ -21,6 +22,18 @@ services:
     networks:
       - monitoring_network
 
+  loki:
+    image: grafana/loki:master
+    container_name: docker-loki
+    ports:
+      - "3100:3100"
+    command:
+      - "-config.file=/etc/loki/local-config.yaml"
+    depends_on:
+      - grafana
+    networks:
+      - monitoring_network
+
 networks:
   monitoring_network:
     name: server_network

diff --git a/monitoring/prometheus.yml b/monitoring/prometheus.yml
@@ -0,0 +1,9 @@
+global:
+  scrape_interval: 10s
+
+scrape_configs:
+  - job_name: "petmory"
+    static_configs:
+    - targets: ['52.78.52.47:8079']
+    metrics_path: /actuator/prometheus
+    scrape_interval: 1s