From 531d822338ab48953ce4f205f4412390452c6f68 Mon Sep 17 00:00:00 2001 From: Denozordec Date: Sun, 15 Nov 2026 20:36:15 +0700 Subject: [PATCH] =?UTF-8?q?ci:=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20workflow=20=D0=B8=20=D1=80=D0=B0=D0=B7=D0=B2?= =?UTF-8?q?=D1=91=D1=80=D1=82=D1=8B=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=20MCP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 5.5 --- .gitea/workflows/docker.yml | 3 +- .gitea/workflows/mcp-acceptance-preview.yml | 274 ++++++++++++++++++++ deploy/docker-compose.2gb.yml | 69 +++++ deploy/docker-compose.cdn-mm.yml | 1 + deploy/docker-compose.test.yml | 1 + deploy/docker-compose.traefik-cdn.yml | 1 + deploy/docker-compose.traefik.yml | 1 + deploy/docker-compose.yml | 1 + deploy/env.cdn-mm.example | 4 + deploy/env.test.example | 4 + deploy/env.traefik.example | 5 + deploy/netflow-agent/install.sh | 1 + deploy/run-beside-cdn-traefik.sh | 2 + 13 files changed, 366 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/mcp-acceptance-preview.yml create mode 100644 deploy/docker-compose.2gb.yml diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 11d8f720..38c57dd0 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -153,8 +153,9 @@ jobs: NODE cp packages/contracts/package.json packages/contracts/tsconfig.json "$STAGING/packages/contracts/" cp -R packages/contracts/src "$STAGING/packages/contracts/" - cp backend/package.json backend/tsconfig.json "$STAGING/backend/" + cp backend/package.json backend/tsconfig.json backend/mcp-coverage.json "$STAGING/backend/" cp -R backend/src "$STAGING/backend/" + node backend/scripts/stage-database-operator.mjs "$STAGING/backend/scripts" mkdir -p "$STAGING/deploy/netflow-agent" cp deploy/netflow-agent/install.sh "$STAGING/deploy/netflow-agent/" if [ -d backend/drizzle ]; then diff --git a/.gitea/workflows/mcp-acceptance-preview.yml b/.gitea/workflows/mcp-acceptance-preview.yml new file mode 100644 index 00000000..bd6fd721 --- /dev/null +++ b/.gitea/workflows/mcp-acceptance-preview.yml @@ -0,0 +1,274 @@ +name: MCP isolated acceptance preview images +'on': + workflow_dispatch: + inputs: + expected_sha: + description: Exact reviewed full commit SHA on the selected ref; includes all accepted source changes + required: true + type: string + auth_portal_origin: + description: Canonical isolated browser-facing Auth Portal HTTP(S) origin; no path, credentials or query + required: true + type: string + default: http://127.0.0.1:55175 +permissions: + contents: read + packages: write +jobs: + backend-preview: + if: ${{ gitea.event_name == 'workflow_dispatch' }} + runs-on: ubuntu-latest + timeout-minutes: 40 + env: + COMPONENT: backend + EXPECTED_SHA: ${{ inputs.expected_sha }} + DISPATCH_SHA: ${{ gitea.sha }} + DISPATCH_EVENT: ${{ gitea.event_name }} + REPOSITORY: ${{ gitea.repository }} + RUN_ID: ${{ gitea.run_id }} + RUN_ATTEMPT: ${{ gitea.run_attempt }} + steps: + - name: Checkout exact dispatch commit + uses: actions/checkout@v4 + with: + ref: ${{ gitea.sha }} + persist-credentials: false + - name: Use existing Linux Node22 build toolchain + uses: actions/setup-node@v4 + with: + node-version: '22' + - name: Verify source and isolated preview destination + shell: bash + run: | + set -euo pipefail + test "$DISPATCH_EVENT" = workflow_dispatch + [[ "$EXPECTED_SHA" =~ ^[0-9a-f]{40}$ ]] + test "$EXPECTED_SHA" = "$DISPATCH_SHA" + test "$(git rev-parse HEAD)" = "$EXPECTED_SHA" + git diff --exit-code + git diff --cached --exit-code + [[ "$RUN_ID" =~ ^[0-9]+$ && "$RUN_ATTEMPT" =~ ^[0-9]+$ ]] + owner=$(printf '%s' "$REPOSITORY" | cut -d/ -f1 | tr '[:upper:]' '[:lower:]') + name=$(printf '%s' "$REPOSITORY" | cut -d/ -f2 | tr '[:upper:]' '[:lower:]') + [[ "$owner" =~ ^[a-z0-9][a-z0-9._-]*$ && "$name" =~ ^[a-z0-9][a-z0-9._-]*$ ]] + stem=$(printf '%s' "$name" | sed -E 's/-[0-9]+$//') + echo "IMAGE_NAME=git.shx.one/$owner/$stem-$COMPONENT-mcp-acceptance" >> "$GITHUB_ENV" + echo "PREVIEW_TAG=mcp-acceptance-$EXPECTED_SHA-$RUN_ID-$RUN_ATTEMPT" >> "$GITHUB_ENV" + echo "PREVIEW_CACHE=git.shx.one/$owner/$stem-$COMPONENT-mcp-acceptance-buildcache:node-buildcache" >> "$GITHUB_ENV" + mkdir -p .ci/acceptance-evidence + node <<'NODE' + const fs=require('node:fs'),cp=require('node:child_process'),crypto=require('node:crypto'); + const files=cp.execFileSync('git',['ls-files','-z'],{encoding:'utf8'}).split('\0').filter(Boolean); + const inputs=files.map(path=>{const info=fs.lstatSync(path);if(!info.isFile()||info.isSymbolicLink())throw Error('Regular tracked source inputs required');const data=fs.readFileSync(path);return {path,sha256:crypto.createHash('sha256').update(data).digest('hex'),bytes:data.length}}); + fs.writeFileSync('.ci/acceptance-evidence/source.json',JSON.stringify({format:'mcp-preview-source-v1',repository:process.env.REPOSITORY,sourceSha:process.env.EXPECTED_SHA,sourceTree:cp.execFileSync('git',['rev-parse','HEAD^{tree}'],{encoding:'utf8'}).trim(),platform:'linux/amd64',component:process.env.COMPONENT,runId:process.env.RUN_ID,runAttempt:process.env.RUN_ATTEMPT,authPortalOrigin:process.env.AUTH_PORTAL_ORIGIN??null,inputs},null,2)+'\n'); + NODE + - name: Prepare existing scoped Docker context + shell: bash + run: | + set -euo pipefail + STAGING=".ci/docker/backend" + rm -rf "$STAGING" + mkdir -p "$STAGING/packages/contracts" "$STAGING/backend" + cp package-lock.json "$STAGING/" + node <<'NODE' + const fs = require("node:fs") + const pkg = JSON.parse(fs.readFileSync("package.json", "utf8")) + pkg.workspaces = ["packages/*", "backend"] + pkg.dependencies = {} + pkg.devDependencies = {} + delete pkg.scripts + fs.writeFileSync(".ci/docker/backend/package.json", `${JSON.stringify(pkg, null, 2)}\n`) + NODE + cp packages/contracts/package.json packages/contracts/tsconfig.json "$STAGING/packages/contracts/" + cp -R packages/contracts/src "$STAGING/packages/contracts/" + cp backend/package.json backend/tsconfig.json backend/mcp-coverage.json "$STAGING/backend/" + cp -R backend/src "$STAGING/backend/" + mkdir -p "$STAGING/deploy/netflow-agent" + cp deploy/netflow-agent/install.sh "$STAGING/deploy/netflow-agent/" + if [ -d backend/drizzle ]; then + cp -R backend/drizzle "$STAGING/backend/" + fi + node backend/scripts/stage-database-operator.mjs "$STAGING/backend/scripts" + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log in to existing Gitea registry + uses: docker/login-action@v3 + with: + registry: git.shx.one + username: ${{ gitea.actor }} + password: ${{ secrets.ACTIONS_PAT }} + - name: Build and push isolated acceptance image + id: build + uses: docker/build-push-action@v5 + with: + context: .ci/docker/backend + file: backend/Dockerfile + platforms: linux/amd64 + push: true + tags: ${{ env.IMAGE_NAME }}:${{ env.PREVIEW_TAG }} + build-args: APP_VERSION=${{ env.PREVIEW_TAG }} + cache-from: type=gha,scope=mcp-acceptance-backend + cache-to: type=gha,scope=mcp-acceptance-backend,mode=max + provenance: mode=min + sbom: true + labels: |- + org.opencontainers.image.revision=${{ gitea.sha }} + org.opencontainers.image.version=${{ env.PREVIEW_TAG }} + io.mmapp.acceptance-only=true + - name: Record exact digest and build metadata + shell: bash + env: + IMAGE_DIGEST: ${{ steps.build.outputs.digest }} + BUILD_METADATA: ${{ steps.build.outputs.metadata }} + run: | + set -euo pipefail + node <<'NODE' + const fs=require('node:fs'),crypto=require('node:crypto'); + const digest=process.env.IMAGE_DIGEST;if(!/^sha256:[a-f0-9]{64}$/.test(digest))throw Error('Exact registry digest required'); + const metadata=JSON.parse(process.env.BUILD_METADATA);const source=fs.readFileSync('.ci/acceptance-evidence/source.json'); + fs.writeFileSync('.ci/acceptance-evidence/image.json',JSON.stringify({format:'mcp-preview-image-v1',sourceSha:process.env.EXPECTED_SHA,sourceProofSha256:crypto.createHash('sha256').update(source).digest('hex'),image:process.env.IMAGE_NAME,tag:process.env.PREVIEW_TAG,digest,pinnedReference:process.env.IMAGE_NAME+'@'+digest,platform:'linux/amd64',component:process.env.COMPONENT,authPortalOrigin:process.env.AUTH_PORTAL_ORIGIN??null,buildMetadata:metadata,productionDeployed:false,wholeInstallation2GbAccepted:false},null,2)+'\n'); + console.log('Acceptance image digest: '+process.env.IMAGE_NAME+'@'+digest); + NODE + - name: Retain source and image binding artifacts + uses: actions/upload-artifact@v3 + with: + name: mcp-acceptance-${{ env.COMPONENT }}-${{ gitea.sha }}-${{ gitea.run_id }}-${{ gitea.run_attempt }} + path: .ci/acceptance-evidence/*.json + if-no-files-found: error + retention-days: 14 + frontend-preview: + if: ${{ gitea.event_name == 'workflow_dispatch' }} + runs-on: ubuntu-latest + timeout-minutes: 40 + env: + COMPONENT: frontend + EXPECTED_SHA: ${{ inputs.expected_sha }} + DISPATCH_SHA: ${{ gitea.sha }} + DISPATCH_EVENT: ${{ gitea.event_name }} + REPOSITORY: ${{ gitea.repository }} + RUN_ID: ${{ gitea.run_id }} + RUN_ATTEMPT: ${{ gitea.run_attempt }} + AUTH_PORTAL_ORIGIN_REQUEST: ${{ inputs.auth_portal_origin }} + steps: + - name: Checkout exact dispatch commit + uses: actions/checkout@v4 + with: + ref: ${{ gitea.sha }} + persist-credentials: false + - name: Use existing Linux Node22 build toolchain + uses: actions/setup-node@v4 + with: + node-version: '22' + - name: Validate explicit isolated portal origin + shell: bash + run: | + set -euo pipefail + node <<'NODE' + const fs=require('node:fs'),assert=require('node:assert/strict'); + const raw=process.env.AUTH_PORTAL_ORIGIN_REQUEST; + assert(typeof raw==='string'&&raw.length>0&&raw.length<=2048&&!/[\x00-\x20\x7f]/.test(raw),'Bounded canonical HTTP(S) origin required'); + const origin=new URL(raw); + assert(['http:','https:'].includes(origin.protocol)&&!origin.username&&!origin.password&&origin.pathname==='/'&&!origin.search&&!origin.hash&&origin.origin!=='null'&&origin.origin===raw,'Canonical origin only; credentials/path/query/hash refused'); + fs.appendFileSync(process.env.GITHUB_ENV,'AUTH_PORTAL_ORIGIN='+origin.origin+'\n'); + NODE + - name: Verify source and isolated preview destination + shell: bash + run: | + set -euo pipefail + test "$DISPATCH_EVENT" = workflow_dispatch + [[ "$EXPECTED_SHA" =~ ^[0-9a-f]{40}$ ]] + test "$EXPECTED_SHA" = "$DISPATCH_SHA" + test "$(git rev-parse HEAD)" = "$EXPECTED_SHA" + git diff --exit-code + git diff --cached --exit-code + [[ "$RUN_ID" =~ ^[0-9]+$ && "$RUN_ATTEMPT" =~ ^[0-9]+$ ]] + owner=$(printf '%s' "$REPOSITORY" | cut -d/ -f1 | tr '[:upper:]' '[:lower:]') + name=$(printf '%s' "$REPOSITORY" | cut -d/ -f2 | tr '[:upper:]' '[:lower:]') + [[ "$owner" =~ ^[a-z0-9][a-z0-9._-]*$ && "$name" =~ ^[a-z0-9][a-z0-9._-]*$ ]] + stem=$(printf '%s' "$name" | sed -E 's/-[0-9]+$//') + echo "IMAGE_NAME=git.shx.one/$owner/$stem-$COMPONENT-mcp-acceptance" >> "$GITHUB_ENV" + echo "PREVIEW_TAG=mcp-acceptance-$EXPECTED_SHA-$RUN_ID-$RUN_ATTEMPT" >> "$GITHUB_ENV" + echo "PREVIEW_CACHE=git.shx.one/$owner/$stem-$COMPONENT-mcp-acceptance-buildcache:node-buildcache" >> "$GITHUB_ENV" + mkdir -p .ci/acceptance-evidence + node <<'NODE' + const fs=require('node:fs'),cp=require('node:child_process'),crypto=require('node:crypto'); + const files=cp.execFileSync('git',['ls-files','-z'],{encoding:'utf8'}).split('\0').filter(Boolean); + const inputs=files.map(path=>{const info=fs.lstatSync(path);if(!info.isFile()||info.isSymbolicLink())throw Error('Regular tracked source inputs required');const data=fs.readFileSync(path);return {path,sha256:crypto.createHash('sha256').update(data).digest('hex'),bytes:data.length}}); + fs.writeFileSync('.ci/acceptance-evidence/source.json',JSON.stringify({format:'mcp-preview-source-v1',repository:process.env.REPOSITORY,sourceSha:process.env.EXPECTED_SHA,sourceTree:cp.execFileSync('git',['rev-parse','HEAD^{tree}'],{encoding:'utf8'}).trim(),platform:'linux/amd64',component:process.env.COMPONENT,runId:process.env.RUN_ID,runAttempt:process.env.RUN_ATTEMPT,authPortalOrigin:process.env.AUTH_PORTAL_ORIGIN??null,inputs},null,2)+'\n'); + NODE + - name: Prepare existing scoped Docker context + shell: bash + run: | + set -euo pipefail + STAGING=".ci/docker/frontend" + rm -rf "$STAGING" + mkdir -p "$STAGING/packages/contracts" "$STAGING/public" + cp package-lock.json next.config.ts tsconfig.json postcss.config.mjs eslint.config.mjs components.json "$STAGING/" + node <<'NODE' + const fs = require("node:fs") + const pkg = JSON.parse(fs.readFileSync("package.json", "utf8")) + pkg.workspaces = ["packages/*"] + fs.writeFileSync(".ci/docker/frontend/package.json", `${JSON.stringify(pkg, null, 2)}\n`) + NODE + cp packages/contracts/package.json packages/contracts/tsconfig.json "$STAGING/packages/contracts/" + cp -R packages/contracts/src "$STAGING/packages/contracts/" + for dir in app components lib shared entities public hooks; do + if [ -d "$dir" ]; then + cp -R "$dir" "$STAGING/" + fi + done + test -f "$STAGING/public/release-manifest.json" + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log in to existing Gitea registry + uses: docker/login-action@v3 + with: + registry: git.shx.one + username: ${{ gitea.actor }} + password: ${{ secrets.ACTIONS_PAT }} + - name: Build and push isolated acceptance image + id: build + uses: docker/build-push-action@v5 + with: + context: .ci/docker/frontend + file: Dockerfile.frontend + platforms: linux/amd64 + push: true + tags: ${{ env.IMAGE_NAME }}:${{ env.PREVIEW_TAG }} + build-args: |- + BACKEND_INTERNAL_URL=http://backend:8000 + NEXT_PUBLIC_BACKEND_URL=same-origin + NEXT_PUBLIC_DEFAULT_DATA_SOURCE=live + NEXT_PUBLIC_ALLOW_MOCK_DATA=false + NEXT_PUBLIC_AUTH_PORTAL_URL=${{ env.AUTH_PORTAL_ORIGIN }} + NEXT_PUBLIC_APP_VERSION=${{ env.PREVIEW_TAG }} + NEXT_PUBLIC_RELEASE_URL= + cache-from: type=gha,scope=mcp-acceptance-frontend + cache-to: type=gha,scope=mcp-acceptance-frontend,mode=max + provenance: mode=min + sbom: true + labels: |- + org.opencontainers.image.revision=${{ gitea.sha }} + org.opencontainers.image.version=${{ env.PREVIEW_TAG }} + io.mmapp.acceptance-only=true + - name: Record exact digest and build metadata + shell: bash + env: + IMAGE_DIGEST: ${{ steps.build.outputs.digest }} + BUILD_METADATA: ${{ steps.build.outputs.metadata }} + run: | + set -euo pipefail + node <<'NODE' + const fs=require('node:fs'),crypto=require('node:crypto'); + const digest=process.env.IMAGE_DIGEST;if(!/^sha256:[a-f0-9]{64}$/.test(digest))throw Error('Exact registry digest required'); + const metadata=JSON.parse(process.env.BUILD_METADATA);const source=fs.readFileSync('.ci/acceptance-evidence/source.json'); + fs.writeFileSync('.ci/acceptance-evidence/image.json',JSON.stringify({format:'mcp-preview-image-v1',sourceSha:process.env.EXPECTED_SHA,sourceProofSha256:crypto.createHash('sha256').update(source).digest('hex'),image:process.env.IMAGE_NAME,tag:process.env.PREVIEW_TAG,digest,pinnedReference:process.env.IMAGE_NAME+'@'+digest,platform:'linux/amd64',component:process.env.COMPONENT,authPortalOrigin:process.env.AUTH_PORTAL_ORIGIN??null,buildMetadata:metadata,productionDeployed:false,wholeInstallation2GbAccepted:false},null,2)+'\n'); + console.log('Acceptance image digest: '+process.env.IMAGE_NAME+'@'+digest); + NODE + - name: Retain source and image binding artifacts + uses: actions/upload-artifact@v3 + with: + name: mcp-acceptance-${{ env.COMPONENT }}-${{ gitea.sha }}-${{ gitea.run_id }}-${{ gitea.run_attempt }} + path: .ci/acceptance-evidence/*.json + if-no-files-found: error + retention-days: 14 diff --git a/deploy/docker-compose.2gb.yml b/deploy/docker-compose.2gb.yml new file mode 100644 index 00000000..9917ca3f --- /dev/null +++ b/deploy/docker-compose.2gb.yml @@ -0,0 +1,69 @@ +# Candidate for resource acceptance, not an accepted production sizing claim. +# Apply after the base compose file that defines postgres/backend/frontend. +# Never use this alone; portal/proxy/agents and host memory need separate budget. +# See docs/mcp-2gb-resource-acceptance.md. No image, volume or network changes. +services: + postgres: + mem_limit: 384m + memswap_limit: 384m + mem_reservation: 128m + shm_size: 128m + command: + - postgres + - -c + - timezone=UTC + - -c + - listen_addresses=* + - -c + - max_connections=48 + - -c + - shared_buffers=64MB + - -c + - work_mem=2MB + - -c + - hash_mem_multiplier=1 + - -c + - temp_buffers=4MB + - -c + - maintenance_work_mem=32MB + - -c + - autovacuum_work_mem=32MB + - -c + - autovacuum_max_workers=1 + - -c + - max_parallel_workers_per_gather=0 + - -c + - max_parallel_maintenance_workers=0 + - -c + - max_parallel_workers=0 + - -c + - wal_compression=lz4 + - -c + - default_toast_compression=lz4 + - -c + - io_method=worker + - -c + - io_workers=1 + - -c + - effective_io_concurrency=16 + - -c + - max_wal_size=2GB + - -c + - checkpoint_timeout=15min + - -c + - checkpoint_completion_target=0.9 + backend: + mem_limit: 512m + memswap_limit: 512m + mem_reservation: 192m + environment: + # Heap is only part of process memory; worker heaps share this cgroup cap. + NODE_OPTIONS: --max-old-space-size=192 --max-semi-space-size=16 + # Explicit opt-in; source/output capacity is smaller than standard. + MM_FLOW_READ_RESOURCE_PROFILE: constrained + frontend: + mem_limit: 160m + memswap_limit: 160m + mem_reservation: 48m + environment: + NODE_OPTIONS: --max-old-space-size=96 diff --git a/deploy/docker-compose.cdn-mm.yml b/deploy/docker-compose.cdn-mm.yml index 5e8cd23c..d258e271 100644 --- a/deploy/docker-compose.cdn-mm.yml +++ b/deploy/docker-compose.cdn-mm.yml @@ -198,6 +198,7 @@ services: AUTH_PORTAL_URL: ${AUTH_PORTAL_URL:-https://auth.shnt.top} # IPFIX: внутри контейнера слушать все iface; на хосте bind только WG-IP после wg-quick@wg-flow FLOW_LISTEN_HOST: "0.0.0.0" + FLOW_TEMPLATE_LIFETIME_MS: ${FLOW_TEMPLATE_LIFETIME_MS:-5400000} # Сначала wg-quick@wg-flow (адрес 10.255.254.1), затем recreate backend. ports: - "10.255.254.1:4739:4739/udp" diff --git a/deploy/docker-compose.test.yml b/deploy/docker-compose.test.yml index 79612e9f..e3bd4475 100644 --- a/deploy/docker-compose.test.yml +++ b/deploy/docker-compose.test.yml @@ -83,6 +83,7 @@ services: AUTH_PORTAL_URL: ${AUTH_PORTAL_URL:-http://localhost:5175} # IPFIX: внутри контейнера слушаем все интерфейсы; на хосте UDP 4739 публикуется только на WG-IP FLOW_LISTEN_HOST: "0.0.0.0" + FLOW_TEMPLATE_LIFETIME_MS: ${FLOW_TEMPLATE_LIFETIME_MS:-5400000} volumes: - ./data:/app/data # Native .rsc files must survive backend recreation. diff --git a/deploy/docker-compose.traefik-cdn.yml b/deploy/docker-compose.traefik-cdn.yml index aaa2c538..c46cf9f1 100644 --- a/deploy/docker-compose.traefik-cdn.yml +++ b/deploy/docker-compose.traefik-cdn.yml @@ -95,6 +95,7 @@ services: AUTH_JWT_SECRET: ${AUTH_JWT_SECRET:?set AUTH_JWT_SECRET in .env} AUTH_ISSUER: ${AUTH_ISSUER:-https://auth.shnt.top} AUTH_PORTAL_URL: ${AUTH_PORTAL_URL:-https://auth.shnt.top} + FLOW_TEMPLATE_LIFETIME_MS: ${FLOW_TEMPLATE_LIFETIME_MS:-5400000} volumes: - ./data:/app/data # Native .rsc files must survive backend recreation. diff --git a/deploy/docker-compose.traefik.yml b/deploy/docker-compose.traefik.yml index 3c562a29..64eee15c 100644 --- a/deploy/docker-compose.traefik.yml +++ b/deploy/docker-compose.traefik.yml @@ -133,6 +133,7 @@ services: AUTH_JWT_SECRET: ${AUTH_JWT_SECRET:?set AUTH_JWT_SECRET in .env} AUTH_ISSUER: ${AUTH_ISSUER:-https://auth.shnt.top} AUTH_PORTAL_URL: ${AUTH_PORTAL_URL:-https://auth.shnt.top} + FLOW_TEMPLATE_LIFETIME_MS: ${FLOW_TEMPLATE_LIFETIME_MS:-5400000} volumes: - ./data:/app/data # Native .rsc files must survive backend recreation. diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 66a6a79f..f05e3c0c 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -67,6 +67,7 @@ services: DATABASE_PATH: /app/data/mikrotik.db # IPFIX: внутри контейнера слушаем все интерфейсы; на хосте UDP 4739 публикуется только на WG-IP FLOW_LISTEN_HOST: "0.0.0.0" + FLOW_TEMPLATE_LIFETIME_MS: ${FLOW_TEMPLATE_LIFETIME_MS:-5400000} volumes: - /opt/mmapp/data:/app/data # Native .rsc files must survive backend recreation. diff --git a/deploy/env.cdn-mm.example b/deploy/env.cdn-mm.example index 98a139fe..850891bc 100644 --- a/deploy/env.cdn-mm.example +++ b/deploy/env.cdn-mm.example @@ -32,6 +32,10 @@ NODE_ENV=production # --- MikrotikManager PostgreSQL --- POSTGRES_PASSWORD= +# UDP v9/IPFIX template lifetime (milliseconds), applied on backend recreation. +# 90m collector policy, not a RouterOS default; use >=3x largest actual exporter refresh. +# FLOW_TEMPLATE_LIFETIME_MS=5400000 + # Portal SSO — used by CDN Manager and MikrotikManager backend AUTH_REQUIRED=true # Same HS256 secret as auth-portal JWT_SECRET (required) diff --git a/deploy/env.test.example b/deploy/env.test.example index be42f6d1..b1168862 100644 --- a/deploy/env.test.example +++ b/deploy/env.test.example @@ -9,3 +9,7 @@ AUTH_REQUIRED=false AUTH_ISSUER=https://auth.test.local AUTH_PORTAL_URL=http://localhost:5175 CORS_ORIGIN=http://localhost:3000 + +# UDP v9/IPFIX template lifetime (milliseconds), applied on backend recreation. +# 90m collector policy, not a RouterOS default; use >=3x largest actual exporter refresh. +# FLOW_TEMPLATE_LIFETIME_MS=5400000 diff --git a/deploy/env.traefik.example b/deploy/env.traefik.example index adb3cd69..76c8013a 100644 --- a/deploy/env.traefik.example +++ b/deploy/env.traefik.example @@ -27,6 +27,11 @@ LETSENCRYPT_EMAIL=admin@shnt.top # --- PostgreSQL --- POSTGRES_PASSWORD= +# UDP v9/IPFIX template lifetime (milliseconds), applied on backend recreation. +# For run-beside-cdn-traefik.sh pass/export this variable explicitly to the script. +# 90m collector policy, not a RouterOS default; use >=3x largest actual exporter refresh. +# FLOW_TEMPLATE_LIFETIME_MS=5400000 + # --- Images --- MM_BACKEND_IMAGE_TAG=latest MM_FRONTEND_IMAGE_TAG=latest diff --git a/deploy/netflow-agent/install.sh b/deploy/netflow-agent/install.sh index 7e22fcd8..655d93fa 100644 --- a/deploy/netflow-agent/install.sh +++ b/deploy/netflow-agent/install.sh @@ -95,6 +95,7 @@ services: environment: FLOW_AGENT_SOCKET: /run/mm-netflow-host/agent.sock FLOW_LISTEN_HOST: "0.0.0.0" + FLOW_TEMPLATE_LIFETIME_MS: \${FLOW_TEMPLATE_LIFETIME_MS:-5400000} volumes: - ./data/netflow-agent-socket:/run/mm-netflow-host:ro ports: diff --git a/deploy/run-beside-cdn-traefik.sh b/deploy/run-beside-cdn-traefik.sh index ddfac01a..6b85d699 100644 --- a/deploy/run-beside-cdn-traefik.sh +++ b/deploy/run-beside-cdn-traefik.sh @@ -17,6 +17,7 @@ # MM_BACKEND_IMAGE_TAG=latest # MM_FRONTEND_IMAGE_TAG=latest # MM_UPDATER_IMAGE_TAG=latest +# FLOW_TEMPLATE_LIFETIME_MS=5400000 # collector policy; >=3x exporter template refresh # REGISTRY_USERNAME=… REGISTRY_PASSWORD=… # optional private pull set -euo pipefail @@ -146,6 +147,7 @@ docker run -d \ -e "AUTH_JWT_SECRET=${AUTH_JWT_SECRET:?set AUTH_JWT_SECRET}" \ -e "AUTH_ISSUER=${AUTH_ISSUER:-https://auth.shnt.top}" \ -e "AUTH_PORTAL_URL=${AUTH_PORTAL_URL:-https://auth.shnt.top}" \ + -e "FLOW_TEMPLATE_LIFETIME_MS=${FLOW_TEMPLATE_LIFETIME_MS:-5400000}" \ -v "${MM_ROOT}/data:/app/data" \ --label mmapp.updater.managed=true \ --label mmapp.updater.target=backend \