增加必要的数据记录

2026-06-16 14:05:26 +08:00
parent fa19fc8722
commit b70bad4721
24 changed files with 1784 additions and 504 deletions
--- a/deploy/server/.env
+++ b/deploy/server/.env
@@ -9,13 +9,17 @@ RPKI_RTR_SLURM_DIR=/app/slurm
 # Persistent directories on host.
 RPKI_RTR_DB_HOST_DIR=../../rtr-db
 RPKI_RTR_LOG_HOST_DIR=../../logs/server
+RPKI_RTR_REPORT_HOST_DIR=../../report

 # In-container runtime paths.
 RPKI_RTR_DB_PATH=/app/rtr-db
+RPKI_RTR_REPORT_DIR=/app/report

 # Core runtime knobs.
 RPKI_RTR_STRICT_CCR_VALIDATION=false
 RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS=300
+RPKI_RTR_REPORT_INTERVAL_SECS=60
+RPKI_RTR_TIMEZONE=Asia/Shanghai
 RPKI_RTR_MAX_DELTA=10
 RPKI_RTR_MAX_CONNECTIONS=100000
 RPKI_RTR_MAX_CONCURRENT_HANDSHAKES=128
--- a/deploy/server/DEPLOYMENT.md
+++ b/deploy/server/DEPLOYMENT.md
@@ -18,6 +18,7 @@ The container runs `rpki` directly as PID 1.
 - CCR directory: `/app/data`
 - RocksDB directory: `/app/rtr-db`
 - SLURM directory: `/app/slurm`
+- Report directory: `/app/report`
 - TLS cert directory (optional): `/app/certs`

 ## Path Configuration via `.env`
@@ -28,11 +29,13 @@ The container runs `rpki` directly as PID 1.
 - `RPKI_RTR_SLURM_DIR`: in-container SLURM directory path
 - `RPKI_RTR_DB_HOST_DIR`: host RocksDB directory
 - `RPKI_RTR_LOG_HOST_DIR`: host log directory
+- `RPKI_RTR_REPORT_HOST_DIR`: host directory receiving `rtr-server.json`
 - `RPKI_RTR_DB_PATH`: in-container RocksDB directory
+- `RPKI_RTR_REPORT_DIR`: in-container report directory

 ## Runtime Configuration via `.env`

- Core: `RPKI_RTR_STRICT_CCR_VALIDATION`, `RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS`, `RPKI_RTR_MAX_DELTA`, `RPKI_RTR_MAX_CONCURRENT_HANDSHAKES`, `RUST_LOG`
+- Core: `RPKI_RTR_STRICT_CCR_VALIDATION`, `RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS`, `RPKI_RTR_MAX_DELTA`, `RPKI_RTR_MAX_CONCURRENT_HANDSHAKES`, `RPKI_RTR_REPORT_INTERVAL_SECS`, `RPKI_RTR_TIMEZONE`, `RUST_LOG`
 - TCP mode: `RPKI_RTR_MAX_CONNECTIONS`
 - TLS mode: `RPKI_RTR_ENFORCE_TLS_CLIENT_SAN_IP_MATCH`, `RPKI_RTR_TLS_CERT_PATH`, `RPKI_RTR_TLS_KEY_PATH`, `RPKI_RTR_TLS_CLIENT_CA_PATH`, `RPKI_RTR_TLS_CERTS_HOST_DIR`
 - SSH mode: `RPKI_RTR_SSH_HOST_PORT`, `RPKI_RTR_SSH_CONTAINER_PORT`, `RPKI_RTR_SSH_AUTH_MODE`, `RPKI_RTR_SSH_USERNAME`, `RPKI_RTR_SSH_SUBSYSTEM_NAME`, `RPKI_RTR_SSH_HOST_KEY_PATH`, `RPKI_RTR_SSH_AUTHORIZED_KEYS_PATH`, `RPKI_RTR_SSH_KEYS_VOLUME`, `RPKI_RTR_SSH_CERTS_HOST_DIR`
@@ -54,3 +57,22 @@ docker compose -f deploy/server/docker-compose.yml down
 ```bash
 docker compose -f deploy/server/docker-compose.yml logs -f rpki-rtr
 ```
+
+## Runtime Report
+
+The server creates `report/rtr-server.json` on startup and replaces it after
+cache refreshes and at the configured interval. The default interval is 60
+seconds. The file contains service connection counts, process RSS, cache
+timestamps, and per-protocol-version snapshot and delta counts. Schema version
+2 also includes:
+
+- CCR and SLURM source file metadata
+- latest refresh status, duration, failure count, and error
+- CCR validation and SLURM before/after payload counts
+- service start time and uptime
+- non-sensitive runtime configuration
+
+Timestamps in logs and `rtr-server.json` use `RPKI_RTR_TIMEZONE`, which
+defaults to `Asia/Shanghai`. Use IANA timezone names such as `Asia/Shanghai`,
+`Europe/London`, `America/New_York`, or `UTC`; `Shanghai` is accepted as a
+convenience alias for `Asia/Shanghai`.
--- a/deploy/server/Dockerfile
+++ b/deploy/server/Dockerfile
@@ -63,7 +63,7 @@ WORKDIR /app
 COPY --from=builder /build/target/release/rpki_rtr /usr/local/bin/rpki_rtr
 COPY --chmod=755 deploy/server/entrypoint.sh /usr/local/bin/rpki-rtr-entrypoint.sh

-RUN mkdir -p /app/data /app/rtr-db /app/certs /app/slurm /app/logs
+RUN mkdir -p /app/data /app/rtr-db /app/certs /app/slurm /app/logs /app/report

 ENV RPKI_RTR_ENABLE_TLS=false \
    RPKI_RTR_TCP_ADDR=0.0.0.0:323 \
@@ -71,6 +71,8 @@ ENV RPKI_RTR_ENABLE_TLS=false \
    RPKI_RTR_DB_PATH=/app/rtr-db \
    RPKI_RTR_CCR_DIR=/app/data \
    RPKI_RTR_SLURM_DIR=/app/slurm \
+    RPKI_RTR_REPORT_DIR=/app/report \
+    RPKI_RTR_REPORT_INTERVAL_SECS=60 \
    RPKI_RTR_REFRESH_INTERVAL_SECS=300 \
    RPKI_RTR_STRICT_CCR_VALIDATION=false

--- a/deploy/server/docker-compose.ssh.yml
+++ b/deploy/server/docker-compose.ssh.yml
@@ -27,6 +27,9 @@ services:
      RPKI_RTR_DB_PATH: "${RPKI_RTR_DB_PATH:-/app/rtr-db}"
      RPKI_RTR_CCR_DIR: "${RPKI_RTR_CCR_DIR:-/app/data}"
      RPKI_RTR_SLURM_DIR: "${RPKI_RTR_SLURM_DIR:-/app/slurm}"
+      RPKI_RTR_REPORT_DIR: "${RPKI_RTR_REPORT_DIR:-/app/report}"
+      RPKI_RTR_REPORT_INTERVAL_SECS: "${RPKI_RTR_REPORT_INTERVAL_SECS:-60}"
+      RPKI_RTR_TIMEZONE: "${RPKI_RTR_TIMEZONE:-Asia/Shanghai}"
      RPKI_RTR_STRICT_CCR_VALIDATION: "${RPKI_RTR_STRICT_CCR_VALIDATION:-false}"
      RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS: "${RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS:-300}"
      RPKI_RTR_MAX_DELTA: "${RPKI_RTR_MAX_DELTA:-10}"
@@ -39,6 +42,7 @@ services:
      - ${RPKI_RTR_SSH_KEYS_VOLUME:-/etc/ssh:/host-ssh:ro}
      - ${RPKI_RTR_SSH_CERTS_HOST_DIR:-../../certs}:/app/certs:ro
      - ${RPKI_RTR_LOG_HOST_DIR:-../../logs/server}:/app/logs
+      - ${RPKI_RTR_REPORT_HOST_DIR:-../../report}:${RPKI_RTR_REPORT_DIR:-/app/report}
    networks:
      - rpki_net

--- a/deploy/server/docker-compose.tcp.yml
+++ b/deploy/server/docker-compose.tcp.yml
@@ -17,6 +17,9 @@ services:
      RPKI_RTR_DB_PATH: "${RPKI_RTR_DB_PATH:-/app/rtr-db}"
      RPKI_RTR_CCR_DIR: "${RPKI_RTR_CCR_DIR:-/app/data}"
      RPKI_RTR_SLURM_DIR: "${RPKI_RTR_SLURM_DIR:-/app/slurm}"
+      RPKI_RTR_REPORT_DIR: "${RPKI_RTR_REPORT_DIR:-/app/report}"
+      RPKI_RTR_REPORT_INTERVAL_SECS: "${RPKI_RTR_REPORT_INTERVAL_SECS:-60}"
+      RPKI_RTR_TIMEZONE: "${RPKI_RTR_TIMEZONE:-Asia/Shanghai}"
      RPKI_RTR_STRICT_CCR_VALIDATION: "${RPKI_RTR_STRICT_CCR_VALIDATION:-false}"
      RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS: "${RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS:-60}"
      RPKI_RTR_MAX_DELTA: "${RPKI_RTR_MAX_DELTA:-10}"
@@ -28,6 +31,7 @@ services:
      - ${RPKI_RTR_DB_HOST_DIR:-../../rtr-db}:${RPKI_RTR_DB_PATH:-/app/rtr-db}
      - ${RPKI_RTR_SLURM_HOST_DIR:-../../data}:${RPKI_RTR_SLURM_DIR:-/app/slurm}:ro
      - ${RPKI_RTR_LOG_HOST_DIR:-../../logs/server}:/app/logs
+      - ${RPKI_RTR_REPORT_HOST_DIR:-../../report}:${RPKI_RTR_REPORT_DIR:-/app/report}
    networks:
      - rpki_net

--- a/deploy/server/docker-compose.tls.yml
+++ b/deploy/server/docker-compose.tls.yml
@@ -21,6 +21,9 @@ services:
      RPKI_RTR_DB_PATH: "${RPKI_RTR_DB_PATH:-/app/rtr-db}"
      RPKI_RTR_CCR_DIR: "${RPKI_RTR_CCR_DIR:-/app/data}"
      RPKI_RTR_SLURM_DIR: "${RPKI_RTR_SLURM_DIR:-/app/slurm}"
+      RPKI_RTR_REPORT_DIR: "${RPKI_RTR_REPORT_DIR:-/app/report}"
+      RPKI_RTR_REPORT_INTERVAL_SECS: "${RPKI_RTR_REPORT_INTERVAL_SECS:-60}"
+      RPKI_RTR_TIMEZONE: "${RPKI_RTR_TIMEZONE:-Asia/Shanghai}"
      RPKI_RTR_STRICT_CCR_VALIDATION: "${RPKI_RTR_STRICT_CCR_VALIDATION:-false}"
      RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS: "${RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS:-300}"
      RPKI_RTR_MAX_DELTA: "${RPKI_RTR_MAX_DELTA:-10}"
@@ -32,6 +35,7 @@ services:
      - ${RPKI_RTR_SLURM_HOST_DIR:-../../data}:${RPKI_RTR_SLURM_DIR:-/app/slurm}:ro
      - ${RPKI_RTR_TLS_CERTS_HOST_DIR:-../../tests/fixtures/tls}:/app/certs:ro
      - ${RPKI_RTR_LOG_HOST_DIR:-../../logs/server}:/app/logs
+      - ${RPKI_RTR_REPORT_HOST_DIR:-../../report}:${RPKI_RTR_REPORT_DIR:-/app/report}
    networks:
      - rpki_net

--- a/deploy/server/docker-compose.yml
+++ b/deploy/server/docker-compose.yml
@@ -20,6 +20,9 @@ services:
      RPKI_RTR_DB_PATH: "${RPKI_RTR_DB_PATH:-/app/rtr-db}"
      RPKI_RTR_CCR_DIR: "${RPKI_RTR_CCR_DIR:-/app/data}"
      RPKI_RTR_SLURM_DIR: "${RPKI_RTR_SLURM_DIR:-/app/slurm}"
+      RPKI_RTR_REPORT_DIR: "${RPKI_RTR_REPORT_DIR:-/app/report}"
+      RPKI_RTR_REPORT_INTERVAL_SECS: "${RPKI_RTR_REPORT_INTERVAL_SECS:-60}"
+      RPKI_RTR_TIMEZONE: "${RPKI_RTR_TIMEZONE:-Asia/Shanghai}"
      RPKI_RTR_STRICT_CCR_VALIDATION: "${RPKI_RTR_STRICT_CCR_VALIDATION:-false}"
      RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS: "${RPKI_RTR_SOURCE_REFRESH_INTERVAL_SECS:-300}"
      RPKI_RTR_MAX_DELTA: "${RPKI_RTR_MAX_DELTA:-10}"
@@ -40,6 +43,7 @@ services:
      - ${RPKI_RTR_DB_HOST_DIR:-../../rtr-db}:${RPKI_RTR_DB_PATH:-/app/rtr-db}
      - ${RPKI_RTR_SLURM_HOST_DIR:-../../data}:${RPKI_RTR_SLURM_DIR:-/app/slurm}:ro
      - ${RPKI_RTR_LOG_HOST_DIR:-../../logs/server}:/app/logs
+      - ${RPKI_RTR_REPORT_HOST_DIR:-../../report}:${RPKI_RTR_REPORT_DIR:-/app/report}
      # TLS mode example:
      # - ../../certs:/app/certs:ro
    networks: