feat(docker-compose): добавлены параметры для fluentd async. Добавлены правила для последовательного разворачивания API.

2025-11-17 16:10:21 +10:00
parent 4cb7f2f6d6
commit 806cd19861
17 changed files with 74 additions and 18 deletions
--- a/PARR.API/Dockerfile
+++ b/PARR.API/Dockerfile
@@ -1,6 +1,13 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.

 FROM 10.99.253.167:8090/dotnet/aspnet:7.0 AS base
+# CURL install
+RUN rm /etc/apt/sources.list.d/debian.sources && \
+    echo "deb [trusted=yes] http://10.99.253.167:8081/repository/apt-proxy bookworm main" > /etc/apt/sources.list && \
+    echo "deb [trusted=yes] http://10.99.253.167:8081/repository/apt-proxy bookworm-updates main" >> /etc/apt/sources.list && \
+    apt-get update && \
+    apt-get install -y curl && \
+    rm -rf /var/lib/apt/lists/*
 WORKDIR /app
 EXPOSE 80

--- a/docker-compose.aihit-loader.yml
+++ b/docker-compose.aihit-loader.yml
@@ -15,6 +15,8 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.aihit-loader.serilog
--- a/docker-compose.aihit-relationships-syncer.yml
+++ b/docker-compose.aihit-relationships-syncer.yml
@@ -15,6 +15,8 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.aihit-relationships-syncer.serilog
--- a/docker-compose.aihit-syncer.yml
+++ b/docker-compose.aihit-syncer.yml
@@ -15,8 +15,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.aihit-syncer.serilog
    deploy:
      replicas: 4
--- a/docker-compose.espp-order-loader.yml
+++ b/docker-compose.espp-order-loader.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.espp-order-loader.serilog
    deploy:
      replicas: 1
--- a/docker-compose.espp-order-manager.yml
+++ b/docker-compose.espp-order-manager.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.espp-order-manager.serilog
    deploy:
      replicas: 1
--- a/docker-compose.espp-schedule-sync.yml
+++ b/docker-compose.espp-schedule-sync.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.espp-schedule-sync.serilog
    deploy:
      replicas: 4
--- a/docker-compose.espp-template-sync.yml
+++ b/docker-compose.espp-template-sync.yml
@@ -17,8 +17,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.espp-template-sync.serilog
    deploy:
      replicas: 4
--- a/docker-compose.generator-templates.yml
+++ b/docker-compose.generator-templates.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.generator-templates.serilog
    deploy:
      replicas: 1  
--- a/docker-compose.job-auto-control.yml
+++ b/docker-compose.job-auto-control.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.job-auto-control.serilog
    deploy:
      replicas: 1  
--- a/docker-compose.master.yml
+++ b/docker-compose.master.yml
@@ -12,8 +12,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.master.serilog
    deploy:
      replicas: 1
--- a/docker-compose.next-run.yml
+++ b/docker-compose.next-run.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.next-run.serilog
    deploy:
      replicas: 1
--- a/docker-compose.template-activator.yml
+++ b/docker-compose.template-activator.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.template-activator.serilog
    deploy:
      replicas: 2  
--- a/docker-compose.template-distributor.yml
+++ b/docker-compose.template-distributor.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.template-distributor.serilog
    deploy:
      replicas: 2  
--- a/docker-compose.template-generator.yml
+++ b/docker-compose.template-generator.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.template-generator.serilog
    deploy:
      replicas: 4  
--- a/docker-compose.template-task-generator.yml
+++ b/docker-compose.template-task-generator.yml
@@ -11,8 +11,10 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.template-task-generator.serilog
    deploy:
      replicas: 1  
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,13 +19,32 @@ services:
      driver: fluentd
      options:
        fluentd-address: dvgd-efk-01.dvgd.oao.rzd:24224
-        fluentd-retry-wait: '30s'
+        fluentd-retry-wait: '10s'
        fluentd-max-retries: '30'
+        fluentd-async: 'true'
+        fluentd-buffer-limit: '52428800'
        tag: parr.api.serilog
-    deploy:
-      replicas: 4
    networks:
      parr-network:
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/api/v1/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 120s
+    deploy:
+      replicas: 4
+      update_config:
+        parallelism: 1
+        delay: 5s
+        order: start-first
+        failure_action: rollback
+      rollback_config:
+        parallelism: 1
+        order: stop-first
+      restart_policy:
+        condition: any
+        window: 120s

  # REDIS STACK
  parr-redis: