Додані повідомлення та перепрацьована структура застосунку та api

docker-compose.yml

@@ -31,11 +31,11 @@ services:
       - VAPID_PRIVATE_KEY=${VAPID_PRIVATE_KEY}
       - DOMAIN=${DOMAIN}
       - ADMIN_TOKEN=${ADMIN_TOKEN}
+      - TELEGRAM_TOKEN=${TELEGRAM_TOKEN}
+      - STAND_CHAT_ID=${STAND_CHAT_ID}
     shm_size: '1gb'
     networks:
       - network
-    depends_on:
-      - metrics
 
   ws:
     image: sheep-service/ws
@@ -48,57 +48,12 @@ services:
     environment:
       - TZ=${TZ}
       - DATABASE_PATH=/app/data/
+      - VAPID_PUBLIC_KEY=${VAPID_PUBLIC_KEY}
+      - VAPID_PRIVATE_KEY=${VAPID_PRIVATE_KEY}
+      - DOMAIN=${DOMAIN}
     networks:
       - network
 
-  metrics:
-    image: sheep-service/metrics
-    build: ./metrics
-    ports:
-      - "4005:4005"      # HTTP push
-      - "4006:4006"      # WebSocket
-    networks:
-      - network
-    depends_on:
-      - pushgateway
-
-  pushgateway:
-    image: prom/pushgateway
-    ports:
-      - "4007:9091"
-    networks:
-      - network
-
-  prometheus:
-    image: prom/prometheus
-    volumes:
-      - "${DATA_PATH:-./data}/prometheus.yml:/etc/prometheus/prometheus.yml"
-    ports:
-      - "4008:9090"
-    networks:
-      - network
-    depends_on:
-      - pushgateway
-    command:
-      - "--config.file=/etc/prometheus/prometheus.yml"
-      - "--storage.tsdb.path=/prometheus"
-      - "--storage.tsdb.retention.time=7d"
-
-  grafana:
-    image: grafana/grafana
-    ports:
-      - "4009:3000"
-    networks:
-      - network
-    depends_on:
-      - prometheus
-    environment:
-      - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s/grafana/
-      - GF_SECURITY_ADMIN_USER=${ADMIN_USER}
-      - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_TOKEN}
-    volumes:
-      - ${DATA_PATH:-./data}/grafana:/var/lib/grafana
-
   nginx:
     image: nginx:latest
     restart: always
@@ -116,8 +71,6 @@ services:
     command: /bin/sh -c "envsubst '\$DOMAIN' < /etc/nginx/templates/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
     networks:
       - network
-    depends_on:
-      - grafana
 
   cron:
     image: sheep-service/cron
@@ -129,7 +82,11 @@ services:
       - TZ=${TZ}
       - DATABASE_PATH=/app/data/
       - TELEGRAM_TOKEN=${TELEGRAM_TOKEN}
+      - STAND_CHAT_ID=${STAND_CHAT_ID}
       - CHAT_ID=${CHAT_ID}
+      - VAPID_PUBLIC_KEY=${VAPID_PUBLIC_KEY}
+      - VAPID_PRIVATE_KEY=${VAPID_PRIVATE_KEY}
+      - DOMAIN=${DOMAIN}
     networks:
       - network