[#1] 容器增加常用工具安装

src/bind/.gitignore

@@ -0,0 +1,2 @@
+
+images/

src/bind/build/Dockerfile

@@ -0,0 +1,44 @@
+FROM ubuntu:22.04
+
+# Set timezone and avoid interactive prompts
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Asia/Shanghai
+
+# Update package list and install required packages
+RUN apt-get update && \
+    apt-get install -y \
+    bind9 \
+    bind9utils \
+    bind9-doc \
+    supervisor \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create supervisor configuration directory
+RUN mkdir -p /etc/supervisor/conf.d
+
+# Copy supervisor configuration
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Copy BIND9 configuration files
+COPY named.conf.local /etc/bind/named.conf.local
+COPY db.argus.com /etc/bind/db.argus.com
+
+# Copy startup and reload scripts
+COPY startup.sh /usr/local/bin/startup.sh
+COPY reload-bind9.sh /usr/local/bin/reload-bind9.sh
+
+# Make scripts executable
+RUN chmod +x /usr/local/bin/startup.sh /usr/local/bin/reload-bind9.sh
+
+# Set proper ownership for BIND9 files
+RUN chown bind:bind /etc/bind/named.conf.local /etc/bind/db.argus.com
+
+# Expose DNS port
+EXPOSE 53/tcp 53/udp
+
+# Use root user as requested
+USER root
+
+# Start with startup script
+CMD ["/usr/local/bin/startup.sh"]

src/bind/build/db.argus.com

@@ -0,0 +1,16 @@
+$TTL    604800
+@       IN      SOA     ns1.argus.com. admin.argus.com. (
+                              2         ; Serial
+                         604800         ; Refresh
+                          86400         ; Retry
+                        2419200         ; Expire
+                         604800 )       ; Negative Cache TTL
+
+; 定义 DNS 服务器
+@       IN      NS      ns1.argus.com.
+
+; 定义 ns1 主机
+ns1     IN      A       127.0.0.1
+
+; 定义 web 指向 12.4.5.6
+web     IN      A       12.4.5.6

src/bind/build/named.conf.local

@@ -0,0 +1,4 @@
+zone "argus.com" {
+    type master;
+    file "/etc/bind/db.argus.com";
+};

src/bind/build/reload-bind9.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "Reloading BIND9 configuration..."
+
+# Check if configuration files are valid
+echo "Checking named.conf.local syntax..."
+if ! named-checkconf /etc/bind/named.conf.local; then
+    echo "ERROR: named.conf.local has syntax errors!"
+    exit 1
+fi
+
+echo "Checking zone file syntax..."
+if ! named-checkzone argus.com /etc/bind/db.argus.com; then
+    echo "ERROR: db.argus.com has syntax errors!"
+    exit 1
+fi
+
+# Reload BIND9 via supervisor
+echo "Reloading BIND9 service..."
+supervisorctl restart bind9
+
+if [ $? -eq 0 ]; then
+    echo "BIND9 reloaded successfully!"
+else
+    echo "ERROR: Failed to reload BIND9!"
+    exit 1
+fi

src/bind/build/startup.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Set /private permissions to 777 as requested
+chmod 777 /private 2>/dev/null || true
+
+# Create persistent directory for BIND9 configs
+mkdir -p /private/argus/bind
+
+# Copy configuration files to persistent storage if they don't exist
+if [ ! -f /private/argus/bind/named.conf.local ]; then
+    cp /etc/bind/named.conf.local /private/argus/bind/named.conf.local
+fi
+
+if [ ! -f /private/argus/bind/db.argus.com ]; then
+    cp /etc/bind/db.argus.com /private/argus/bind/db.argus.com
+fi
+
+# Create symlinks to use persistent configs
+ln -sf /private/argus/bind/named.conf.local /etc/bind/named.conf.local
+ln -sf /private/argus/bind/db.argus.com /etc/bind/db.argus.com
+
+# Set proper ownership
+chown bind:bind /private/argus/bind/named.conf.local /private/argus/bind/db.argus.com
+
+# Create supervisor log directory
+mkdir -p /var/log/supervisor
+
+# Start supervisor
+exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

src/bind/build/supervisord.conf

@@ -0,0 +1,24 @@
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[supervisord]
+nodaemon=true
+user=root
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[program:bind9]
+command=/usr/sbin/named -g -c /etc/bind/named.conf -u bind
+user=bind
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/supervisor/bind9.err.log
+stdout_logfile=/var/log/supervisor/bind9.out.log
+priority=10

src/bind/scripts/build_images.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Build BIND DNS container image
+# Usage: ./build_images.sh [--intranet]
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+BUILD_DIR="$PROJECT_ROOT/build"
+
+IMAGE_NAME="argus-bind9"
+TAG="latest"
+
+# Parse command line arguments
+USE_INTRANET=false
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --intranet)
+            USE_INTRANET=true
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1"
+            echo "Usage: $0 [--intranet]"
+            exit 1
+            ;;
+    esac
+done
+
+echo "Building BIND9 DNS container image..."
+echo "Image: $IMAGE_NAME:$TAG"
+echo "Build directory: $BUILD_DIR"
+
+# Check if build directory exists
+if [ ! -d "$BUILD_DIR" ]; then
+    echo "Error: Build directory not found: $BUILD_DIR"
+    exit 1
+fi
+
+# Check if Dockerfile exists
+if [ ! -f "$BUILD_DIR/Dockerfile" ]; then
+    echo "Error: Dockerfile not found: $BUILD_DIR/Dockerfile"
+    exit 1
+fi
+
+cd "$BUILD_DIR"
+
+if [ "$USE_INTRANET" = true ]; then
+    echo "Building with intranet apt source (10.68.64.1)..."
+
+    # Create temporary Dockerfile with intranet apt source
+    cp Dockerfile Dockerfile.tmp
+
+    # Insert intranet apt configuration after the FROM line
+    sed -i '/^FROM ubuntu:22.04/a\\n# Configure intranet apt source\nRUN echo "deb [trusted=yes] http://10.68.64.1/ubuntu2204/ jammy main" > /etc/apt/sources.list && \\\n    mkdir -p /etc/apt/apt.conf.d && \\\n    echo "Acquire::https::Verify-Peer \"false\";" > /etc/apt/apt.conf.d/99-disable-ssl-verify && \\\n    echo "Acquire::https::Verify-Host \"false\";" >> /etc/apt/apt.conf.d/99-disable-ssl-verify' Dockerfile.tmp
+
+    # Build with modified Dockerfile
+    docker build -f Dockerfile.tmp -t "$IMAGE_NAME:$TAG" .
+
+    # Clean up temporary file
+    rm -f Dockerfile.tmp
+else
+    echo "Building with default public apt sources..."
+    docker build -t "$IMAGE_NAME:$TAG" .
+fi
+
+echo "Build completed successfully!"
+echo "Image: $IMAGE_NAME:$TAG"
+
+# Show image info
+echo ""
+echo "Image details:"
+docker images "$IMAGE_NAME:$TAG"

src/bind/scripts/save_images.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Save BIND DNS container images to tar files
+# Usage: ./save_images.sh
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+IMAGES_DIR="$PROJECT_ROOT/images"
+
+IMAGE_NAME="argus-bind9"
+TAG="latest"
+
+echo "Saving BIND9 DNS container images..."
+
+# Create images directory if it doesn't exist
+mkdir -p "$IMAGES_DIR"
+
+# Check if image exists
+if ! docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "^$IMAGE_NAME:$TAG$"; then
+    echo "Error: Image $IMAGE_NAME:$TAG not found"
+    echo "Please build the image first using: ./build_images.sh"
+    exit 1
+fi
+
+# Save the image
+echo "Saving $IMAGE_NAME:$TAG to $IMAGES_DIR/argus-bind9.tar..."
+docker save "$IMAGE_NAME:$TAG" -o "$IMAGES_DIR/argus-bind9.tar"
+
+# Compress the tar file to save space
+echo "Compressing image archive..."
+gzip -f "$IMAGES_DIR/argus-bind9.tar"
+
+echo "Image saved successfully!"
+echo "Location: $IMAGES_DIR/argus-bind9.tar.gz"
+
+# Show file size
+if [ -f "$IMAGES_DIR/argus-bind9.tar.gz" ]; then
+    echo "File size: $(du -h "$IMAGES_DIR/argus-bind9.tar.gz" | cut -f1)"
+fi
+
+echo ""
+echo "To load the image later, use:"
+echo "  gunzip $IMAGES_DIR/argus-bind9.tar.gz"
+echo "  docker load -i $IMAGES_DIR/argus-bind9.tar"

src/bind/scripts/update-dns.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+# update-dns.sh
+# 从 /private/argus/etc/dns.conf 读取 IP，写入 /etc/resolv.conf
+
+DNS_CONF="/private/argus/etc/dns.conf"
+RESOLV_CONF="/etc/resolv.conf"
+
+# 检查配置文件是否存在
+if [ ! -f "$DNS_CONF" ]; then
+  echo "配置文件不存在: $DNS_CONF" >&2
+  exit 1
+fi
+
+# 生成 resolv.conf 内容
+{
+  while IFS= read -r ip; do
+    # 跳过空行和注释
+    case "$ip" in
+      \#*) continue ;;
+      "") continue ;;
+    esac
+    echo "nameserver $ip"
+  done < "$DNS_CONF"
+} > "$RESOLV_CONF".tmp
+
+# 替换写入 /etc/resolv.conf
+cat "$RESOLV_CONF".tmp > "$RESOLV_CONF"
+rm -f "$RESOLV_CONF".tmp
+
+echo "已更新 $RESOLV_CONF"
+

src/bind/tests/docker-compose.yml

@@ -0,0 +1,16 @@
+services:
+  bind9:
+    image: argus-bind9:latest
+    container_name: argus-bind9-test
+    ports:
+      - "53:53/tcp"
+      - "53:53/udp"
+    volumes:
+      - ./private:/private
+    restart: unless-stopped
+    networks:
+      - bind-test-network
+
+networks:
+  bind-test-network:
+    driver: bridge

src/bind/tests/private/argus/bind/db.argus.com

@@ -0,0 +1,16 @@
+$TTL    604800
+@       IN      SOA     ns1.argus.com. admin.argus.com. (
+                              3         ; Serial
+                         604800         ; Refresh
+                          86400         ; Retry
+                        2419200         ; Expire
+                         604800 )       ; Negative Cache TTL
+
+; 定义 DNS 服务器
+@       IN      NS      ns1.argus.com.
+
+; 定义 ns1 主机
+ns1     IN      A       127.0.0.1
+
+; 定义 web 指向 192.168.1.100
+web     IN      A       192.168.1.100

src/bind/tests/private/argus/bind/db.argus.com.backup

@@ -0,0 +1,16 @@
+$TTL    604800
+@       IN      SOA     ns1.argus.com. admin.argus.com. (
+                              2         ; Serial
+                         604800         ; Refresh
+                          86400         ; Retry
+                        2419200         ; Expire
+                         604800 )       ; Negative Cache TTL
+
+; 定义 DNS 服务器
+@       IN      NS      ns1.argus.com.
+
+; 定义 ns1 主机
+ns1     IN      A       127.0.0.1
+
+; 定义 web 指向 12.4.5.6
+web     IN      A       12.4.5.6

src/bind/tests/private/argus/bind/named.conf.local

@@ -0,0 +1,4 @@
+zone "argus.com" {
+    type master;
+    file "/etc/bind/db.argus.com";
+};

src/bind/tests/scripts/00_e2e_test.sh

@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# End-to-end test for BIND9 DNS server
+# This script runs all tests in sequence to validate the complete functionality
+# Usage: ./00_e2e_test.sh
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+echo "=========================================="
+echo "BIND9 DNS Server End-to-End Test Suite"
+echo "=========================================="
+
+# Track test results
+total_tests=0
+passed_tests=0
+failed_tests=0
+
+# Function to run a test step
+run_test_step() {
+    local step_name="$1"
+    local script_name="$2"
+    local description="$3"
+
+    echo ""
+    echo "[$step_name] $description"
+    echo "$(printf '=%.0s' {1..50})"
+
+    ((total_tests++))
+
+    if [ ! -f "$SCRIPT_DIR/$script_name" ]; then
+        echo "✗ Test script not found: $script_name"
+        ((failed_tests++))
+        return 1
+    fi
+
+    # Make sure script is executable
+    chmod +x "$SCRIPT_DIR/$script_name"
+
+    # Run the test
+    echo "Executing: $SCRIPT_DIR/$script_name"
+    if "$SCRIPT_DIR/$script_name"; then
+        echo "✓ $step_name completed successfully"
+        ((passed_tests++))
+        return 0
+    else
+        echo "✗ $step_name failed"
+        ((failed_tests++))
+        return 1
+    fi
+}
+
+# Cleanup any previous test environment (but preserve the Docker image)
+echo ""
+echo "[SETUP] Cleaning up any previous test environment..."
+if [ -f "$SCRIPT_DIR/05_cleanup.sh" ]; then
+    chmod +x "$SCRIPT_DIR/05_cleanup.sh"
+    "$SCRIPT_DIR/05_cleanup.sh" || true
+fi
+
+echo ""
+echo "Starting BIND9 DNS server end-to-end test sequence..."
+
+# Test sequence
+run_test_step "TEST-01" "01_start_container.sh" "Start BIND9 container" || true
+
+run_test_step "TEST-02" "02_dig_test.sh" "Initial DNS resolution test" || true
+
+run_test_step "TEST-03" "03_reload_test.sh" "Configuration reload with IP modification" || true
+
+run_test_step "TEST-04" "04_persistence_test.sh" "Configuration persistence after restart" || true
+
+# Final cleanup (but preserve logs for review)
+echo ""
+echo "[CLEANUP] Cleaning up test environment..."
+run_test_step "CLEANUP" "05_cleanup.sh" "Clean up containers and networks" || true
+
+# Test summary
+echo ""
+echo "=========================================="
+echo "TEST SUMMARY"
+echo "=========================================="
+echo "Total tests: $total_tests"
+echo "Passed: $passed_tests"
+echo "Failed: $failed_tests"
+
+if [ $failed_tests -eq 0 ]; then
+    echo ""
+    echo "✅ ALL TESTS PASSED!"
+    echo ""
+    echo "BIND9 DNS server functionality validated:"
+    echo "  ✓ Container startup and basic functionality"
+    echo "  ✓ DNS resolution for configured domains"
+    echo "  ✓ Configuration modification and reload"
+    echo "  ✓ Configuration persistence across restarts"
+    echo "  ✓ Cleanup and resource management"
+    echo ""
+    echo "The BIND9 DNS server is ready for production use."
+    exit 0
+else
+    echo ""
+    echo "❌ SOME TESTS FAILED!"
+    echo ""
+    echo "Please review the test output above to identify and fix issues."
+    echo "You may need to:"
+    echo "  - Check Docker installation and permissions"
+    echo "  - Verify network connectivity"
+    echo "  - Review BIND9 configuration files"
+    echo "  - Check system resources and port availability"
+    exit 1
+fi

src/bind/tests/scripts/01_start_container.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Start BIND9 test container
+# Usage: ./01_start_container.sh
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(dirname "$SCRIPT_DIR")"
+
+cd "$TEST_DIR"
+
+echo "Starting BIND9 test container..."
+
+# Ensure private directory exists with proper permissions
+mkdir -p private
+chmod 777 private
+
+# Start the container
+docker compose up -d
+
+echo "Waiting for container to be ready..."
+sleep 5
+
+# Check if container is running
+if docker compose ps | grep -q "Up"; then
+    echo "✓ Container started successfully"
+    echo "Container status:"
+    docker compose ps
+else
+    echo "✗ Failed to start container"
+    docker compose logs
+    exit 1
+fi
+
+echo ""
+echo "BIND9 test environment is ready!"
+echo "DNS server listening on localhost:53"

src/bind/tests/scripts/02_dig_test.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Test DNS resolution using dig
+# Usage: ./02_dig_test.sh
+
+set -e
+
+echo "Testing DNS resolution with dig..."
+
+# Function to test DNS query
+test_dns_query() {
+    local hostname="$1"
+    local expected_ip="$2"
+    local description="$3"
+
+    echo ""
+    echo "Testing: $description"
+    echo "Query: $hostname.argus.com"
+    echo "Expected IP: $expected_ip"
+
+    # Perform dig query
+    result=$(dig @localhost $hostname.argus.com A +short 2>/dev/null || echo "QUERY_FAILED")
+
+    if [ "$result" = "QUERY_FAILED" ]; then
+        echo "✗ DNS query failed"
+        return 1
+    elif [ "$result" = "$expected_ip" ]; then
+        echo "✓ DNS query successful: $result"
+        return 0
+    else
+        echo "✗ DNS query returned unexpected result: $result"
+        return 1
+    fi
+}
+
+# Check if dig is available
+if ! command -v dig &> /dev/null; then
+    echo "Installing dig (dnsutils)..."
+    apt-get update && apt-get install -y dnsutils
+fi
+
+# Check if container is running
+if ! docker compose ps | grep -q "Up"; then
+    echo "Error: BIND9 container is not running"
+    echo "Please start the container first with: ./01_start_container.sh"
+    exit 1
+fi
+
+echo "=== DNS Resolution Tests ==="
+
+# Test cases based on current configuration
+failed_tests=0
+
+# Test ns1.argus.com -> 127.0.0.1
+if ! test_dns_query "ns1" "127.0.0.1" "Name server resolution"; then
+    ((failed_tests++))
+fi
+
+# Test web.argus.com -> 12.4.5.6
+if ! test_dns_query "web" "12.4.5.6" "Web server resolution"; then
+    ((failed_tests++))
+fi
+
+echo ""
+echo "=== Test Summary ==="
+if [ $failed_tests -eq 0 ]; then
+    echo "✓ All DNS tests passed!"
+    exit 0
+else
+    echo "✗ $failed_tests test(s) failed"
+    exit 1
+fi

src/bind/tests/scripts/03_reload_test.sh

@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Test DNS configuration reload with IP modification
+# Usage: ./03_reload_test.sh
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(dirname "$SCRIPT_DIR")"
+
+echo "=== DNS Configuration Reload Test ==="
+
+# Check if container is running
+if ! docker compose ps | grep -q "Up"; then
+    echo "Error: BIND9 container is not running"
+    echo "Please start the container first with: ./01_start_container.sh"
+    exit 1
+fi
+
+# Check if dig is available
+if ! command -v dig &> /dev/null; then
+    echo "Installing dig (dnsutils)..."
+    apt-get update && apt-get install -y dnsutils
+fi
+
+# Function to test DNS query
+test_dns_query() {
+    local hostname="$1"
+    local expected_ip="$2"
+    local description="$3"
+
+    echo "Testing: $description"
+    echo "Query: $hostname.argus.com -> Expected: $expected_ip"
+
+    result=$(dig @localhost $hostname.argus.com A +short 2>/dev/null || echo "QUERY_FAILED")
+
+    if [ "$result" = "$expected_ip" ]; then
+        echo "✓ $result"
+        return 0
+    else
+        echo "✗ Got: $result, Expected: $expected_ip"
+        return 1
+    fi
+}
+
+echo ""
+echo "Step 1: Testing initial DNS configuration..."
+
+# Test initial configuration
+if ! test_dns_query "web" "12.4.5.6" "Initial web.argus.com resolution"; then
+    echo "Initial DNS test failed"
+    exit 1
+fi
+
+echo ""
+echo "Step 2: Modifying DNS configuration..."
+
+# Backup original configuration
+cp "$TEST_DIR/private/argus/bind/db.argus.com" "$TEST_DIR/private/argus/bind/db.argus.com.backup" 2>/dev/null || true
+
+# Create new configuration with modified IP
+DB_FILE="$TEST_DIR/private/argus/bind/db.argus.com"
+
+# Check if persistent config exists, if not use from container
+if [ ! -f "$DB_FILE" ]; then
+    echo "Persistent config not found, copying from container..."
+    docker compose exec bind9 cp /etc/bind/db.argus.com /private/argus/bind/db.argus.com
+    docker compose exec bind9 chown bind:bind /private/argus/bind/db.argus.com
+fi
+
+# Modify the IP address (12.4.5.6 -> 192.168.1.100)
+sed -i 's/12\.4\.5\.6/192.168.1.100/g' "$DB_FILE"
+
+# Increment serial number for DNS cache invalidation
+current_serial=$(grep -o "2[[:space:]]*;" "$DB_FILE" | grep -o "2")
+new_serial=$((current_serial + 1))
+sed -i "s/2[[:space:]]*;/${new_serial}         ;/" "$DB_FILE"
+
+echo "Modified configuration:"
+echo "- Changed web.argus.com IP: 12.4.5.6 -> 192.168.1.100"
+echo "- Updated serial number: $current_serial -> $new_serial"
+
+echo ""
+echo "Step 3: Reloading BIND9 configuration..."
+
+# Reload BIND9 configuration
+docker compose exec bind9 /usr/local/bin/reload-bind9.sh
+
+echo "Configuration reloaded"
+
+# Wait a moment for changes to take effect
+sleep 3
+
+echo ""
+echo "Step 4: Testing modified DNS configuration..."
+
+# Test modified configuration
+if ! test_dns_query "web" "192.168.1.100" "Modified web.argus.com resolution"; then
+    echo "Modified DNS test failed"
+    exit 1
+fi
+
+# Also verify ns1 still works
+if ! test_dns_query "ns1" "127.0.0.1" "ns1.argus.com still working"; then
+    echo "ns1 DNS test failed after reload"
+    exit 1
+fi
+
+echo ""
+echo "✓ DNS configuration reload test completed successfully!"
+echo "✓ IP address changed from 12.4.5.6 to 192.168.1.100"
+echo "✓ Configuration persisted and reloaded correctly"

src/bind/tests/scripts/04_persistence_test.sh

@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Test configuration persistence after container restart
+# Usage: ./04_persistence_test.sh
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(dirname "$SCRIPT_DIR")"
+
+echo "=== Configuration Persistence Test ==="
+
+# Check if dig is available
+if ! command -v dig &> /dev/null; then
+    echo "Installing dig (dnsutils)..."
+    apt-get update && apt-get install -y dnsutils
+fi
+
+# Function to test DNS query
+test_dns_query() {
+    local hostname="$1"
+    local expected_ip="$2"
+    local description="$3"
+
+    echo "Testing: $description"
+    echo "Query: $hostname.argus.com -> Expected: $expected_ip"
+
+    result=$(dig @localhost $hostname.argus.com A +short 2>/dev/null || echo "QUERY_FAILED")
+
+    if [ "$result" = "$expected_ip" ]; then
+        echo "✓ $result"
+        return 0
+    else
+        echo "✗ Got: $result, Expected: $expected_ip"
+        return 1
+    fi
+}
+
+echo ""
+echo "Step 1: Stopping current container..."
+
+# Stop the container
+docker compose down
+
+echo "Container stopped"
+
+echo ""
+echo "Step 2: Verifying persistent configuration exists..."
+
+# Check if modified configuration exists
+DB_FILE="$TEST_DIR/private/argus/bind/db.argus.com"
+
+if [ ! -f "$DB_FILE" ]; then
+    echo "✗ Persistent configuration file not found: $DB_FILE"
+    exit 1
+fi
+
+# Check if the modified IP is in the configuration
+if grep -q "192.168.1.100" "$DB_FILE"; then
+    echo "✓ Modified IP (192.168.1.100) found in persistent configuration"
+else
+    echo "✗ Modified IP not found in persistent configuration"
+    echo "Configuration content:"
+    cat "$DB_FILE"
+    exit 1
+fi
+
+echo ""
+echo "Step 3: Restarting container with persistent configuration..."
+
+# Start the container again
+docker compose up -d
+
+echo "Waiting for container to be ready..."
+sleep 5
+
+# Check if container is running
+if ! docker compose ps | grep -q "Up"; then
+    echo "✗ Failed to restart container"
+    docker compose logs
+    exit 1
+fi
+
+echo "✓ Container restarted successfully"
+
+echo ""
+echo "Step 4: Testing DNS resolution after restart..."
+
+# Wait a bit more for DNS to be fully ready
+sleep 5
+
+# Test that the modified configuration is still active
+if ! test_dns_query "web" "192.168.1.100" "Persistent web.argus.com resolution"; then
+    echo "✗ Persistent configuration test failed"
+    exit 1
+fi
+
+# Also verify ns1 still works
+if ! test_dns_query "ns1" "127.0.0.1" "ns1.argus.com still working"; then
+    echo "✗ ns1 DNS test failed after restart"
+    exit 1
+fi
+
+echo ""
+echo "Step 5: Verifying configuration files are linked correctly..."
+
+# Check that the persistent files are properly linked
+echo "Checking file links in container:"
+docker compose exec bind9 ls -la /etc/bind/named.conf.local /etc/bind/db.argus.com
+
+echo ""
+echo "✓ Configuration persistence test completed successfully!"
+echo "✓ Modified IP (192.168.1.100) persisted after container restart"
+echo "✓ Configuration files properly linked to persistent storage"
+echo "✓ DNS resolution working correctly with persisted configuration"

src/bind/tests/scripts/05_cleanup.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+# Clean up test environment and containers
+# Usage: ./05_cleanup.sh [--full]
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(dirname "$SCRIPT_DIR")"
+
+# Parse command line arguments
+FULL_CLEANUP=false
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --full)
+            FULL_CLEANUP=true
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1"
+            echo "Usage: $0 [--full]"
+            echo "  --full: Also remove persistent data and Docker image"
+            exit 1
+            ;;
+    esac
+done
+
+cd "$TEST_DIR"
+
+echo "=== Cleaning up BIND9 test environment ==="
+
+echo ""
+echo "Step 1: Stopping and removing containers..."
+
+# Stop and remove containers
+docker compose down -v
+
+echo "✓ Containers stopped and removed"
+
+echo ""
+echo "Step 2: Removing Docker networks..."
+
+# Clean up networks
+docker network prune -f > /dev/null 2>&1 || true
+
+echo "✓ Docker networks cleaned"
+
+if [ "$FULL_CLEANUP" = true ]; then
+    echo ""
+    echo "Step 3: Removing persistent data..."
+
+    # Remove persistent data directory
+    if [ -d "private" ]; then
+        rm -rf private
+        echo "✓ Persistent data directory removed"
+    else
+        echo "✓ No persistent data directory found"
+    fi
+
+    echo ""
+    echo "Step 4: Removing Docker image..."
+
+    # Remove the test image if it exists
+    if docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "^argus-bind9:latest$"; then
+        docker rmi argus-bind9:latest
+        echo "✓ Docker image 'argus-bind9:latest' removed"
+    else
+        echo "✓ Docker image 'argus-bind9:latest' not found"
+    fi
+
+    echo ""
+    echo "Step 5: Cleaning up unused Docker resources..."
+
+    # Clean up any dangling images and unused volumes
+    docker system prune -f > /dev/null 2>&1 || true
+
+    echo "✓ Docker system cleaned"
+else
+    echo ""
+    echo "Step 3: Preserving persistent data and Docker image..."
+    echo "✓ Persistent data preserved in: private/"
+    echo "✓ Docker image 'argus-bind9:latest' preserved"
+    echo ""
+    echo "To perform full cleanup including persistent data and image, run:"
+    echo "  $0 --full"
+fi
+
+echo ""
+echo "=== Cleanup Summary ==="
+echo "✓ Containers stopped and removed"
+echo "✓ Docker networks cleaned"
+
+if [ "$FULL_CLEANUP" = true ]; then
+    echo "✓ Persistent data removed"
+    echo "✓ Docker image removed"
+    echo "✓ System resources cleaned"
+    echo ""
+    echo "Full cleanup completed! Test environment completely removed."
+else
+    echo "✓ Persistent data preserved"
+    echo "✓ Docker image preserved"
+    echo ""
+    echo "Basic cleanup completed! Run './01_start_container.sh' to restart testing."
+fi
+
+echo ""
+echo "Test environment cleanup finished."

src/log/.gitignore

@@ -0,0 +1,5 @@
+
+private/
+
+
+images/

src/log/README.md

@@ -0,0 +1,7 @@
+
+测试log模块开发
+
+elasticsearch: 部署镜像构建及启动脚本（解决账号问题、挂载目录、使用supervisor守护）
+kibana: 镜像构建
+fluent-bit: 安装包，脚本准备， 交付给大鹏统一组织客户端侧安装流程
+init: EK初始化脚本：数据视图创建脚本等

src/log/elasticsearch/build/Dockerfile

@@ -0,0 +1,46 @@
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.13.4
+
+# 切换到 root 用户进行系统级安装
+USER root
+
+# 设置构建参数
+ARG USE_INTRANET=false
+
+# 配置内网 apt 源 (如果指定了内网选项)
+RUN if [ "$USE_INTRANET" = "true" ]; then \
+        echo "Configuring intranet apt sources..." && \
+        cp /etc/apt/sources.list /etc/apt/sources.list.bak && \
+        echo "deb [trusted=yes] http://10.68.64.1/ubuntu2204/ jammy main" > /etc/apt/sources.list && \
+        echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/99disable-ssl-check && \
+        echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \
+    fi
+
+# 安装 supervisor, net-tools, vim
+RUN apt-get update && \
+    apt-get install -y supervisor net-tools vim && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# 配置部署时使用的apt源
+RUN if [ "$USE_INTRANET" = "true" ]; then \
+	echo "deb [trusted=yes] https://10.92.132.52/mirrors/ubuntu2204/ jammy main" > /etc/apt/sources.list; \
+    fi
+
+# 创建 supervisor 日志目录
+RUN mkdir -p /var/log/supervisor
+
+# 复制 supervisor 配置文件
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# 复制启动脚本
+COPY start-es-supervised.sh /usr/local/bin/start-es-supervised.sh
+RUN chmod +x /usr/local/bin/start-es-supervised.sh
+
+# 保持 root 用户，由 supervisor 管理用户切换
+USER root
+
+# 暴露端口
+EXPOSE 9200 9300
+
+# 使用 supervisor 作为入口点
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

src/log/elasticsearch/build/start-es-supervised.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -euo pipefail
+
+echo "[INFO] Starting Elasticsearch under supervisor..."
+
+# 创建数据目录并设置权限（如果不存在）
+mkdir -p /private/argus/log/elasticsearch
+chown -R elasticsearch:elasticsearch /private/argus/log/elasticsearch
+
+# 创建软链接到Elasticsearch预期的数据目录
+if [ -L /usr/share/elasticsearch/data ]; then
+    rm /usr/share/elasticsearch/data
+elif [ -d /usr/share/elasticsearch/data ]; then
+    rm -rf /usr/share/elasticsearch/data
+fi
+
+ln -sf /private/argus/log/elasticsearch /usr/share/elasticsearch/data
+
+echo "[INFO] Data directory linked: /usr/share/elasticsearch/data -> /private/argus/log/elasticsearch"
+
+# 设置环境变量（ES配置通过docker-compose传递）
+export ES_JAVA_OPTS="${ES_JAVA_OPTS:-"-Xms512m -Xmx512m"}"
+
+echo "[INFO] Starting Elasticsearch process..."
+
+# 启动原始的Elasticsearch entrypoint
+exec /usr/local/bin/docker-entrypoint.sh elasticsearch

src/log/elasticsearch/build/supervisord.conf

@@ -0,0 +1,27 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
+user=root
+
+[program:elasticsearch]
+command=/usr/local/bin/start-es-supervised.sh
+user=elasticsearch
+stdout_logfile=/var/log/supervisor/elasticsearch.log
+stderr_logfile=/var/log/supervisor/elasticsearch_error.log
+autorestart=true
+startretries=3
+startsecs=30
+stopwaitsecs=30
+killasgroup=true
+stopasgroup=true
+
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

src/log/elasticsearch/start-es.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euo pipefail
+
+echo "[INFO] Starting Elasticsearch with private directory setup..."
+
+# 创建数据目录
+mkdir -p /private/es/data
+
+# 创建软链接到Elasticsearch预期的数据目录
+rm -rf /usr/share/elasticsearch/data 2>/dev/null || true
+ln -sf /private/es/data /usr/share/elasticsearch/data
+
+# 设置正确的权限 (Elasticsearch使用UID 1000)
+chown -R 1000:1000 /private/es/data
+
+echo "[INFO] Data directory linked: /usr/share/elasticsearch/data -> /private/es/data"
+
+# 启动原始的Elasticsearch entrypoint
+exec /usr/local/bin/docker-entrypoint.sh elasticsearch

src/log/fluent-bit/start-fluent-bit.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+set -euo pipefail
+
+echo "[INFO] Starting Fluent Bit setup in Ubuntu container..."
+
+# 安装必要的工具
+echo "[INFO] Installing required packages..."
+export DEBIAN_FRONTEND=noninteractive
+apt-get update -qq
+apt-get install -y -qq curl
+
+# 解压bundle到/tmp
+echo "[INFO] Extracting fluent-bit bundle..."
+cd /tmp
+tar -xzf /private/fluent-bit-bundle.tar.gz
+
+# 安装 Fluent Bit 从 deb 包
+echo "[INFO] Installing Fluent Bit from deb package..."
+dpkg -i /tmp/packages/fluent-bit_3.1.9_amd64.deb || true
+apt-get install -f -y -qq  # 解决依赖问题
+
+# 验证 Fluent Bit 可以运行
+echo "[INFO] Fluent Bit version:"
+/opt/fluent-bit/bin/fluent-bit --version
+
+# 创建配置目录
+mkdir -p /etc/fluent-bit
+cp -r /tmp/etc/* /etc/fluent-bit/
+
+# 创建日志和缓冲区目录
+mkdir -p /logs/train /logs/infer /buffers
+chmod 755 /logs/train /logs/infer /buffers
+
+# 等待 Elasticsearch 就绪
+echo "[INFO] Waiting for Elasticsearch to be ready..."
+while ! curl -fs http://${ES_HOST}:${ES_PORT}/_cluster/health >/dev/null 2>&1; do
+    echo "  Waiting for ES at ${ES_HOST}:${ES_PORT}..."
+    sleep 5
+done
+echo "[INFO] Elasticsearch is ready"
+
+# 启动 Fluent Bit
+echo "[INFO] Starting Fluent Bit with configuration from /etc/fluent-bit/"
+echo "[INFO] Command: /opt/fluent-bit/bin/fluent-bit --config=/etc/fluent-bit/fluent-bit.conf"
+exec /opt/fluent-bit/bin/fluent-bit \
+    --config=/etc/fluent-bit/fluent-bit.conf

src/log/kibana/build/Dockerfile

@@ -0,0 +1,50 @@
+FROM docker.elastic.co/kibana/kibana:8.13.4
+
+# 切换到 root 用户进行系统级安装
+USER root
+
+# 设置构建参数
+ARG USE_INTRANET=false
+
+# 配置内网 apt 源 (如果指定了内网选项)
+RUN if [ "$USE_INTRANET" = "true" ]; then \
+        echo "Configuring intranet apt sources..." && \
+        cp /etc/apt/sources.list /etc/apt/sources.list.bak && \
+        echo "deb [trusted=yes]  http://10.68.64.1/ubuntu2204/ jammy main" > /etc/apt/sources.list && \
+        echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/99disable-ssl-check && \
+        echo 'Acquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99disable-ssl-check; \
+    fi
+
+# 安装 supervisor, net-tools, vim
+RUN apt-get update && \
+    apt-get install -y supervisor net-tools vim && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# 配置部署时使用的apt源
+RUN if [ "$USE_INTRANET" = "true" ]; then \
+        echo "deb [trusted=yes] https://10.92.132.52/mirrors/ubuntu2204/ jammy main" > /etc/apt/sources.list; \
+    fi
+
+# 创建 supervisor 日志目录
+RUN mkdir -p /var/log/supervisor
+
+# 复制 supervisor 配置文件
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# 复制启动脚本
+COPY start-kibana-supervised.sh /usr/local/bin/start-kibana-supervised.sh
+COPY kibana-post-start.sh /usr/local/bin/kibana-post-start.sh
+RUN chmod +x /usr/local/bin/start-kibana-supervised.sh /usr/local/bin/kibana-post-start.sh
+
+# kibana需要用到 /root/.config/puppeteer 路径
+RUN chmod 777 /root
+
+# 保持 root 用户，由 supervisor 管理用户切换
+USER root
+
+# 暴露端口
+EXPOSE 5601
+
+# 使用 supervisor 作为入口点
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

src/log/kibana/build/kibana-post-start.sh

@@ -0,0 +1,146 @@
+#!/bin/bash
+set -euo pipefail
+
+ES_HOST="${ELASTICSEARCH_HOSTS:-http://es:9200}"
+KB_HOST="http://localhost:5601"
+
+echo "[INFO] Starting Kibana post-start configuration..."
+
+# 等待 Elasticsearch 可用
+wait_for_elasticsearch() {
+    echo "[INFO] Waiting for Elasticsearch..."
+    local max_attempts=60
+    local attempt=1
+
+    while [ $attempt -le $max_attempts ]; do
+        if curl -fs "$ES_HOST/_cluster/health" >/dev/null 2>&1; then
+            echo "[OK] Elasticsearch is available"
+            return 0
+        fi
+        echo "    Waiting for ES... ($attempt/$max_attempts)"
+        sleep 5
+        ((attempt++))
+    done
+
+    echo "[ERROR] Elasticsearch timeout"
+    return 1
+}
+
+# 等待 Kibana 可用
+wait_for_kibana() {
+    echo "[INFO] Waiting for Kibana..."
+    local max_attempts=120
+    local attempt=1
+
+    while [ $attempt -le $max_attempts ]; do
+        if curl -fs "$KB_HOST/api/status" >/dev/null 2>&1; then
+            local status=$(curl -s "$KB_HOST/api/status" | grep -o '"level":"available"' || echo "")
+            if [ -n "$status" ]; then
+                echo "[OK] Kibana is available"
+                return 0
+            fi
+            echo "    Waiting for Kibana... ($attempt/$max_attempts, status: $status)"
+        else
+            echo "    Waiting for Kibana... ($attempt/$max_attempts, connection failed)"
+        fi
+        sleep 5
+        ((attempt++))
+    done
+
+    echo "[ERROR] Kibana timeout"
+    return 1
+}
+
+# 幂等设置索引副本数为0
+fix_replicas_idempotent() {
+    echo "[INFO] Checking and fixing index replicas..."
+
+    # 获取所有 train-* 和 infer-* 索引
+    local indices=$(curl -s "$ES_HOST/_cat/indices/train-*,infer-*?h=index" 2>/dev/null || echo "")
+
+    if [ -z "$indices" ]; then
+        echo "[INFO] No train-*/infer-* indices found, skipping replica adjustment"
+        return 0
+    fi
+
+    for idx in $indices; do
+        # 检查当前副本数
+        local current_replicas=$(curl -s "$ES_HOST/$idx/_settings" | grep -o '"number_of_replicas":"[^"]*"' | cut -d'"' -f4 || echo "")
+
+        if [ "$current_replicas" != "0" ]; then
+            echo "[INFO] Setting replicas to 0 for index: $idx (current: $current_replicas)"
+            curl -fsS -X PUT "$ES_HOST/$idx/_settings" \
+                -H 'Content-Type: application/json' \
+                -d '{"index":{"number_of_replicas":0}}' >/dev/null || {
+                echo "[WARN] Failed to set replicas for $idx"
+                continue
+            }
+            echo "[OK] Updated replicas for $idx"
+        else
+            echo "[INFO] Index $idx already has 0 replicas, skipping"
+        fi
+    done
+}
+
+# 幂等创建数据视图
+create_data_views_idempotent() {
+    echo "[INFO] Checking and creating data views..."
+
+    # 检查是否存在匹配的索引
+    local train_indices=$(curl -s "$ES_HOST/_cat/indices/train-*?h=index" 2>/dev/null | wc -l || echo "0")
+    local infer_indices=$(curl -s "$ES_HOST/_cat/indices/infer-*?h=index" 2>/dev/null | wc -l || echo "0")
+
+    # 创建 train 数据视图
+    if [ "$train_indices" -gt 0 ]; then
+        # 检查数据视图是否已存在
+        local train_exists=$(curl -s "$KB_HOST/api/data_views" -H 'kbn-xsrf: true' 2>/dev/null | grep '"title":"train-\*"' | wc -l )
+
+        if [ "$train_exists" -eq 0 ]; then
+            echo "[INFO] Creating data view for train-* indices"
+            curl -fsS -X POST "$KB_HOST/api/data_views/data_view" \
+                -H 'kbn-xsrf: true' \
+                -H 'Content-Type: application/json' \
+                -d '{"data_view":{"name":"train","title":"train-*","timeFieldName":"@timestamp"}}' \
+                >/dev/null && echo "[OK] Created train data view" || echo "[WARN] Failed to create train data view"
+        else
+            echo "[INFO] Train data view already exists, skipping"
+        fi
+    else
+        echo "[INFO] No train-* indices found, skipping train data view creation"
+    fi
+
+    # 创建 infer 数据视图
+    if [ "$infer_indices" -gt 0 ]; then
+        # 检查数据视图是否已存在
+        local infer_exists=$(curl -s "$KB_HOST/api/data_views" -H 'kbn-xsrf: true' 2>/dev/null | grep '"title":"infer-\*"' | wc -l )
+
+        if [ "$infer_exists" -eq 0 ]; then
+            echo "[INFO] Creating data view for infer-* indices"
+            curl -fsS -X POST "$KB_HOST/api/data_views/data_view" \
+                -H 'kbn-xsrf: true' \
+                -H 'Content-Type: application/json' \
+                -d '{"data_view":{"name":"infer","title":"infer-*","timeFieldName":"@timestamp"}}' \
+                >/dev/null && echo "[OK] Created infer data view" || echo "[WARN] Failed to create infer data view"
+        else
+            echo "[INFO] Infer data view already exists, skipping"
+        fi
+    else
+        echo "[INFO] No infer-* indices found, skipping infer data view creation"
+    fi
+}
+
+# 主逻辑
+main() {
+    # 等待服务可用
+    wait_for_elasticsearch || exit 1
+    wait_for_kibana || exit 1
+
+    # 执行幂等配置
+    fix_replicas_idempotent
+    create_data_views_idempotent
+
+    echo "[INFO] Kibana post-start configuration completed"
+}
+
+# 运行主逻辑
+main

src/log/kibana/build/start-kibana-supervised.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -euo pipefail
+
+echo "[INFO] Starting Kibana under supervisor..."
+
+# 创建数据目录并设置权限（如果不存在）
+mkdir -p /private/argus/log/kibana
+chown -R kibana:kibana /private/argus/log/kibana
+
+# 创建软链接到Kibana预期的数据目录
+if [ -L /usr/share/kibana/data ]; then
+    rm /usr/share/kibana/data
+elif [ -d /usr/share/kibana/data ]; then
+    rm -rf /usr/share/kibana/data
+fi
+
+ln -sf /private/argus/log/kibana /usr/share/kibana/data
+
+echo "[INFO] Data directory linked: /usr/share/kibana/data -> /private/argus/log/kibana"
+
+# 设置环境变量
+export ELASTICSEARCH_HOSTS="${ELASTICSEARCH_HOSTS:-"http://es:9200"}"
+
+echo "[INFO] Connecting to Elasticsearch at: $ELASTICSEARCH_HOSTS"
+
+# 启动后台配置任务
+echo "[INFO] Starting background post-start configuration..."
+/usr/local/bin/kibana-post-start.sh &
+
+echo "[INFO] Starting Kibana process..."
+
+# 启动原始的Kibana entrypoint
+exec /usr/local/bin/kibana-docker

src/log/kibana/build/supervisord.conf

@@ -0,0 +1,27 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
+user=root
+
+[program:kibana]
+command=/usr/local/bin/start-kibana-supervised.sh
+user=kibana
+stdout_logfile=/var/log/supervisor/kibana.log
+stderr_logfile=/var/log/supervisor/kibana_error.log
+autorestart=true
+startretries=3
+startsecs=30
+stopwaitsecs=30
+killasgroup=true
+stopasgroup=true
+
+[unix_http_server]
+file=/var/run/supervisor.sock
+chmod=0700
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

src/log/kibana/start-kibana.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euo pipefail
+
+echo "[INFO] Starting Kibana with private directory setup..."
+
+# 创建数据目录
+mkdir -p /private/kibana/data
+
+# 创建软链接到Kibana预期的数据目录
+rm -rf /usr/share/kibana/data 2>/dev/null || true
+ln -sf /private/kibana/data /usr/share/kibana/data
+
+# 设置正确的权限 (Kibana使用UID 1000)
+chown -R 1000:1000 /private/kibana/data
+
+echo "[INFO] Data directory linked: /usr/share/kibana/data -> /private/kibana/data"
+
+# 启动原始的Kibana entrypoint
+exec /usr/local/bin/kibana-docker

src/log/scripts/build_images.sh

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# 帮助信息
+show_help() {
+    cat << EOF
+ARGUS Log System - Image Build Tool
+
+Usage: $0 [OPTIONS]
+
+Options:
+  --intranet    Use intranet mirror for Ubuntu 22.04 packages
+  -h, --help    Show this help message
+
+Examples:
+  $0                # Build with default sources
+  $0 --intranet     # Build with intranet mirror
+
+EOF
+}
+
+# 解析命令行参数
+use_intranet=false
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --intranet)
+            use_intranet=true
+            shift
+            ;;
+        -h|--help)
+            show_help
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $1"
+            show_help
+            exit 1
+            ;;
+    esac
+done
+
+root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$root"
+
+echo "======================================="
+echo "ARGUS Log System - Image Build Tool"
+echo "======================================="
+
+if [[ "$use_intranet" == true ]]; then
+    echo "🌐 Mode: Intranet (Using internal mirror: 10.68.64.1)"
+    build_args="--build-arg USE_INTRANET=true"
+else
+    echo "🌐 Mode: Public (Using default package sources)"
+    build_args=""
+fi
+
+echo ""
+
+# 构建 Elasticsearch 镜像
+echo "🔄 Building Elasticsearch image..."
+if docker build $build_args -t argus-elasticsearch:latest ./elasticsearch/build; then
+    echo "✅ Elasticsearch image built successfully"
+else
+    echo "❌ Failed to build Elasticsearch image"
+    exit 1
+fi
+
+echo ""
+
+# 构建 Kibana 镜像
+echo "🔄 Building Kibana image..."
+if docker build $build_args -t argus-kibana:latest ./kibana/build; then
+    echo "✅ Kibana image built successfully"
+else
+    echo "❌ Failed to build Kibana image"
+    exit 1
+fi
+
+echo ""
+echo "======================================="
+echo "📦 Build Summary"
+echo "======================================="
+echo "✅ Successfully built images:"
+echo "   • argus-elasticsearch:latest"
+echo "   • argus-kibana:latest"
+
+if [[ "$use_intranet" == true ]]; then
+    echo ""
+    echo "🌐 Built with intranet mirror configuration"
+fi
+
+echo ""
+echo "🚀 Next steps:"
+echo "   ./scripts/save_images.sh     # Export images"
+echo "   ./scripts/02_up.sh           # Start services"
+echo ""
+

src/log/scripts/load_images.sh

@@ -0,0 +1,127 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "======================================="
+echo "ARGUS Log System - Image Import Tool"
+echo "======================================="
+echo ""
+
+# 获取脚本所在目录和镜像目录
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+images_dir="$script_dir/../images"
+
+# 定义镜像文件名
+ES_TAR="argus-elasticsearch-latest.tar"
+KIBANA_TAR="argus-kibana-latest.tar"
+
+# 函数：检查文件是否存在
+check_file() {
+    local file_path="$1"
+    local file_name="$2"
+    if [[ -f "$file_path" ]]; then
+        local size=$(du -h "$file_path" | cut -f1)
+        echo "✅ Found: $file_name ($size)"
+        return 0
+    else
+        echo "❌ Missing: $file_name"
+        return 1
+    fi
+}
+
+# 函数：加载镜像
+load_image() {
+    local file_path="$1"
+    local file_name="$2"
+
+    echo "🔄 Loading $file_name..."
+
+    if docker load -i "$file_path"; then
+        echo "✅ Successfully loaded: $file_name"
+        return 0
+    else
+        echo "❌ Failed to load: $file_name"
+        return 1
+    fi
+}
+
+echo "🔍 Checking for ARGUS image files in $images_dir..."
+echo ""
+
+# 检查镜像文件是否存在
+es_file="$images_dir/$ES_TAR"
+kibana_file="$images_dir/$KIBANA_TAR"
+
+es_exists=false
+kibana_exists=false
+
+if check_file "$es_file" "$ES_TAR"; then
+    es_exists=true
+fi
+
+if check_file "$kibana_file" "$KIBANA_TAR"; then
+    kibana_exists=true
+fi
+
+echo ""
+
+# 如果没有任何文件存在，退出
+if [[ "$es_exists" == false && "$kibana_exists" == false ]]; then
+    echo "❌ No ARGUS image files found in $images_dir"
+    echo "   Please run './scripts/save_images.sh' first to export images"
+    exit 1
+fi
+
+echo "💾 Starting image import process..."
+echo ""
+
+loaded_count=0
+failed_count=0
+
+# 加载 Elasticsearch 镜像
+if [[ "$es_exists" == true ]]; then
+    if load_image "$es_file" "$ES_TAR"; then
+        ((loaded_count++))
+    else
+        ((failed_count++))
+    fi
+    echo ""
+fi
+
+# 加载 Kibana 镜像
+if [[ "$kibana_exists" == true ]]; then
+    if load_image "$kibana_file" "$KIBANA_TAR"; then
+        ((loaded_count++))
+    else
+        ((failed_count++))
+    fi
+    echo ""
+fi
+
+echo "======================================="
+echo "📦 Import Summary"
+echo "======================================="
+echo "✅ Successfully loaded: $loaded_count images"
+
+if [[ $failed_count -gt 0 ]]; then
+    echo "❌ Failed to load: $failed_count images"
+fi
+
+echo ""
+echo "🔍 Verifying loaded images:"
+docker images | grep "argus-" || echo "   No ARGUS images found"
+
+echo ""
+
+if [[ $failed_count -eq 0 ]]; then
+    echo "✅ All images imported successfully!"
+    echo ""
+    echo "🚀 Next steps:"
+    echo "   You can now use the imported images with:"
+    echo "     ./scripts/02_up.sh    # Start services"
+    echo "     ./scripts/00_e2e_test.sh  # Run end-to-end test"
+else
+    echo "⚠️  Some images failed to import. Please check the error messages above."
+    exit 1
+fi
+
+echo ""

src/log/scripts/save_images.sh

@@ -0,0 +1,140 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "======================================="
+echo "ARGUS Log System - Image Export Tool"
+echo "======================================="
+echo ""
+
+# 获取脚本所在目录和输出目录
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+output_dir="$script_dir/../images"
+
+# 确保输出目录存在
+mkdir -p "$output_dir"
+
+# 定义镜像名称和版本
+ES_IMAGE="argus-elasticsearch:latest"
+KIBANA_IMAGE="argus-kibana:latest"
+
+# 定义输出文件名
+ES_TAR="argus-elasticsearch-latest.tar"
+KIBANA_TAR="argus-kibana-latest.tar"
+
+# 函数：检查镜像是否存在
+check_image() {
+    local image_name="$1"
+    if docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "^$image_name$"; then
+        echo "✅ Image found: $image_name"
+        return 0
+    else
+        echo "❌ Image not found: $image_name"
+        return 1
+    fi
+}
+
+# 函数：保存镜像
+save_image() {
+    local image_name="$1"
+    local output_file="$2"
+    local output_path="$output_dir/$output_file"
+
+    echo "🔄 Saving $image_name to $output_file..."
+
+    # 删除旧的镜像文件（如果存在）
+    if [[ -f "$output_path" ]]; then
+        echo "   Removing existing file: $output_file"
+        rm "$output_path"
+    fi
+
+    # 保存镜像
+    docker save "$image_name" -o "$output_path"
+
+    # 检查文件大小
+    local file_size=$(du -h "$output_path" | cut -f1)
+    echo "✅ Saved successfully: $output_file ($file_size)"
+}
+
+# 函数：显示镜像信息
+show_image_info() {
+    local image_name="$1"
+    echo "📋 Image info for $image_name:"
+    docker images "$image_name" --format "   Size: {{.Size}}, Created: {{.CreatedSince}}, ID: {{.ID}}"
+}
+
+echo "🔍 Checking for ARGUS custom images..."
+echo ""
+
+# 检查镜像是否存在
+es_exists=false
+kibana_exists=false
+
+if check_image "$ES_IMAGE"; then
+    show_image_info "$ES_IMAGE"
+    es_exists=true
+else
+    echo "⚠️  Elasticsearch image not found. Please build it first with:"
+    echo "   cd ../elasticsearch/build && docker build -t $ES_IMAGE ."
+fi
+
+echo ""
+
+if check_image "$KIBANA_IMAGE"; then
+    show_image_info "$KIBANA_IMAGE"
+    kibana_exists=true
+else
+    echo "⚠️  Kibana image not found. Please build it first with:"
+    echo "   cd ../kibana/build && docker build -t $KIBANA_IMAGE ."
+fi
+
+echo ""
+
+# 如果没有镜像存在，退出
+if [[ "$es_exists" == false && "$kibana_exists" == false ]]; then
+    echo "❌ No ARGUS images found to export. Please build the images first."
+    exit 1
+fi
+
+echo "💾 Starting image export process..."
+echo ""
+
+# 保存 Elasticsearch 镜像
+if [[ "$es_exists" == true ]]; then
+    save_image "$ES_IMAGE" "$ES_TAR"
+fi
+
+echo ""
+
+# 保存 Kibana 镜像
+if [[ "$kibana_exists" == true ]]; then
+    save_image "$KIBANA_IMAGE" "$KIBANA_TAR"
+fi
+
+echo ""
+echo "======================================="
+echo "📦 Export Summary"
+echo "======================================="
+
+# 显示导出的文件
+echo "📁 Exported files in $output_dir:"
+for file in "$ES_TAR" "$KIBANA_TAR"; do
+    full_path="$output_dir/$file"
+    if [[ -f "$full_path" ]]; then
+        size=$(du -h "$full_path" | cut -f1)
+        echo "   ✅ $file ($size)"
+    fi
+done
+
+echo ""
+echo "🚀 Usage instructions:"
+echo "   To load these images on another system:"
+if [[ -f "$script_dir/$ES_TAR" ]]; then
+    echo "     docker load -i $ES_TAR"
+fi
+if [[ -f "$script_dir/$KIBANA_TAR" ]]; then
+    echo "     docker load -i $KIBANA_TAR"
+fi
+
+echo ""
+echo "✅ Image export completed successfully!"
+echo ""

src/log/tests/docker-compose.yml

@@ -0,0 +1,78 @@
+version: "3.8"
+services:
+  es:
+    build:
+      context: ../elasticsearch/build
+      dockerfile: Dockerfile
+    image: argus-elasticsearch:latest
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - ES_JAVA_OPTS=-Xms512m -Xmx512m
+    volumes:
+      - ./private/argus/log/elasticsearch:/private/argus/log/elasticsearch
+    ports: ["9200:9200"]
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fs http://localhost:9200 >/dev/null || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 30
+
+  kibana:
+    build:
+      context: ../kibana/build
+      dockerfile: Dockerfile
+    image: argus-kibana:latest
+    environment:
+      - ELASTICSEARCH_HOSTS=http://es:9200
+    volumes:
+      - ./private/argus/log/kibana:/private/argus/log/kibana
+    ports: ["5601:5601"]
+    depends_on:
+      es:
+        condition: service_healthy
+
+  fluent-bit-host01:
+    image: ubuntu:22.04
+    environment:
+      - CLUSTER=local
+      - RACK=dev
+      - HOSTNAME=host01
+      - ES_HOST=es
+      - ES_PORT=9200
+    volumes:
+      - ../fluent-bit/start-fluent-bit.sh:/private/start-fluent-bit.sh:ro
+      - ../fluent-bit/fluent-bit-bundle.tar.gz:/private/fluent-bit-bundle.tar.gz:ro
+    ports: ["2020:2020"]
+    depends_on:
+      es:
+        condition: service_healthy
+    command: /private/start-fluent-bit.sh
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fs http://localhost:2020/api/v2/metrics >/dev/null || exit 1"]
+      interval: 15s
+      timeout: 10s
+      retries: 30
+
+  fluent-bit-host02:
+    image: ubuntu:22.04
+    environment:
+      - CLUSTER=local
+      - RACK=dev
+      - HOSTNAME=host02
+      - ES_HOST=es
+      - ES_PORT=9200
+    volumes:
+      - ../fluent-bit/start-fluent-bit.sh:/private/start-fluent-bit.sh:ro
+      - ../fluent-bit/fluent-bit-bundle.tar.gz:/private/fluent-bit-bundle.tar.gz:ro
+    ports: ["2021:2020"]
+    depends_on:
+      es:
+        condition: service_healthy
+    command: /private/start-fluent-bit.sh
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fs http://localhost:2020/api/v2/metrics >/dev/null || exit 1"]
+      interval: 15s
+      timeout: 10s
+      retries: 30
+

src/log/tests/scripts/01_bootstrap.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -euo pipefail
+root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd)"
+
+# 创建新的private目录结构 (基于argus目录结构)
+echo "[INFO] Creating private directory structure for supervisor-based containers..."
+mkdir -p "$root/private/argus/log/elasticsearch"
+mkdir -p "$root/private/argus/log/kibana"
+
+# 设置数据目录权限（ES 和 Kibana 容器都使用 UID 1000）
+echo "[INFO] Setting permissions for data directories..."
+sudo chown -R 1000:1000 "$root/private/argus/log/elasticsearch" 2>/dev/null || true
+sudo chown -R 1000:1000 "$root/private/argus/log/kibana" 2>/dev/null || true
+
+echo "[INFO] Supervisor-based containers will manage their own scripts and configurations"
+
+# 检查fluent-bit相关文件是否存在
+if [[ ! -f "$root/../fluent-bit/fluent-bit-bundle.tar.gz" ]]; then
+    echo "[WARN] fluent-bit/fluent-bit-bundle.tar.gz 不存在，请确保已创建该文件"
+fi
+
+if [[ ! -f "$root/../fluent-bit/start-fluent-bit.sh" ]]; then
+    echo "[WARN] fluent-bit/start-fluent-bit.sh 不存在，请确保已创建该启动脚本"
+fi
+
+echo "[OK] 初始化完成: private/argus/log/{elasticsearch,kibana}"
+echo "[INFO] Fluent-bit files should be in fluent-bit/ directory"

src/log/tests/scripts/02_up.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$(dirname "$0")/.."
+compose_cmd="docker compose"
+if ! $compose_cmd version >/dev/null 2>&1; then
+  if command -v docker-compose >/dev/null 2>&1; then compose_cmd="docker-compose"; else
+    echo "需要 Docker Compose，请安装后重试" >&2; exit 1; fi
+fi
+$compose_cmd -p logging-mvp up -d --remove-orphans
+echo "[OK] 服务已启动：ES http://localhost:9200  Kibana http://localhost:5601  Fluent-Bit host01 http://localhost:2020  Fluent-Bit host02 http://localhost:2021"

src/log/tests/scripts/03_send_test_host01.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# 获取fluent-bit-host01容器名称
+container_name="logging-mvp-fluent-bit-host01-1"
+
+# 检查容器是否存在并运行
+if ! docker ps | grep -q "$container_name"; then
+    echo "[ERROR] Fluent Bit容器 $container_name 未运行"
+    exit 1
+fi
+
+# 创建日志目录
+docker exec "$container_name" mkdir -p /logs/train /logs/infer
+
+# 写入训练日志 (host01)
+docker exec "$container_name" sh -c "printf '%s INFO [host01] training step=1 loss=1.23 model=bert\n' \"\$(date '+%F %T')\" >> /logs/train/train-demo.log"
+docker exec "$container_name" sh -c "printf '%s INFO [host01] training step=2 loss=1.15 model=bert\n' \"\$(date '+%F %T')\" >> /logs/train/train-demo.log"
+
+# 写入推理日志 (host01)
+docker exec "$container_name" sh -c "printf '%s ERROR [host01] inference failed on batch=1\n' \"\$(date '+%F %T')\" >> /logs/infer/infer-demo.log"
+docker exec "$container_name" sh -c "cat <<'STACK' >> /logs/infer/infer-demo.log
+Traceback (most recent call last):
+  File \"inference.py\", line 15, in <module>
+    raise RuntimeError(\"CUDA out of memory on host01\")
+RuntimeError: CUDA out of memory on host01
+STACK"
+
+echo "[OK] 已通过docker exec写入测试日志到 host01 容器内："
+echo " - /logs/train/train-demo.log"
+echo " - /logs/infer/infer-demo.log"

src/log/tests/scripts/03_send_test_host02.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# 获取fluent-bit-host02容器名称
+container_name="logging-mvp-fluent-bit-host02-1"
+
+# 检查容器是否存在并运行
+if ! docker ps | grep -q "$container_name"; then
+    echo "[ERROR] Fluent Bit容器 $container_name 未运行"
+    exit 1
+fi
+
+# 创建日志目录
+docker exec "$container_name" mkdir -p /logs/train /logs/infer
+
+# 写入训练日志 (host02)
+docker exec "$container_name" sh -c "printf '%s INFO [host02] training step=1 loss=1.45 model=gpt\n' \"\$(date '+%F %T')\" >> /logs/train/train-demo.log"
+docker exec "$container_name" sh -c "printf '%s INFO [host02] training step=2 loss=1.38 model=gpt\n' \"\$(date '+%F %T')\" >> /logs/train/train-demo.log"
+docker exec "$container_name" sh -c "printf '%s INFO [host02] training step=3 loss=1.32 model=gpt\n' \"\$(date '+%F %T')\" >> /logs/train/train-demo.log"
+
+# 写入推理日志 (host02)  
+docker exec "$container_name" sh -c "printf '%s WARN [host02] inference slow on batch=5 latency=2.3s\n' \"\$(date '+%F %T')\" >> /logs/infer/infer-demo.log"
+docker exec "$container_name" sh -c "printf '%s INFO [host02] inference completed batch=6 latency=0.8s\n' \"\$(date '+%F %T')\" >> /logs/infer/infer-demo.log"
+
+echo "[OK] 已通过docker exec写入测试日志到 host02 容器内："
+echo " - /logs/train/train-demo.log"
+echo " - /logs/infer/infer-demo.log"

src/log/tests/scripts/04_query_es.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+ES="${ES:-http://localhost:9200}"
+echo "[i] 查询 ES 端点：$ES"
+curl -fsS "$ES/_cat/indices?v" | egrep 'train-|infer-|logstash' || true
+printf "train-* 计数："; curl -fsS "$ES/train-*/_count" | sed -E 's/.*"count":([0-9]+).*/\1/'; echo
+printf "infer-* 计数："; curl -fsS "$ES/infer-*/_count" | sed -E 's/.*"count":([0-9]+).*/\1/'; echo

src/log/tests/scripts/05_down.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$(dirname "$0")/.."
+compose_cmd="docker compose"
+if ! $compose_cmd version >/dev/null 2>&1; then
+  if command -v docker-compose >/dev/null 2>&1; then compose_cmd="docker-compose"; else
+    echo "需要 Docker Compose，请安装后重试" >&2; exit 1; fi
+fi
+$compose_cmd -p logging-mvp down
+echo "[OK] 已停止所有容器"

src/log/tests/scripts/e2e_test.sh

@@ -0,0 +1,168 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "======================================="
+echo "ARGUS Log System End-to-End Test"
+echo "======================================="
+echo ""
+
+# 记录测试开始时间
+test_start_time=$(date +%s)
+
+# 函数：获取ES中的日志计数
+get_log_count() {
+    local train_count=$(curl -s "http://localhost:9200/train-*/_count" 2>/dev/null | grep -o '"count":[0-9]*' | cut -d':' -f2 || echo "0")
+    local infer_count=$(curl -s "http://localhost:9200/infer-*/_count" 2>/dev/null | grep -o '"count":[0-9]*' | cut -d':' -f2 || echo "0")
+    echo "$((train_count + infer_count))"
+}
+
+# 函数：等待服务就绪
+wait_for_services() {
+    echo "[INFO] Waiting for all services to be ready..."
+    local max_attempts=60
+    local attempt=1
+
+    while [ $attempt -le $max_attempts ]; do
+        if curl -fs http://localhost:9200/_cluster/health >/dev/null 2>&1 && \
+           curl -fs http://localhost:5601/api/status >/dev/null 2>&1 && \
+           curl -fs http://localhost:2020/api/v2/metrics >/dev/null 2>&1 && \
+           curl -fs http://localhost:2021/api/v2/metrics >/dev/null 2>&1; then
+            echo "[OK] All services are ready!"
+            return 0
+        fi
+        echo "    Waiting for services... ($attempt/$max_attempts)"
+        sleep 5
+        ((attempt++))
+    done
+
+    echo "[ERROR] Services not ready after $max_attempts attempts"
+    return 1
+}
+
+# 函数：显示测试步骤
+show_step() {
+    echo ""
+    echo "🔄 Step $1: $2"
+    echo "----------------------------------------"
+}
+
+# 函数：验证步骤结果
+verify_step() {
+    if [ $? -eq 0 ]; then
+        echo "✅ $1 - SUCCESS"
+    else
+        echo "❌ $1 - FAILED"
+        exit 1
+    fi
+}
+
+# 开始端到端测试
+show_step "1" "Bootstrap - Initialize environment"
+./scripts/01_bootstrap.sh
+verify_step "Bootstrap"
+
+show_step "2" "Startup - Start all services"
+./scripts/02_up.sh
+verify_step "Service startup"
+
+# 等待服务完全就绪
+wait_for_services || exit 1
+
+# 记录发送测试数据前的日志计数
+initial_count=$(get_log_count)
+echo "[INFO] Initial log count: $initial_count"
+
+show_step "3a" "Send test data - Host01"
+./scripts/03_send_test_host01.sh
+verify_step "Test data sending (host01)"
+
+show_step "3b" "Send test data - Host02"
+./scripts/03_send_test_host02.sh
+verify_step "Test data sending (host02)"
+
+# 等待数据被处理
+echo "[INFO] Waiting for data to be processed..."
+sleep 10
+
+show_step "4" "Verify data - Query Elasticsearch"
+./scripts/04_query_es.sh
+verify_step "Data verification"
+
+# 记录发送测试数据后的日志计数
+final_count=$(get_log_count)
+echo "[INFO] Final log count: $final_count"
+
+# 验证日志数量是否增加
+if [ "$final_count" -gt "$initial_count" ]; then
+    added_logs=$((final_count - initial_count))
+    echo "✅ Log count verification - SUCCESS: Added $added_logs logs (from $initial_count to $final_count)"
+else
+    echo "❌ Log count verification - FAILED: Expected count to increase, but got $initial_count -> $final_count"
+    exit 1
+fi
+
+# 验证预期的最小日志数量（每个主机应该发送一些日志）
+expected_min_logs=4  # 至少应该有几条日志
+if [ "$final_count" -ge "$expected_min_logs" ]; then
+    echo "✅ Minimum log threshold - SUCCESS: $final_count logs (>= $expected_min_logs expected)"
+else
+    echo "❌ Minimum log threshold - FAILED: Only $final_count logs (>= $expected_min_logs expected)"
+    exit 1
+fi
+
+# 检查服务健康状态
+show_step "Health" "Check service health"
+echo "[INFO] Checking service health..."
+
+# 检查 Elasticsearch 健康状态
+es_health=$(curl -s "http://localhost:9200/_cluster/health" | grep -o '"status":"[^"]*"' | cut -d'"' -f4)
+if [ "$es_health" = "green" ] || [ "$es_health" = "yellow" ]; then
+    echo "✅ Elasticsearch health: $es_health"
+else
+    echo "❌ Elasticsearch health: $es_health"
+fi
+
+# 检查 Kibana 状态
+if curl -fs "http://localhost:5601/api/status" >/dev/null 2>&1; then
+    kb_status="available"
+    echo "✅ Kibana status: $kb_status"
+else
+    kb_status="unavailable"
+    echo "⚠️  Kibana status: $kb_status"
+fi
+
+# 检查 Fluent-Bit 指标
+fb_host01_uptime=$(curl -s "http://localhost:2020/api/v2/metrics" | grep "fluentbit_uptime" | head -1 | grep -o "[0-9]\+$" || echo "0")
+fb_host02_uptime=$(curl -s "http://localhost:2021/api/v2/metrics" | grep "fluentbit_uptime" | head -1 | grep -o "[0-9]\+$" || echo "0")
+
+if [ "$fb_host01_uptime" -gt 0 ] && [ "$fb_host02_uptime" -gt 0 ]; then
+    echo "✅ Fluent-Bit services: host01 uptime=${fb_host01_uptime}s, host02 uptime=${fb_host02_uptime}s"
+else
+    echo "⚠️  Fluent-Bit services: host01 uptime=${fb_host01_uptime}s, host02 uptime=${fb_host02_uptime}s"
+fi
+
+verify_step "Service health check"
+
+show_step "5" "Cleanup - Stop all services"
+./scripts/05_down.sh
+verify_step "Service cleanup"
+
+# 计算总测试时间
+test_end_time=$(date +%s)
+total_time=$((test_end_time - test_start_time))
+
+echo ""
+echo "======================================="
+echo "🎉 END-TO-END TEST COMPLETED SUCCESSFULLY!"
+echo "======================================="
+echo "📊 Test Summary:"
+echo "   • Initial logs: $initial_count"
+echo "   • Final logs: $final_count"
+echo "   • Added logs: $added_logs"
+echo "   • Total time: ${total_time}s"
+echo "   • ES health: $es_health"
+echo "   • Kibana status: $kb_status"
+echo "   • All services started and stopped successfully"
+echo ""
+echo "✅ The ARGUS log system is working correctly!"
+echo ""