diff --git a/.github/workflows/auto-deploy.yml b/.github/workflows/auto-deploy.yml index 63c8e1ff7..6f5f269dd 100644 --- a/.github/workflows/auto-deploy.yml +++ b/.github/workflows/auto-deploy.yml @@ -16,6 +16,7 @@ jobs: submodules: recursive token: ${{ secrets.SUBMODULE_TOKEN }} + - name: Set up JDK 17 uses: actions/setup-java@v4 with: @@ -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: | @@ -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 diff --git a/.gitignore b/.gitignore index af5e5e8d4..b4ddde3f7 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,3 @@ application.yml *adminsdk.json logs -/monitoring/.env diff --git a/build.gradle b/build.gradle index 00b8cf28b..b7b937359 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/monitoring/.env.example b/monitoring/.env.example deleted file mode 100644 index 9a9434aa9..000000000 --- a/monitoring/.env.example +++ /dev/null @@ -1,8 +0,0 @@ -GRAFANA_ADMIN_USER=temp -GRAFANA_ADMIN_PASSWORD=temp - -PROMETHEUS_PORT=9090 - -GRAFANA_PORT=3000 - -LOKI_PORT=3100 diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml deleted file mode 100644 index 900dd19d6..000000000 --- a/monitoring/docker-compose.yml +++ /dev/null @@ -1,62 +0,0 @@ -services: - prometheus: - image: prom/prometheus:v3.5.0 - ports: - - "127.0.0.1:${PROMETHEUS_PORT:-9090}:9090" - extra_hosts: - - "host.docker.internal:host-gateway" - volumes: - - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro - - prometheus-data:/prometheus - restart: unless-stopped - - grafana: - image: grafana/grafana:12.3.1 - ports: - - "127.0.0.1:${GRAFANA_PORT:-3000}:3000" - env_file: - - .env - environment: - - GF_SECURITY_ADMIN_USER=${GRAFANA_ADMIN_USER:?} - - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD:?} - volumes: - - grafana-data:/var/lib/grafana - restart: unless-stopped - depends_on: - - prometheus - - loki: - image: grafana/loki:3.1.0 - ports: - - "127.0.0.1:${LOKI_PORT:-3100}:3100" - command: -config.file=/etc/loki/config.yml - volumes: - - ./loki.yml:/etc/loki/config.yml:ro - - loki-data:/loki - restart: unless-stopped - - promtail: - image: grafana/promtail:3.1.0 - command: -config.file=/etc/promtail/config.yml - volumes: - - ./promtail.yml:/etc/promtail/config.yml:ro - - ../logs:/var/log/konect-backend:ro - - /var/log/nginx:/var/log/nginx:ro - - promtail-positions:/var/lib/promtail - restart: unless-stopped - depends_on: - - loki - -volumes: - prometheus-data: - external: true - name: monitoring_prometheus-data - grafana-data: - external: true - name: monitoring_grafana-data - loki-data: - external: true - name: monitoring_loki-data - promtail-positions: - external: true - name: monitoring_promtail-positions diff --git a/monitoring/loki.yml b/monitoring/loki.yml deleted file mode 100644 index b822f04be..000000000 --- a/monitoring/loki.yml +++ /dev/null @@ -1,25 +0,0 @@ -auth_enabled: false - -server: - http_listen_port: 3100 - -common: - path_prefix: /loki - storage: - filesystem: - chunks_directory: /loki/chunks - rules_directory: /loki/rules - replication_factor: 1 - ring: - kvstore: - store: inmemory - -schema_config: - configs: - - from: 2026-01-01 - store: tsdb - object_store: filesystem - schema: v13 - index: - prefix: index_ - period: 24h diff --git a/monitoring/prometheus.yml b/monitoring/prometheus.yml deleted file mode 100644 index 57b807fef..000000000 --- a/monitoring/prometheus.yml +++ /dev/null @@ -1,11 +0,0 @@ -global: - scrape_interval: 15s - evaluation_interval: 15s - -scrape_configs: - - job_name: "konect-backend" - metrics_path: "/actuator/prometheus" - scrape_interval: 10s - static_configs: - - targets: - - "host.docker.internal:8080" diff --git a/monitoring/promtail.yml b/monitoring/promtail.yml deleted file mode 100644 index 0b7eb3a72..000000000 --- a/monitoring/promtail.yml +++ /dev/null @@ -1,25 +0,0 @@ -server: - http_listen_port: 9080 - grpc_listen_port: 0 - -positions: - filename: /var/lib/promtail/positions.yml - sync_period: 1s - -clients: - - url: http://loki:3100/loki/api/v1/push - -scrape_configs: - - job_name: konect-backend - static_configs: - - targets: [localhost] - labels: - job: konect-backend - __path__: /var/log/konect-backend/konect-backend*.log - - - job_name: nginx - static_configs: - - targets: [localhost] - labels: - job: nginx - __path__: /var/log/nginx/*.log diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 2e8368ae3..c650aa1b3 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -14,18 +14,6 @@ - - ${LOG_PATH}/konect-backend.log - - ${LOG_PATH}/konect-backend.%d{yyyy-MM-dd}.log - 30 - 3GB - - - [%d{yyyy-MM-dd'T'HH:mm:ss.SSS}] %-5level ${PID:-} --- [%15.15thread] %-40.40logger{36} : %msg%n - - - ${LOG_PATH}/scheduler.log @@ -89,7 +77,6 @@ -