Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 1 addition & 45 deletions .github/workflows/auto-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
submodules: recursive
token: ${{ secrets.SUBMODULE_TOKEN }}


- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand Down Expand Up @@ -70,17 +71,6 @@ jobs:
target: ${{ secrets.WORK_DIR }}
rm: false

- name: Transfer monitoring configs to server
uses: appleboy/scp-action@v0.1.7
with:
host: ${{ secrets.SERVER_IP }}
username: ${{ secrets.SERVER_USER }}
key: ${{ secrets.SERVER_SSH_KEY }}
port: ${{ secrets.SERVER_PORT }}
source: "monitoring"
target: ${{ secrets.WORK_DIR }}
rm: false

- name: Read deploy script
id: deploy_script
run: |
Expand All @@ -101,37 +91,3 @@ jobs:
bash -s <<'__SCRIPT__'
${{ steps.deploy_script.outputs.script }}
__SCRIPT__

- name: Deploy monitoring stack
uses: appleboy/ssh-action@v0.1.8
env:
WORK_DIR: ${{ secrets.WORK_DIR }}
MONITORING_ENV: ${{ secrets.MONITORING_ENV }}
with:
host: ${{ secrets.SERVER_IP }}
username: ${{ secrets.SERVER_USER }}
key: ${{ secrets.SERVER_SSH_KEY }}
port: ${{ secrets.SERVER_PORT }}
envs: WORK_DIR,MONITORING_ENV
script: |
set -euo pipefail
: "${WORK_DIR:?}"
: "${MONITORING_ENV:?}"
cd "${WORK_DIR}/monitoring"
umask 077
printf '%s' "${MONITORING_ENV}" > .env
chmod 600 .env
if ! docker volume inspect monitoring_prometheus-data >/dev/null 2>&1; then
docker volume create monitoring_prometheus-data
fi
if ! docker volume inspect monitoring_grafana-data >/dev/null 2>&1; then
docker volume create monitoring_grafana-data
fi
if ! docker volume inspect monitoring_loki-data >/dev/null 2>&1; then
docker volume create monitoring_loki-data
fi
if ! docker volume inspect monitoring_promtail-positions >/dev/null 2>&1; then
docker volume create monitoring_promtail-positions
fi
docker compose up -d
docker compose ps
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ application.yml
*adminsdk.json

logs
/monitoring/.env
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ dependencies {
implementation platform('software.amazon.awssdk:bom:2.41.14')
implementation 'software.amazon.awssdk:s3'

// monitoring
implementation 'io.micrometer:micrometer-registry-prometheus'

// notification
implementation 'com.google.firebase:firebase-admin:9.2.0'

Expand Down
8 changes: 0 additions & 8 deletions monitoring/.env.example

This file was deleted.

62 changes: 0 additions & 62 deletions monitoring/docker-compose.yml

This file was deleted.

25 changes: 0 additions & 25 deletions monitoring/loki.yml

This file was deleted.

11 changes: 0 additions & 11 deletions monitoring/prometheus.yml

This file was deleted.

25 changes: 0 additions & 25 deletions monitoring/promtail.yml

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@
</encoder>
</appender>

<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_PATH}/konect-backend.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${LOG_PATH}/konect-backend.%d{yyyy-MM-dd}.log</fileNamePattern>
<maxHistory>30</maxHistory>
<totalSizeCap>3GB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>[%d{yyyy-MM-dd'T'HH:mm:ss.SSS}] %-5level ${PID:-} --- [%15.15thread] %-40.40logger{36} : %msg%n</pattern>
</encoder>
</appender>

<appender name="SCHEDULER_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_PATH}/scheduler.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
Expand Down Expand Up @@ -89,7 +77,6 @@

<root level="INFO">
<appender-ref ref="STDOUT"/>
<appender-ref ref="FILE"/>
<appender-ref ref="ASYNC_SLACK_STARTUP"/>
</root>
</configuration>