fix: 修复 Dockerfile 中 chown 目录可能导致用户权限的问题；

refs #20
feat: 新增测试节点，用于测试FTP安装包安装流程；修复写入 /etc/resolv.conf 顺序问题导致dns解析有误；
2025-10-16 11:45:28 +08:00 · 2025-10-14 17:24:35 +08:00 · 2025-10-14 12:16:31 +08:00 · 2025-10-14 12:16:31 +08:00
28 changed files with 759 additions and 288 deletions
--- a/src/metric/client-plugins/all-in-one-demo/scripts/sync_dns.sh
+++ b/src/metric/client-plugins/all-in-one-demo/scripts/sync_dns.sh
@ -126,41 +126,54 @@ compare_files() {
    fi
 }

-# 将 DNS 配置追加到 /etc/resolv.conf
+# 将 DNS 配置添加到 /etc/resolv.conf 开头
 update_resolv_conf() {
    local dns_conf_file="$1"
    
    log_info "更新 /etc/resolv.conf 文件..."

-    # 备份原始文件
-    if [[ -f "$RESOLV_CONF" ]]; then
-        cp "$RESOLV_CONF" "${RESOLV_CONF}.backup.$(date +%Y%m%d_%H%M%S)"
-        log_info "已备份原始 resolv.conf 文件"
-    fi
+    # 创建临时文件
+    local temp_resolv="/tmp/resolv.conf.$$"

-    # 读取 DNS 配置文件并追加到 resolv.conf
+    # 将 dns.conf 内容转换为 nameserver 添加到临时文件开头
    while IFS= read -r line; do
-        # 跳过空行和注释行
+        # 跳过空行和注释
        [[ -z "$line" || "$line" =~ ^[[:space:]]*# ]] && continue
-        
-        # 验证是否为有效的 IP 地址
-        if [[ "$line" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-            # 检查是否已存在相同的 nameserver 行
-            if ! grep -q "nameserver $line" "$RESOLV_CONF" 2>/dev/null; then
-                echo "nameserver $line" >> "$RESOLV_CONF"
-                log_info "添加 DNS 服务器: $line"
+        # 验证 IP 格式
+        if [[ "$line" =~ ^[0-9]{1,3}(\.[0-9]{1,3}){3}$ ]]; then
+            echo "nameserver $line" >> "$temp_resolv"
+            log_info "添加 DNS 到临时文件: $line"
        else
-                log_info "DNS 服务器已存在，跳过: $line"
-            fi
-        else
-            log_warning "跳过无效的 DNS 地址: $line"
+            log_warning "跳过无效 DNS: $line"
        fi
    done < "$dns_conf_file"

-    # 设置文件权限
-    chmod 644 "$RESOLV_CONF"
+    # 将原 resolv.conf 内容追加到临时文件后面
+    if [[ -f "$RESOLV_CONF" ]]; then
+        cat "$RESOLV_CONF" >> "$temp_resolv"
+    fi

-    log_success "/etc/resolv.conf 文件更新完成"
+    # 判断是否是 root
+    if [[ $(id -u) -eq 0 ]]; then
+        # root 直接写入
+        tee "$RESOLV_CONF" < "$temp_resolv" >/dev/null
+        chmod 644 "$RESOLV_CONF"
+    else
+        # 非 root 尝试使用 sudo
+        if command -v sudo >/dev/null 2>&1; then
+            sudo tee "$RESOLV_CONF" < "$temp_resolv" >/dev/null
+            sudo chmod 644 "$RESOLV_CONF"
+        else
+            log_error "非 root 用户且系统未安装 sudo，无法更新 /etc/resolv.conf"
+            rm -f "$temp_resolv"
+            exit 1
+        fi
+    fi
+
+    # 清理临时文件
+    rm -f "$temp_resolv"
+
+    log_success "/etc/resolv.conf 已更新"
 }

 # 记录同步日志
--- a/src/metric/ftp/build/Dockerfile
+++ b/src/metric/ftp/build/Dockerfile
@ -31,25 +31,26 @@ RUN mkdir -p /var/log/supervisor
 ENV FTP_BASE_PATH=/private/argus/ftp

 # 设置域名环境变量
-ENV DOMAIN=prom.ftp.argus.com
+ENV DOMAIN=ftp.metric.argus.com

 # 设置FTP用户密码环境变量
 ENV FTP_PASSWORD=ZGClab1234!

 # 设置用户和组ID环境变量
-ARG FTP_UID=2133
-ARG FTP_GID=2015
-ENV FTP_UID=${FTP_UID}
-ENV FTP_GID=${FTP_GID}
+ARG ARGUS_BUILD_UID=2133
+ARG ARGUS_BUILD_GID=2015
+
+ENV ARGUS_BUILD_UID=${ARGUS_BUILD_UID} \
+    ARGUS_BUILD_GID=${ARGUS_BUILD_GID}

 # 创建FTP用户和目录结构
-RUN groupadd -g ${FTP_GID} ftpuser && \
-    useradd -u ${FTP_UID} -g ${FTP_GID} -d ${FTP_BASE_PATH}/share -s /bin/bash ftpuser && \
+RUN groupadd -g ${ARGUS_BUILD_GID} ftpuser && \
+    useradd -u ${ARGUS_BUILD_UID} -g ${ARGUS_BUILD_GID} -d ${FTP_BASE_PATH}/share -s /bin/bash ftpuser && \
    mkdir -p ${FTP_BASE_PATH}/share \
    && mkdir -p /private/argus/etc \
    && mkdir -p /var/log/vsftpd \
-    && mkdir -p /var/run/vsftpd/empty \
-    && chown -R ftpuser:ftpuser ${FTP_BASE_PATH}
+    && chown -R ftpuser:ftpuser ${FTP_BASE_PATH} \
+    && mkdir -p /var/run/vsftpd/empty

 # 创建vsftpd配置目录和用户列表文件
 RUN mkdir -p /etc/vsftpd && \
--- a/src/metric/ftp/build/start-ftp-supervised.sh
+++ b/src/metric/ftp/build/start-ftp-supervised.sh
@ -32,6 +32,9 @@ IP=$(ifconfig eth0 | awk '/inet /{print $2}' || hostname -i)
 echo "current IP: ${IP}"
 echo "${IP}" > /private/argus/etc/${DOMAIN}

+chown ${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID} /private/argus/etc/${DOMAIN}
+chmod +x /private/argus/etc/${DOMAIN}
+
 # 启动vsftpd
 echo "[INFO] Starting vsftpd..."
 exec /usr/sbin/vsftpd /tmp/vsftpd.conf
--- a/src/metric/grafana/build/Dockerfile
+++ b/src/metric/grafana/build/Dockerfile
@ -17,30 +17,31 @@ RUN mkdir -p /var/log/supervisor
 ENV GRAFANA_BASE_PATH=/private/argus/metric/grafana

 # 设置用户和组ID环境变量
-ARG GRAFANA_UID=2133
-ARG GRAFANA_GID=2015
-ENV GRAFANA_UID=${GRAFANA_UID}
-ENV GRAFANA_GID=${GRAFANA_GID}
+ARG ARGUS_BUILD_UID=2133
+ARG ARGUS_BUILD_GID=2015
+
+ENV ARGUS_BUILD_UID=${ARGUS_BUILD_UID} \
+    ARGUS_BUILD_GID=${ARGUS_BUILD_GID}

 # 创建基本目录结构
 RUN mkdir -p /private/argus/etc \
-    && mkdir -p /private/argus/metric/grafana/data \
-    && mkdir -p /private/argus/metric/grafana/logs \
-    && mkdir -p /private/argus/metric/grafana/plugins \
-    && mkdir -p /private/argus/metric/grafana/provisioning/datasources \
-    && mkdir -p /private/argus/metric/grafana/provisioning/dashboards \
-    && mkdir -p /private/argus/metric/grafana/data/sessions \
-    && mkdir -p /private/argus/metric/grafana/data/dashboards \
-    && mkdir -p /private/argus/metric/grafana/config \
+    && mkdir -p ${GRAFANA_BASE_PATH}/data \
+    && mkdir -p ${GRAFANA_BASE_PATH}/logs \
+    && mkdir -p ${GRAFANA_BASE_PATH}/plugins \
+    && mkdir -p ${GRAFANA_BASE_PATH}/provisioning/datasources \
+    && mkdir -p ${GRAFANA_BASE_PATH}/provisioning/dashboards \
+    && mkdir -p ${GRAFANA_BASE_PATH}/data/sessions \
+    && mkdir -p ${GRAFANA_BASE_PATH}/data/dashboards \
+    && mkdir -p ${GRAFANA_BASE_PATH}/config \
    && mkdir -p /etc/grafana \
    && mkdir -p /var/lib/grafana \
    && mkdir -p /var/log/grafana

 # 修改 Grafana 用户 UID/GID 并授权
 RUN deluser grafana && \
-    addgroup -g ${GRAFANA_GID} grafana && \
-    adduser -u ${GRAFANA_UID} -G grafana -s /bin/sh -D grafana && \
-    chown -R grafana:grafana /var/lib/grafana /etc/grafana /var/log/grafana /private/argus
+    addgroup -g ${ARGUS_BUILD_GID} grafana && \
+    adduser -u ${ARGUS_BUILD_UID} -G grafana -s /bin/sh -D grafana && \
+    chown -R grafana:grafana /var/lib/grafana /etc/grafana /var/log/grafana ${GRAFANA_BASE_PATH}

 # 复制配置文件到容器内临时位置
 COPY grafana.ini /tmp/grafana.ini
--- a/src/metric/grafana/build/start-grafana-supervised.sh
+++ b/src/metric/grafana/build/start-grafana-supervised.sh
@ -9,6 +9,7 @@ DOMAIN=grafana.metric.argus.com
 IP=$(ifconfig | awk '/inet / && $2 != "127.0.0.1" {print $2; exit}')
 echo "current IP: ${IP}"
 echo "${IP}" > /private/argus/etc/${DOMAIN}
+chmod +x /private/argus/etc/${DOMAIN}

 # 确保必要目录存在（权限已在 Dockerfile 中设置）
 mkdir -p /private/argus/metric/grafana/data
@ -27,7 +28,6 @@ mkdir -p /var/lib/grafana
 if [ -f "/tmp/grafana.ini" ]; then
    echo "[INFO] Copying grafana.ini to /private/argus/metric/grafana/config/"
    cp /tmp/grafana.ini /private/argus/metric/grafana/config/grafana.ini
-    chown grafana:grafana /private/argus/metric/grafana/config/grafana.ini
    echo "[INFO] Grafana configuration copied successfully"
 fi

@ -47,12 +47,9 @@ fi
 if [ -f "/tmp/datasources.yml" ]; then
    echo "[INFO] Copying datasource configuration to /private/argus/metric/grafana/provisioning/datasources/"
    cp /tmp/datasources.yml /private/argus/metric/grafana/provisioning/datasources/datasources.yml
-    chown grafana:grafana /private/argus/metric/grafana/provisioning/datasources/datasources.yml
    echo "[INFO] Datasource configuration copied successfully"
 elif [ -d "/private/argus/metric/grafana/provisioning/datasources" ] && [ "$(ls -A /private/argus/metric/grafana/provisioning/datasources)" ]; then
    echo "[INFO] Found existing datasource provisioning files in /private/argus/metric/grafana/provisioning/datasources"
-    # 确保数据源配置目录权限正确
-    chown -R grafana:grafana /private/argus/metric/grafana/provisioning/datasources
 elif [ -d "/etc/grafana/provisioning/datasources" ] && [ "$(ls -A /etc/grafana/provisioning/datasources)" ]; then
    echo "[INFO] Found datasource provisioning files in /etc/grafana/provisioning/datasources"
    # 确保数据源配置目录权限正确
@ -65,7 +62,6 @@ fi
 if [ -f "/tmp/dashboards.yml" ]; then
    echo "[INFO] Copying dashboard configuration to /private/argus/metric/grafana/provisioning/dashboards/"
    cp /tmp/dashboards.yml /private/argus/metric/grafana/provisioning/dashboards/dashboards.yml
-    chown grafana:grafana /private/argus/metric/grafana/provisioning/dashboards/dashboards.yml
    echo "[INFO] Dashboard configuration copied successfully"
 fi

@ -73,13 +69,9 @@ fi
 if [ -f "/tmp/default_dashboard.json" ]; then
    echo "[INFO] Copying default dashboard to /private/argus/metric/grafana/provisioning/dashboards/"
    cp /tmp/default_dashboard.json /private/argus/metric/grafana/provisioning/dashboards/default_dashboard.json
-    chown grafana:grafana /private/argus/metric/grafana/provisioning/dashboards/default_dashboard.json
    echo "[INFO] Default dashboard copied successfully"
 fi

-# 确保所有配置目录权限正确
-chown -R grafana:grafana /private/argus/metric/grafana/provisioning/
-
 # 启动 Grafana
 if [ -n "$CONFIG_FILE" ]; then
    echo "[INFO] Starting Grafana with custom configuration..."
--- a/src/metric/prometheus/build/Dockerfile
+++ b/src/metric/prometheus/build/Dockerfile
@ -48,11 +48,11 @@ RUN mkdir -p /var/log/supervisor
 ENV PROMETHEUS_BASE_PATH=/private/argus/metric/prometheus

 # 设置用户和组ID环境变量
-ARG PROMETHEUS_UID=2133
-ARG PROMETHEUS_GID=2015
-ENV PROMETHEUS_UID=${PROMETHEUS_UID}
-ENV PROMETHEUS_GID=${PROMETHEUS_GID}
+ARG ARGUS_BUILD_UID=2133
+ARG ARGUS_BUILD_GID=2015

+ENV ARGUS_BUILD_UID=${ARGUS_BUILD_UID} \
+    ARGUS_BUILD_GID=${ARGUS_BUILD_GID}
 # 创建目录结构
 RUN mkdir -p ${PROMETHEUS_BASE_PATH}/rules \
    && mkdir -p ${PROMETHEUS_BASE_PATH}/targets \
@ -61,11 +61,11 @@ RUN mkdir -p ${PROMETHEUS_BASE_PATH}/rules \
    && ln -s ${PROMETHEUS_BASE_PATH} /prometheus

 # 修改 Prometheus 用户 UID/GID 并授权
-RUN usermod -u ${PROMETHEUS_UID} nobody && \
-    groupmod -g ${PROMETHEUS_GID} nogroup && \
+RUN usermod -u ${ARGUS_BUILD_UID} nobody && \
+    groupmod -g ${ARGUS_BUILD_GID} nogroup && \
    chown -h nobody:nogroup /prometheus && \
-    chown -R nobody:nogroup /private/argus/metric /etc/prometheus && \
-    chown -R nobody:nogroup ${PROMETHEUS_BASE_PATH}
+    chown -R nobody:nogroup ${PROMETHEUS_BASE_PATH} && \
+    chown -R nobody:nogroup /etc/prometheus

 # supervisor 配置
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
--- a/src/metric/prometheus/build/prometheus.yml
+++ b/src/metric/prometheus/build/prometheus.yml
@ -7,7 +7,7 @@ global:
 alerting:
  alertmanagers:
    - static_configs:
-        - targets: []
+        - targets: ["alertmanager.alert.argus.com:9093"]

 # 规则目录
 rule_files:
--- a/src/metric/prometheus/build/start-prometheus-supervised.sh
+++ b/src/metric/prometheus/build/start-prometheus-supervised.sh
@ -17,6 +17,7 @@ sed "s|\${PROMETHEUS_BASE_PATH}|${PROMETHEUS_BASE_PATH}|g" \
 IP=$(ifconfig eth0 | awk '/inet /{print $2}')
 echo "current IP: ${IP}"
 echo "${IP}" > /private/argus/etc/${DOMAIN}
+chmod +x /private/argus/etc/${DOMAIN}

 exec /bin/prometheus \
    --config.file=${PROMETHEUS_BASE_PATH}/prometheus.yml \
--- a/src/metric/tests/.gitignore
+++ b/src/metric/tests/.gitignore
@ -1,7 +1,7 @@
 .env
 data/
 images-cache/
+private-test-node/
 *.tar
 *.log
 .DS_Store
-
--- a/src/metric/tests/client-test-node/build/Dockerfile
+++ b/src/metric/tests/client-test-node/build/Dockerfile
@ -0,0 +1,6 @@
+FROM ubuntu:22.04
+RUN apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq tzdata && \
+    rm -rf /var/lib/apt/lists/*
+ENV TZ=Asia/Shanghai
+
--- a/src/metric/tests/docker-compose.yml
+++ b/src/metric/tests/docker-compose.yml
@ -1,29 +1,39 @@
+networks:
+  default:
+    name: argus-debug-net
+    external: true
+
 services:
  ftp:
    build:
      context: ../ftp/build
      dockerfile: Dockerfile
      args:
-        FTP_UID: ${FTP_UID:-2133}
-        FTP_GID: ${FTP_GID:-2015}
+        ARGUS_BUILD_UID: ${ARGUS_BUILD_UID:-2133}
+        ARGUS_BUILD_GID: ${ARGUS_BUILD_GID:-2015}
+        USE_INTRANET: ${USE_INTRANET:-false}
    image: argus-metric-ftp:latest
    container_name: argus-ftp
    restart: unless-stopped
    environment:
+      - TZ=Asia/Shanghai
      - FTP_BASE_PATH=/private/argus/ftp
      - FTP_PASSWORD=${FTP_PASSWORD:-ZGClab1234!}
-      - DOMAIN=${FTP_DOMAIN:-prom.ftp.argus.com}
-      - FTP_UID=${FTP_UID:-2133}
-      - FTP_GID=${FTP_GID:-2015}
+      - DOMAIN=${FTP_DOMAIN:-ftp.metric.argus.com}
+      - ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}
+      - ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}
    ports:
      - "${FTP_PORT:-21}:21"
      - "${FTP_DATA_PORT:-20}:20"
      - "21100-21110:21100-21110"
    volumes:
-      - ${DATA_ROOT:-./data}/ftp:/private/argus/ftp
-      - ${DATA_ROOT:-./data}/etc:/private/argus/etc
+      - ${DATA_ROOT:-/private}/argus/metric/ftp:/private/argus/ftp
+      - ${DATA_ROOT:-/private}/argus/etc:/private/argus/etc
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
    networks:
-      - argus-network
+      default:
+        ipv4_address: 172.30.0.40
    logging:
      driver: "json-file"
      options:
@ -35,23 +45,27 @@ services:
      context: ../prometheus/build
      dockerfile: Dockerfile
      args:
-        PROMETHEUS_UID: ${PROMETHEUS_UID:-2133}
-        PROMETHEUS_GID: ${PROMETHEUS_GID:-2015}
+        ARGUS_BUILD_UID: ${ARGUS_BUILD_UID:-2133}
+        ARGUS_BUILD_GID: ${ARGUS_BUILD_GID:-2015}
        USE_INTRANET: ${USE_INTRANET:-false}
    image: argus-metric-prometheus:latest
    container_name: argus-prometheus
    restart: unless-stopped
    environment:
+      - TZ=Asia/Shanghai
      - PROMETHEUS_BASE_PATH=/private/argus/metric/prometheus
-      - PROMETHEUS_UID=${PROMETHEUS_UID:-2133}
-      - PROMETHEUS_GID=${PROMETHEUS_GID:-2015}
+      - ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}
+      - ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}
    ports:
      - "${PROMETHEUS_PORT:-9090}:9090"
    volumes:
-      - ${DATA_ROOT:-./data}/prometheus:/private/argus/metric/prometheus
-      - ${DATA_ROOT:-./data}/etc:/private/argus/etc
+      - ${DATA_ROOT:-/private}/argus/metric/prometheus:/private/argus/metric/prometheus
+      - ${DATA_ROOT:-/private}/argus/etc:/private/argus/etc
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
    networks:
-      - argus-network
+      default:
+        ipv4_address: 172.30.0.41
    logging:
      driver: "json-file"
      options:
@ -63,25 +77,29 @@ services:
      context: ../grafana/build
      dockerfile: Dockerfile
      args:
-        GRAFANA_UID: ${GRAFANA_UID:-2133}
-        GRAFANA_GID: ${GRAFANA_GID:-2015}
+        ARGUS_BUILD_UID: ${ARGUS_BUILD_UID:-2133}
+        ARGUS_BUILD_GID: ${ARGUS_BUILD_GID:-2015}
    image: argus-metric-grafana:latest
    container_name: argus-grafana
    restart: unless-stopped
    environment:
+      - TZ=Asia/Shanghai
      - GRAFANA_BASE_PATH=/private/argus/metric/grafana
-      - GRAFANA_UID=${GRAFANA_UID:-2133}
-      - GRAFANA_GID=${GRAFANA_GID:-2015}
+      - ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}
+      - ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}
      - GF_SERVER_HTTP_PORT=3000
      - GF_LOG_LEVEL=warn
      - GF_LOG_MODE=console
    ports:
      - "${GRAFANA_PORT:-3000}:3000"
    volumes:
-      - ${DATA_ROOT:-./data}/grafana:/private/argus/metric/grafana
-      - ${DATA_ROOT:-./data}/etc:/private/argus/etc
+      - ${DATA_ROOT:-/private}/argus/metric/grafana:/private/argus/metric/grafana
+      - ${DATA_ROOT:-/private}/argus/etc:/private/argus/etc
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
    networks:
-      - argus-network
+      default:
+        ipv4_address: 172.30.0.42
    depends_on:
      - prometheus
    logging:
@ -90,16 +108,37 @@ services:
        max-size: "10m"
        max-file: "3"

-networks:
-  argus-network:
-    driver: bridge
-    name: argus-network
-
-volumes:
-  ftp_data:
-    driver: local
-  prometheus_data:
-    driver: local
-  grafana_data:
-    driver: local
+  test-node:
+    build:
+      context: ./client-test-node/build
+      dockerfile: Dockerfile
+    image: argus-metric-test-node:latest
+    container_name: argus-metric-test-node
+    hostname: test-metric-node-001
+    restart: unless-stopped
+    privileged: true
+    depends_on:
+      - ftp
+      - prometheus
+    environment:
+      - TZ=Asia/Shanghai
+      - DEBIAN_FRONTEND=noninteractive
+      - FTP_DOMAIN=${FTP_DOMAIN:-ftp.metric.argus.com}
+      - FTP_SERVER=${FTP_SERVER:-172.30.0.40}
+      - FTP_USER=${FTP_USER:-ftpuser}
+      - FTP_PASSWORD=${FTP_PASSWORD:-ZGClab1234!}
+      - FTP_PORT=${FTP_PORT:-21}
+    volumes:
+      - ${DATA_ROOT:-/private}/argus/agent:/private/argus/agent
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+    command: sleep infinity
+    networks:
+      default:
+        ipv4_address: 172.30.0.50
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"

--- a/src/metric/tests/env.example
+++ b/src/metric/tests/env.example
@ -1,19 +1,15 @@
-# 用户和组配置
-FTP_UID=2133
-FTP_GID=2015
-PROMETHEUS_UID=2133
-PROMETHEUS_GID=2015
-GRAFANA_UID=2133
-GRAFANA_GID=2015
+# 统一用户和组配置
+ARGUS_BUILD_UID=1048
+ARGUS_BUILD_GID=1048

 # 数据根目录
-DATA_ROOT=/private/argus
+DATA_ROOT=/private

 # FTP 配置
-FTP_PORT=2122
-FTP_DATA_PORT=2022
+FTP_PORT=21
+FTP_DATA_PORT=20
 FTP_PASSWORD=ZGClab1234!
-FTP_DOMAIN=prom.ftp.argus.com
+FTP_DOMAIN=ftp.metric.argus.com

 # Prometheus 配置
 PROMETHEUS_PORT=9090
--- a/src/metric/tests/init-directories.sh
+++ b/src/metric/tests/init-directories.sh
@ -1,90 +0,0 @@
-#!/bin/bash
-
-# 初始化目录脚本
-# 用于创建所有必要的数据目录并设置正确的权限
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
-
-# 加载 .env 文件（如果存在）
-if [ -f .env ]; then
-    echo "加载 .env 配置文件..."
-    source .env
-fi
-
-# 默认配置
-FTP_UID=${FTP_UID:-2133}
-FTP_GID=${FTP_GID:-2015}
-PROMETHEUS_UID=${PROMETHEUS_UID:-2133}
-PROMETHEUS_GID=${PROMETHEUS_GID:-2015}
-GRAFANA_UID=${GRAFANA_UID:-2133}
-GRAFANA_GID=${GRAFANA_GID:-2015}
-DATA_ROOT=${DATA_ROOT:-./data}
-
-echo "开始初始化目录结构..."
-echo "数据目录: ${DATA_ROOT}"
-echo ""
-
-# 创建 FTP 目录
-echo "创建 FTP 目录..."
-sudo mkdir -p ${DATA_ROOT}/ftp/share
-sudo chown -R ${FTP_UID}:${FTP_GID} ${DATA_ROOT}/ftp
-sudo chmod -R 755 ${DATA_ROOT}/ftp
-
-# 创建 Prometheus 目录
-echo "创建 Prometheus 目录..."
-sudo mkdir -p ${DATA_ROOT}/prometheus/{data,rules,targets}
-
-# 创建默认的 targets 文件（先创建文件再改权限）
-if [ ! -f "${DATA_ROOT}/prometheus/targets/node_exporter.json" ]; then
-    echo "创建默认 node_exporter targets..."
-    echo '[
-  {
-    "targets": [],
-    "labels": {
-      "job": "node"
-    }
-  }
-]' | sudo tee ${DATA_ROOT}/prometheus/targets/node_exporter.json > /dev/null
-fi
-
-if [ ! -f "${DATA_ROOT}/prometheus/targets/dcgm_exporter.json" ]; then
-    echo "创建默认 dcgm_exporter targets..."
-    echo '[
-  {
-    "targets": [],
-    "labels": {
-      "job": "dcgm"
-    }
-  }
-]' | sudo tee ${DATA_ROOT}/prometheus/targets/dcgm_exporter.json > /dev/null
-fi
-
-# 统一设置 Prometheus 目录权限
-sudo chown -R ${PROMETHEUS_UID}:${PROMETHEUS_GID} ${DATA_ROOT}/prometheus
-sudo chmod -R 755 ${DATA_ROOT}/prometheus
-
-# 创建 Grafana 目录
-echo "创建 Grafana 目录..."
-sudo mkdir -p ${DATA_ROOT}/grafana/{data,logs,plugins,provisioning/datasources,provisioning/dashboards,data/sessions,data/dashboards,config}
-sudo chown -R ${GRAFANA_UID}:${GRAFANA_GID} ${DATA_ROOT}/grafana
-sudo chmod -R 755 ${DATA_ROOT}/grafana
-
-# 创建公共配置目录
-sudo mkdir -p ${DATA_ROOT}/etc
-sudo chown -R ${FTP_UID}:${FTP_GID} ${DATA_ROOT}/etc
-sudo chmod -R 755 ${DATA_ROOT}/etc
-
-echo "目录初始化完成！"
-echo ""
-echo "目录结构："
-echo "  ${DATA_ROOT}/"
-echo "  ├── ftp/           (UID:${FTP_UID}, GID:${FTP_GID})"
-echo "  ├── prometheus/    (UID:${PROMETHEUS_UID}, GID:${PROMETHEUS_GID})"
-echo "  ├── grafana/       (UID:${GRAFANA_UID}, GID:${GRAFANA_GID})"
-echo "  └── etc/           (UID:${FTP_UID}, GID:${FTP_GID})"
-echo ""
-echo "您现在可以运行 'docker-compose up -d' 来启动所有服务"
-
--- a/src/metric/tests/scripts/00_e2e_test.sh
+++ b/src/metric/tests/scripts/00_e2e_test.sh
@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(dirname "$0")"
+
+echo "=========================================="
+echo "Argus Metric E2E Test"
+echo "=========================================="
+
+bash "$SCRIPT_DIR/01_start_services.sh"
+bash "$SCRIPT_DIR/02_publish_artifact.sh"
+bash "$SCRIPT_DIR/03_test_node_install.sh"
+bash "$SCRIPT_DIR/04_verify_install.sh"
+
+echo "=========================================="
+echo "E2E 测试完成"
+echo "=========================================="
+
--- a/src/metric/tests/scripts/01_start_services.sh
+++ b/src/metric/tests/scripts/01_start_services.sh
@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+# 解析参数
+REBUILD_FLAG=""
+if [[ "$1" == "--rebuild" || "$1" == "-r" ]]; then
+    REBUILD_FLAG="--rebuild"
+    echo "[01] 启用强制重新构建模式"
+fi
+
+echo "[01] 启动所有服务..."
+bash "$SCRIPT_DIR/common/start-all.sh" $REBUILD_FLAG
+
+echo "[01] 等待服务就绪..."
+sleep 5
+
+echo "[01] 检查服务状态..."
+docker ps | grep argus-ftp
+docker ps | grep argus-prometheus
+docker ps | grep argus-grafana
+docker ps | grep argus-metric-test-node
+
+echo "[01] 所有服务已启动"
+
--- a/src/metric/tests/scripts/02_publish_artifact.sh
+++ b/src/metric/tests/scripts/02_publish_artifact.sh
@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+TEST_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+PLUGIN_DIR="$(cd "$SCRIPT_DIR/../../client-plugins/all-in-one-full" && pwd)"
+
+# 加载 .env
+if [ -f "$TEST_DIR/.env" ]; then
+    source "$TEST_DIR/.env"
+fi
+
+# 检测容器挂载目录
+if docker ps --format '{{.Names}}' | grep -q '^argus-ftp$'; then
+    FTP_MOUNT=$(docker inspect argus-ftp --format '{{range .Mounts}}{{if eq .Destination "/private/argus/ftp"}}{{.Source}}{{end}}{{end}}')
+    OUTPUT_DIR="${FTP_MOUNT}/share"
+    echo "[02] 容器挂载: $OUTPUT_DIR"
+else
+    OUTPUT_DIR="${DATA_ROOT:-$TEST_DIR/data}/ftp/share"
+    echo "[02] 默认路径: $OUTPUT_DIR"
+fi
+
+OWNER="${FTP_UID:-2133}:${FTP_GID:-2015}"
+
+cd "$PLUGIN_DIR"
+
+echo "[02] 递增版本号..."
+bash scripts/version-manager.sh bump minor
+
+VERSION_FILE="config/VERSION"
+if [ ! -f "$VERSION_FILE" ]; then
+    echo "[02] 错误: 未找到 $VERSION_FILE"
+    exit 1
+fi
+
+VERSION=$(cat "$VERSION_FILE" | tr -d '[:space:]')
+echo "[02] 新版本: $VERSION"
+
+echo "[02] 构建安装包..."
+bash scripts/package_artifact.sh --force
+
+echo "[02] 发布到 FTP: $OUTPUT_DIR"
+sudo bash scripts/publish_artifact.sh "$VERSION" --output-dir "$OUTPUT_DIR" --owner "$OWNER"
+
+echo "[02] 设置文件权限..."
+# 设置所有者
+sudo chown -R "$OWNER" "$OUTPUT_DIR"
+# 设置目录权限为 755 (rwxr-xr-x)
+sudo find "$OUTPUT_DIR" -type d -exec chmod 755 {} \;
+# 设置文件权限为 644 (rw-r--r--)
+sudo find "$OUTPUT_DIR" -type f -exec chmod 644 {} \;
+# 特别处理 .sh 文件，给予执行权限 755
+sudo find "$OUTPUT_DIR" -type f -name "*.sh" -exec chmod 755 {} \;
+echo "[02] 权限设置完成 (UID:GID=$OWNER, dirs=755, files=644, scripts=755)"
+
+echo "[02] 发布完成，验证文件..."
+ls -lh "$OUTPUT_DIR"
+
+echo "[02] 完成"
+
--- a/src/metric/tests/scripts/03_test_node_install.sh
+++ b/src/metric/tests/scripts/03_test_node_install.sh
@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+FTP_SERVER="${FTP_SERVER:-172.30.0.40}"
+FTP_USER="${FTP_USER:-ftpuser}"
+FTP_PASSWORD="${FTP_PASSWORD:-ZGClab1234!}"
+FTP_PORT="${FTP_PORT:-21}"
+
+FTP_HOST="${FTP_SERVER}"
+
+echo "[03] 进入测试节点执行安装..."
+echo "[03] 使用 FTP 地址: ${FTP_HOST}:${FTP_PORT}"
+
+docker exec argus-metric-test-node bash -c "
+set -e
+
+if ! command -v curl &>/dev/null; then
+    echo '[03] curl 未安装，正在安装...'
+    apt-get update && apt-get install -y curl
+fi
+
+cd /tmp
+echo '[03] 下载 setup.sh...'
+curl -u ${FTP_USER}:${FTP_PASSWORD} ftp://${FTP_HOST}:${FTP_PORT}/setup.sh -o setup.sh
+
+echo '[03] 执行安装...'
+chmod +x setup.sh
+bash setup.sh --server ${FTP_HOST} --user ${FTP_USER} --password '${FTP_PASSWORD}' --port ${FTP_PORT}
+
+echo '[03] 安装完成'
+"
+
+echo "[03] 完成"
--- a/src/metric/tests/scripts/04_verify_install.sh
+++ b/src/metric/tests/scripts/04_verify_install.sh
@ -0,0 +1,96 @@
+#!/bin/bash
+set -e
+
+echo "[04] 验证安装结果 - 检查监控端口..."
+echo "=========================================="
+
+# 检查容器是否运行
+if ! docker ps --format '{{.Names}}' | grep -q '^argus-metric-test-node$'; then
+    echo "错误: 容器 argus-metric-test-node 未运行"
+    exit 1
+fi
+
+ERRORS=0
+
+# ==================== 检查监听端口 ====================
+echo ""
+echo "[1] 检查监听端口..."
+echo "----------------------------------------"
+CHECK_RESULT=$(docker exec argus-metric-test-node bash -c '
+if command -v netstat >/dev/null 2>&1; then
+    echo "使用 netstat 检查端口:"
+    if netstat -tlnp 2>/dev/null | grep -E ":(9100|9400|2020)"; then
+        echo "✓ 找到监控端口"
+        exit 0
+    else
+        echo "✗ 未找到监控端口 (9100/9400/2020)"
+        exit 1
+    fi
+elif command -v ss >/dev/null 2>&1; then
+    echo "使用 ss 检查端口:"
+    if ss -tlnp 2>/dev/null | grep -E ":(9100|9400|2020)"; then
+        echo "✓ 找到监控端口"
+        exit 0
+    else
+        echo "✗ 未找到监控端口 (9100/9400/2020)"
+        exit 1
+    fi
+elif command -v lsof >/dev/null 2>&1; then
+    echo "使用 lsof 检查端口:"
+    if lsof -i :9100 -i :9400 -i :2020 2>/dev/null | grep LISTEN; then
+        echo "✓ 找到监控端口"
+        exit 0
+    else
+        echo "✗ 未找到监控端口 (9100/9400/2020)"
+        exit 1
+    fi
+else
+    echo "? 没有可用的端口检查工具 (netstat/ss/lsof)，跳过此检查"
+    exit 0
+fi
+')
+echo "$CHECK_RESULT"
+# 只有在明确失败时才计入错误（exit 1），没有工具（exit 0）不算错误
+if echo "$CHECK_RESULT" | grep -q "✗ 未找到监控端口"; then
+    ERRORS=$((ERRORS + 1))
+fi
+
+# ==================== 测试端口连通性 ====================
+echo ""
+echo "[2] 测试端口连通性..."
+echo "----------------------------------------"
+docker exec argus-metric-test-node bash -c '
+if command -v curl >/dev/null 2>&1; then
+    FAILED=0
+    for port in 9100 9400 2020; do
+        echo -n "端口 $port: "
+        if curl -s --connect-timeout 2 "http://localhost:$port/metrics" > /dev/null 2>&1; then
+            echo "✓ 可访问 (/metrics)"
+        elif curl -s --connect-timeout 2 "http://localhost:$port/" > /dev/null 2>&1; then
+            echo "✓ 可访问 (根路径)"
+        else
+            echo "✗ 不可访问"
+            FAILED=$((FAILED + 1))
+        fi
+    done
+    exit $FAILED
+else
+    echo "? curl 不可用，跳过连通性测试"
+    exit 0
+fi
+' || ERRORS=$((ERRORS + 1))
+
+echo ""
+echo "=========================================="
+if [ $ERRORS -eq 0 ]; then
+    echo "✓ [04] 验证完成 - 所有端口检查通过"
+else
+    echo "✗ [04] 验证失败 - 发现 $ERRORS 个问题"
+    echo ""
+    echo "调试建议："
+    echo "  1. 进入容器检查: docker exec -it argus-metric-test-node bash"
+    echo "  2. 查看进程: docker exec argus-metric-test-node ps aux"
+    echo "  3. 查看日志: docker exec argus-metric-test-node cat /tmp/argus_install.log"
+    exit 1
+fi
+echo "=========================================="
--- a/src/metric/tests/scripts/05_cleanup.sh
+++ b/src/metric/tests/scripts/05_cleanup.sh
@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+echo "[05] 清理环境..."
+
+bash "$SCRIPT_DIR/common/stop-all.sh" || true
+
+echo "[05] 清理完成"
+
--- a/src/metric/tests/scripts/common/check-paths.sh
+++ b/src/metric/tests/scripts/common/check-paths.sh
@ -6,7 +6,8 @@
 set -e

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+TEST_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+cd "$TEST_DIR"

 echo "=========================================="
 echo "  路径检查脚本"
@ -18,15 +19,15 @@ echo ""

 # 检查配置文件
 echo "检查配置文件..."
-if [ -f "$SCRIPT_DIR/docker-compose.yml" ]; then
+if [ -f "$TEST_DIR/docker-compose.yml" ]; then
    echo "  ✓ docker-compose.yml 存在"
 else
    echo "  ✗ docker-compose.yml 不存在"
 fi

-if [ -f "$SCRIPT_DIR/.env" ]; then
+if [ -f "$TEST_DIR/.env" ]; then
    echo "  ✓ .env 存在"
-elif [ -f "$SCRIPT_DIR/env.example" ]; then
+elif [ -f "$TEST_DIR/env.example" ]; then
    echo "  ⚠ .env 不存在，但 env.example 存在"
 else
    echo "  ✗ .env 和 env.example 都不存在"
--- a/src/metric/tests/scripts/common/init-directories.sh
+++ b/src/metric/tests/scripts/common/init-directories.sh
@ -0,0 +1,61 @@
+#!/bin/bash
+
+# 初始化目录脚本
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+cd "$TEST_DIR"
+
+# 加载 .env 文件（如果存在）
+if [ -f .env ]; then
+    echo "加载 .env 配置文件..."
+    source .env
+fi
+
+# 默认配置
+ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}
+ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}
+DATA_ROOT=${DATA_ROOT:-/private}
+
+echo "开始初始化目录结构..."
+echo "数据根目录: ${DATA_ROOT}"
+echo "统一 UID: ${ARGUS_BUILD_UID}"
+echo "统一 GID: ${ARGUS_BUILD_GID}"
+
+# 创建基础目录结构
+echo "创建基础目录结构..."
+sudo mkdir -p ${DATA_ROOT}/argus/metric
+sudo mkdir -p ${DATA_ROOT}/argus/etc
+sudo mkdir -p ${DATA_ROOT}/argus/agent
+
+# 创建 FTP 目录
+echo "创建 FTP 目录..."
+sudo mkdir -p ${DATA_ROOT}/argus/metric/ftp/share
+
+# 创建 Prometheus 目录
+echo "创建 Prometheus 目录..."
+sudo mkdir -p ${DATA_ROOT}/argus/metric/prometheus/{data,rules,targets}
+
+# 创建 Grafana 目录
+echo "创建 Grafana 目录..."
+sudo mkdir -p ${DATA_ROOT}/argus/metric/grafana/{data,logs,plugins,provisioning/datasources,provisioning/dashboards,data/sessions,data/dashboards,config}
+
+# 统一设置所有目录权限
+echo "设置目录权限..."
+sudo chown -R ${ARGUS_BUILD_UID}:${ARGUS_BUILD_GID} ${DATA_ROOT}/argus/metric
+sudo chmod -R 755 ${DATA_ROOT}/argus/metric
+
+echo "目录初始化完成！"
+echo ""
+echo "目录结构："
+echo "  ${DATA_ROOT}/"
+echo "  ├── argus/                 (UID:${ARGUS_BUILD_UID}, GID:${ARGUS_BUILD_GID})"
+echo "  │   ├── metric/"
+echo "  │   │   ├── ftp/"
+echo "  │   │   ├── prometheus/"
+echo "  │   │   └── grafana/"
+echo ""
+echo "您现在可以运行 'docker-compose up -d' 来启动所有服务"
+
--- a/src/metric/tests/scripts/common/init-environment.sh
+++ b/src/metric/tests/scripts/common/init-environment.sh
--- a/src/metric/tests/scripts/common/manage-images.sh
+++ b/src/metric/tests/scripts/common/manage-images.sh
@ -6,7 +6,8 @@
 set -e

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+TEST_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+cd "$TEST_DIR"

 # 检测 docker-compose 命令
 if command -v docker-compose &> /dev/null; then
@ -19,7 +20,7 @@ else
 fi

 # 镜像缓存目录
-IMAGE_CACHE_DIR="./images-cache"
+IMAGE_CACHE_DIR="$TEST_DIR/images-cache"
 mkdir -p "$IMAGE_CACHE_DIR"

 # 定义镜像列表
--- a/src/metric/tests/scripts/common/start-all.sh
+++ b/src/metric/tests/scripts/common/start-all.sh
@ -6,13 +6,20 @@
 set -e

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
+TEST_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+cd "$TEST_DIR"
+
+# 解析参数
+FORCE_REBUILD=false
+if [[ "$1" == "--rebuild" ]]; then
+    FORCE_REBUILD=true
+fi

 echo "=========================================="
 echo "  Argus Metrics 一键启动脚本"
 echo "=========================================="
 echo ""
-echo "当前工作目录: $SCRIPT_DIR"
+echo "当前工作目录: $TEST_DIR"
 echo ""

 # 检查 Docker 和 Docker Compose
@ -21,19 +28,13 @@ if ! command -v docker &> /dev/null; then
    exit 1
 fi

-# 检测 docker-compose 命令（兼容新旧版本）
-COMPOSE_FILE="$SCRIPT_DIR/docker-compose.yml"
-if command -v docker-compose &> /dev/null; then
-    DOCKER_COMPOSE="docker-compose -f $COMPOSE_FILE"
-    echo "使用: docker-compose"
-elif docker compose version &> /dev/null 2>&1; then
-    DOCKER_COMPOSE="docker compose -f $COMPOSE_FILE"
-    echo "使用: docker compose"
-else
-    echo "错误: 未找到 docker-compose 或 docker compose 命令"
+# 检查 docker compose 命令
+if ! docker compose version &> /dev/null 2>&1; then
+    echo "错误: 未找到 docker compose 命令，请确保 Docker Compose V2 已安装"
    exit 1
 fi
-echo "Compose 文件: $COMPOSE_FILE"
+echo "使用: docker compose"
+echo "Compose 文件: $TEST_DIR/docker-compose.yml"
 echo ""

 # 检查必要的构建目录
@ -42,6 +43,7 @@ BUILD_DIRS=(
    "../ftp/build"
    "../prometheus/build"
    "../grafana/build"
+    "client-test-node/build"
 )

 for dir in "${BUILD_DIRS[@]}"; do
@ -65,6 +67,18 @@ fi
 # 加载环境变量
 source .env

+# 检查并创建 Docker 网络
+echo "检查 Docker 网络..."
+NETWORK_NAME="argus-debug-net"
+if docker network inspect "$NETWORK_NAME" >/dev/null 2>&1; then
+    echo "网络 $NETWORK_NAME 已存在"
+else
+    echo "创建网络 $NETWORK_NAME..."
+    docker network create --driver bridge --subnet 172.30.0.0/16 "$NETWORK_NAME"
+    echo "网络创建成功"
+fi
+echo ""
+
 echo "1. 初始化目录结构..."
 bash "$SCRIPT_DIR/init-directories.sh"

@ -72,8 +86,8 @@ echo ""
 echo "2. 准备 Docker 镜像..."

 # 检查镜像是否存在
-IMAGE_CACHE_DIR="./images-cache"
-IMAGES=("argus-metric-ftp:latest" "argus-metric-prometheus:latest" "argus-metric-grafana:latest")
+IMAGE_CACHE_DIR="$TEST_DIR/images-cache"
+IMAGES=("argus-metric-ftp:latest" "argus-metric-prometheus:latest" "argus-metric-grafana:latest" "argus-metric-test-node:latest")
 all_images_exist=true

 for image in "${IMAGES[@]}"; do
@ -83,7 +97,12 @@ for image in "${IMAGES[@]}"; do
    fi
 done

-if $all_images_exist; then
+if $FORCE_REBUILD; then
+    echo "强制重新构建镜像（--rebuild 模式）..."
+    cd "$TEST_DIR"
+    docker compose build --no-cache
+    echo "镜像重新构建完成"
+elif $all_images_exist; then
    echo "所有镜像已存在，跳过构建"
 else
    echo "检测到缺失镜像，尝试从缓存加载..."
@ -104,6 +123,9 @@ else
                    "argus-metric-grafana:latest")
                        cache_file="${IMAGE_CACHE_DIR}/argus-grafana.tar"
                        ;;
+                    "argus-metric-test-node:latest")
+                        cache_file="${IMAGE_CACHE_DIR}/argus-test-node.tar"
+                        ;;
                esac
                
                if [ -f "$cache_file" ]; then
@ -128,8 +150,8 @@ else
        echo ""
        echo "部分镜像缺失，开始构建..."
        echo "工作目录: $(pwd)"
-        cd "$SCRIPT_DIR"
-        $DOCKER_COMPOSE build
+        cd "$TEST_DIR"
+        docker compose build --no-cache
        
        # 询问是否保存镜像
        echo ""
@ -149,6 +171,9 @@ else
                    "argus-metric-grafana:latest")
                        docker save -o "${IMAGE_CACHE_DIR}/argus-grafana.tar" "$image" && echo "  已保存: argus-grafana.tar"
                        ;;
+                    "argus-metric-test-node:latest")
+                        docker save -o "${IMAGE_CACHE_DIR}/argus-test-node.tar" "$image" && echo "  已保存: argus-test-node.tar"
+                        ;;
                esac
            done
            echo "镜像已保存到: $IMAGE_CACHE_DIR/"
@ -161,8 +186,8 @@ fi

 echo ""
 echo "3. 启动服务..."
-cd "$SCRIPT_DIR"
-$DOCKER_COMPOSE up -d
+cd "$TEST_DIR"
+docker compose up -d

 echo ""
 echo "4. 等待服务启动..."
@ -170,8 +195,8 @@ sleep 5

 echo ""
 echo "5. 检查服务状态..."
-cd "$SCRIPT_DIR"
-$DOCKER_COMPOSE ps
+cd "$TEST_DIR"
+docker compose ps

 echo ""
 echo "=========================================="
@ -190,10 +215,10 @@ echo "    用户名: admin"
 echo "    密码:   admin"
 echo ""
 echo "常用命令："
-echo "  查看日志:     $DOCKER_COMPOSE logs -f [service]"
-echo "  停止服务:     $DOCKER_COMPOSE stop"
-echo "  重启服务:     $DOCKER_COMPOSE restart"
-echo "  停止并删除:   $DOCKER_COMPOSE down"
-echo "  停止并删除卷: $DOCKER_COMPOSE down -v"
+echo "  查看日志:     docker compose logs -f [service]"
+echo "  停止服务:     docker compose stop"
+echo "  重启服务:     docker compose restart"
+echo "  停止并删除:   docker compose down"
+echo "  停止并删除卷: docker compose down -v"
 echo ""

--- a/src/metric/tests/scripts/common/stop-all.sh
+++ b/src/metric/tests/scripts/common/stop-all.sh
@ -0,0 +1,50 @@
+    #!/bin/bash
+
+    # 停止所有服务脚本
+
+    set -e
+
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    TEST_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+    cd "$TEST_DIR"
+
+    # 检查 docker compose 命令
+    if ! docker compose version &> /dev/null 2>&1; then
+        echo "错误: 未找到 docker compose 命令，请确保 Docker Compose V2 已安装"
+        exit 1
+    fi
+
+    echo "=========================================="
+    echo "  停止 Argus Metrics 服务"
+    echo "=========================================="
+    echo ""
+    echo "使用: docker compose"
+    echo "Compose 文件: $TEST_DIR/docker-compose.yml"
+    echo ""
+
+    # 检查是否有运行的容器
+    if [ "$(docker compose ps -q)" ]; then
+        echo "停止所有服务..."
+        docker compose stop
+        
+        echo ""
+        read -p "是否要删除容器? (y/N): " -n 1 -r
+        echo
+        if [[ $REPLY =~ ^[Yy]$ ]]; then
+            docker compose down
+            echo "容器已删除"
+            
+            read -p "是否要删除数据卷? (y/N): " -n 1 -r
+            echo
+            if [[ $REPLY =~ ^[Yy]$ ]]; then
+                docker compose down -v
+                echo "数据卷已删除"
+            fi
+        fi
+    else
+        echo "没有运行的服务"
+    fi
+
+    echo ""
+    echo "完成！"
+
--- a/src/metric/tests/scripts/load-images.sh
+++ b/src/metric/tests/scripts/load-images.sh
@ -0,0 +1,85 @@
+#!/bin/bash
+
+# 镜像加载脚本
+# 用于从 tar 文件加载 Docker 镜像
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+INPUT_DIR="${1:-$TEST_DIR/images-cache}"
+
+echo "=========================================="
+echo "  Docker 镜像加载脚本"
+echo "=========================================="
+echo ""
+echo "输入目录: $INPUT_DIR"
+echo ""
+
+# 检查输入目录是否存在
+if [ ! -d "$INPUT_DIR" ]; then
+    echo "错误: 目录不存在: $INPUT_DIR"
+    exit 1
+fi
+
+# 查找所有tar文件并加载
+total=0
+success=0
+failed=0
+
+# 查找目录下所有.tar文件
+tar_files=($(find "$INPUT_DIR" -name "*.tar" -type f 2>/dev/null | sort))
+
+if [ ${#tar_files[@]} -eq 0 ]; then
+    echo "错误: 在目录 $INPUT_DIR 中未找到任何 .tar 文件"
+    exit 1
+fi
+
+echo "找到 ${#tar_files[@]} 个镜像文件："
+for tar_file in "${tar_files[@]}"; do
+    echo "  - $(basename "$tar_file")"
+done
+echo ""
+
+for tar_file in "${tar_files[@]}"; do
+    total=$((total + 1))
+    tar_filename=$(basename "$tar_file")
+    
+    echo "[$total] 处理: $tar_filename"
+    
+    # 强制加载，不检查镜像是否已存在
+    echo "    加载镜像..."
+    if docker load -i "$tar_file"; then
+        echo "    加载成功: $tar_filename"
+        success=$((success + 1))
+    else
+        echo "    加载失败: $tar_filename"
+        failed=$((failed + 1))
+    fi
+    echo ""
+done
+
+echo "=========================================="
+echo "  加载完成"
+echo "=========================================="
+echo ""
+echo "统计："
+echo "  总计: $total"
+echo "  成功: $success"
+echo "  失败: $failed"
+echo ""
+
+# 显示当前所有镜像
+echo "当前所有镜像："
+docker images
+echo ""
+
+if [ $failed -gt 0 ]; then
+    echo "部分镜像加载失败，请检查！"
+    exit 1
+fi
+
+if [ $success -gt 0 ]; then
+    echo "镜像加载成功！"
+fi
+
--- a/src/metric/tests/scripts/save-images.sh
+++ b/src/metric/tests/scripts/save-images.sh
@ -0,0 +1,93 @@
+#!/bin/bash
+
+# 镜像保存脚本
+# 用于保存 Docker 镜像到 tar 文件，便于离线部署
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+OUTPUT_DIR="${1:-$TEST_DIR/images-cache}"
+
+echo "=========================================="
+echo "  Docker 镜像保存脚本"
+echo "=========================================="
+echo ""
+echo "输出目录: $OUTPUT_DIR"
+echo ""
+
+# 创建输出目录
+mkdir -p "$OUTPUT_DIR"
+
+# 定义镜像名称（与 docker-compose.yml 保持一致）
+declare -A IMAGES=(
+    ["argus-metric-ftp:latest"]="argus-ftp.tar"
+    ["argus-metric-prometheus:latest"]="argus-prometheus.tar"
+    ["argus-metric-grafana:latest"]="argus-grafana.tar"
+    ["ubuntu:22.04"]="test-node.tar"
+)
+
+# 检查镜像是否存在并保存
+total=0
+success=0
+failed=0
+
+for image in "${!IMAGES[@]}"; do
+    total=$((total + 1))
+    output_file="${OUTPUT_DIR}/${IMAGES[$image]}"
+    
+    echo "[$total] 检查镜像: $image"
+    
+    if docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "^${image}$"; then
+        echo "    ✓ 镜像存在，开始保存..."
+        if docker save -o "$output_file" "$image"; then
+            file_size=$(ls -lh "$output_file" | awk '{print $5}')
+            echo "    ✓ 保存成功: ${IMAGES[$image]} ($file_size)"
+            success=$((success + 1))
+        else
+            echo "    ✗ 保存失败: $image"
+            failed=$((failed + 1))
+        fi
+    else
+        echo "    ✗ 镜像不存在，请先构建镜像"
+        failed=$((failed + 1))
+    fi
+    echo ""
+done
+
+echo "=========================================="
+echo "  保存完成"
+echo "=========================================="
+echo ""
+echo "统计："
+echo "  总计: $total"
+echo "  成功: $success"
+echo "  失败: $failed"
+echo ""
+echo "输出目录: $OUTPUT_DIR"
+echo ""
+
+if [ $success -gt 0 ]; then
+    echo "已保存的文件："
+    ls -lh "$OUTPUT_DIR"/*.tar 2>/dev/null || true
+    echo ""
+    echo "文件列表："
+    for image in "${!IMAGES[@]}"; do
+        output_file="${OUTPUT_DIR}/${IMAGES[$image]}"
+        if [ -f "$output_file" ]; then
+            file_size=$(ls -lh "$output_file" | awk '{print $5}')
+            echo "  - ${IMAGES[$image]} ($file_size)"
+        fi
+    done
+fi
+
+echo ""
+echo "使用说明："
+echo "1. 将 images-cache 目录复制到目标服务器的 ~/argus/src/metric/tests/ 下"
+echo "2. 在目标服务器运行: bash scripts/common/start-all.sh"
+echo ""
+
+if [ $failed -gt 0 ]; then
+    exit 1
+fi
+
--- a/src/metric/tests/stop-all.sh
+++ b/src/metric/tests/stop-all.sh
@ -1,51 +0,0 @@
-#!/bin/bash
-
-# 停止所有服务脚本
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR"
-
-# 检测 docker-compose 命令（兼容新旧版本）
-COMPOSE_FILE="$SCRIPT_DIR/docker-compose.yml"
-if command -v docker-compose &> /dev/null; then
-    DOCKER_COMPOSE="docker-compose -f $COMPOSE_FILE"
-elif docker compose version &> /dev/null 2>&1; then
-    DOCKER_COMPOSE="docker compose -f $COMPOSE_FILE"
-else
-    echo "错误: 未找到 docker-compose 或 docker compose 命令"
-    exit 1
-fi
-
-echo "=========================================="
-echo "  停止 Argus Metrics 服务"
-echo "=========================================="
-echo ""
-
-# 检查是否有运行的容器
-if [ "$($DOCKER_COMPOSE ps -q)" ]; then
-    echo "停止所有服务..."
-    $DOCKER_COMPOSE stop
-    
-    echo ""
-    read -p "是否要删除容器? (y/N): " -n 1 -r
-    echo
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-        $DOCKER_COMPOSE down
-        echo "容器已删除"
-        
-        read -p "是否要删除数据卷? (y/N): " -n 1 -r
-        echo
-        if [[ $REPLY =~ ^[Yy]$ ]]; then
-            $DOCKER_COMPOSE down -v
-            echo "数据卷已删除"
-        fi
-    fi
-else
-    echo "没有运行的服务"
-fi
-
-echo ""
-echo "完成！"
-
Author	SHA1	Message	Date
sundapeng.sdp	ca6c7b6781	fix: 修复 Dockerfile 中 chown 目录可能导致用户权限的问题； refs #20	2025-10-16 11:45:28 +08:00
sundapeng.sdp	edf7af30cb	feat: 新增测试节点，用于测试FTP安装包安装流程；修复写入 /etc/resolv.conf 顺序问题导致dns解析有误； refs #20	2025-10-14 17:24:35 +08:00
sundapeng.sdp	932038ab1d	fix: 修复docker-compose中配置路径不正确的问题； refs #20	2025-10-14 12:16:31 +08:00
sundapeng.sdp	e1b19c04b0	refactor: 优化argus-metric模块e2e测试； refs #20	2025-10-14 12:16:31 +08:00