From e28c9c17a33183031db516f5e5f49de94bee7ca6 Mon Sep 17 00:00:00 2001 From: tlarbals824 Date: Tue, 12 Sep 2023 11:11:31 +0900 Subject: [PATCH] =?UTF-8?q?PET-98=20chore=20:=20=EB=AA=A8=EB=8B=88?= =?UTF-8?q?=ED=84=B0=EB=A7=81=EC=97=90=20=EB=A1=9C=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A7=91=20=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 73 +---------------------------------- .github/workflows/ci.yml | 50 ++++++++++++------------ .gitignore | 3 +- deploy/Dockerfile | 4 -- deploy/docker-compose.yml | 32 --------------- monitoring/docker-compose.yml | 13 +++++++ monitoring/prometheus.yml | 9 +++++ 7 files changed, 49 insertions(+), 135 deletions(-) delete mode 100644 deploy/Dockerfile delete mode 100644 deploy/docker-compose.yml create mode 100644 monitoring/prometheus.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 2ed279c..90f2c86 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -12,64 +12,6 @@ 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: @@ -77,17 +19,4 @@ jobs: 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 \ No newline at end of file + target: "/home/ubuntu" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35e9733..8191e04 100644 --- 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 \ No newline at end of file +#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 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 8d40278..e4e5fef 100644 --- a/.gitignore +++ b/.gitignore @@ -38,5 +38,4 @@ out/ ### application ### -/src/main/resources/application.yml -/monitoring/prometheus.yml \ No newline at end of file +/src/main/resources/application.yml \ No newline at end of file diff --git a/deploy/Dockerfile b/deploy/Dockerfile deleted file mode 100644 index 6da942d..0000000 --- a/deploy/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM amazoncorretto:17 -ARG JAR_FILE=/build/libs/LogAnalyzer-0.0.1.jar -COPY ${JAR_FILE} LogAnalyzer.jar -ENTRYPOINT ["java","-jar","/LogAnalyzer.jar"] \ No newline at end of file diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml deleted file mode 100644 index 6183b0a..0000000 --- a/deploy/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: '3.8' - -services: - mongoDB: - image: mongo - container_name: docker-mongoDB - ports: - - "27017:27017" - environment: - MONGO_INITDB_ROOT_USERNAME: ${MONGO_USERNAME} - MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASSWORD} - networks: - - server_network - - loganalyzer: - image: ${DOCKER_USERNAME}/${DOCKER_REPOSITORY} - container_name: ${DOCKER_REPOSITORY} - restart: always - ports: - - "8080:8080" - - "8079:8079" - environment: - - TZ=Asia/Seoul - depends_on: - - mongoDB - networks: - - server_network - -networks: - server_network: - driver: bridge - external: true \ No newline at end of file diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml index 8413daa..d709d2a 100644 --- 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 new file mode 100644 index 0000000..4314f10 --- /dev/null +++ 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