From 0ab33b9a3f7dfcbffad3971142c8fbc49551a93d Mon Sep 17 00:00:00 2001 From: yuyr Date: Thu, 25 Sep 2025 07:03:57 +0000 Subject: [PATCH] =?UTF-8?q?[#2]=20agent=E7=AB=AF=E5=88=B0=E7=AB=AF?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BD=BF=E7=94=A8=E5=9F=9F=E5=90=8D=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agent/dist/argus-agent | Bin 8837064 -> 8837440 bytes src/agent/tests/docker-compose.yml | 26 +++++++++- src/agent/tests/scripts/01_bootstrap.sh | 19 +++++++ src/agent/tests/scripts/02_up.sh | 9 +++- .../06_restart_agent_and_reregister.sh | 21 ++++---- src/agent/tests/scripts/agent_entrypoint.sh | 49 ++++++++++++++++++ src/master/README.md | 6 +++ src/master/build/start-master.sh | 24 +++++++++ src/master/tests/docker-compose.yml | 1 + src/master/tests/scripts/01_up_master.sh | 13 +++++ .../scripts/02_verify_ready_and_nodes_json.sh | 9 ++++ 11 files changed, 164 insertions(+), 13 deletions(-) create mode 100755 src/agent/tests/scripts/agent_entrypoint.sh diff --git a/src/agent/dist/argus-agent b/src/agent/dist/argus-agent index 56920df2d64b3886783605dae48e89c7cc926d06..c5606967bd397d524eeb6201fea64f1786c6d20b 100755 GIT binary patch delta 2968 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 diff --git a/src/agent/tests/docker-compose.yml b/src/agent/tests/docker-compose.yml index 8386ac2..2cd4220 100644 --- a/src/agent/tests/docker-compose.yml +++ b/src/agent/tests/docker-compose.yml @@ -1,7 +1,19 @@ services: + bind: + image: ${BIND_IMAGE_TAG:-argus-bind9:e2e} + container_name: argus-bind-agent-e2e + volumes: + - ./private:/private + restart: unless-stopped + networks: + default: + ipv4_address: 172.28.0.2 + master: image: argus-master:dev container_name: argus-master-agent-e2e + depends_on: + - bind environment: - OFFLINE_THRESHOLD_SECONDS=6 - ONLINE_THRESHOLD_SECONDS=2 @@ -11,6 +23,10 @@ services: volumes: - ./private/argus/master:/private/argus/master - ./private/argus/metric/prometheus:/private/argus/metric/prometheus + - ./private/argus/etc:/private/argus/etc + networks: + default: + ipv4_address: 172.28.0.10 agent: image: ubuntu:24.04 @@ -18,15 +34,21 @@ services: hostname: dev-e2euser-e2einst-pod-0 depends_on: - master + - bind environment: - - MASTER_ENDPOINT=http://master:3000 + - MASTER_ENDPOINT=http://master.argus.com:3000 - REPORT_INTERVAL_SECONDS=2 volumes: - ./private/argus/agent/dev-e2euser-e2einst-pod-0:/private/argus/agent/dev-e2euser-e2einst-pod-0 - ./private/argus/agent/health/dev-e2euser-e2einst-pod-0:/private/argus/agent/health/dev-e2euser-e2einst-pod-0 + - ./private/argus/etc:/private/argus/etc - ../dist/argus-agent:/usr/local/bin/argus-agent:ro + - ./scripts/agent_entrypoint.sh:/usr/local/bin/agent-entrypoint.sh:ro entrypoint: - - /usr/local/bin/argus-agent + - /usr/local/bin/agent-entrypoint.sh + networks: + default: + ipv4_address: 172.28.0.20 networks: default: diff --git a/src/agent/tests/scripts/01_bootstrap.sh b/src/agent/tests/scripts/01_bootstrap.sh index 95ca096..41a19e1 100755 --- a/src/agent/tests/scripts/01_bootstrap.sh +++ b/src/agent/tests/scripts/01_bootstrap.sh @@ -5,6 +5,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" TEST_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" AGENT_ROOT="$(cd "$TEST_ROOT/.." && pwd)" MASTER_ROOT="$(cd "$AGENT_ROOT/../master" && pwd)" +REPO_ROOT="$(cd "$AGENT_ROOT/../.." && pwd)" PRIVATE_ROOT="$TEST_ROOT/private" TMP_ROOT="$TEST_ROOT/tmp" @@ -13,15 +14,27 @@ AGENT_CONFIG_DIR="$PRIVATE_ROOT/argus/agent/$AGENT_HOSTNAME" AGENT_HEALTH_DIR="$PRIVATE_ROOT/argus/agent/health/$AGENT_HOSTNAME" MASTER_PRIVATE_DIR="$PRIVATE_ROOT/argus/master" METRIC_PRIVATE_DIR="$PRIVATE_ROOT/argus/metric/prometheus" +DNS_DIR="$PRIVATE_ROOT/argus/etc" +BIND_IMAGE_TAG="${BIND_IMAGE_TAG:-argus-bind9:e2e}" +BIND_ROOT="$(cd "$MASTER_ROOT/../bind" && pwd)" mkdir -p "$AGENT_CONFIG_DIR" mkdir -p "$AGENT_HEALTH_DIR" mkdir -p "$MASTER_PRIVATE_DIR" mkdir -p "$METRIC_PRIVATE_DIR" mkdir -p "$TMP_ROOT" +mkdir -p "$DNS_DIR" touch "$AGENT_HEALTH_DIR/.keep" +# 中文提示：准备 bind 模块提供的 update-dns.sh，模拟生产下发 +if [[ -f "$BIND_ROOT/build/update-dns.sh" ]]; then + cp "$BIND_ROOT/build/update-dns.sh" "$DNS_DIR/update-dns.sh" + chmod +x "$DNS_DIR/update-dns.sh" +else + echo "[WARN] bind update script missing at $BIND_ROOT/build/update-dns.sh" +fi + pushd "$MASTER_ROOT" >/dev/null ./scripts/build_images.sh --tag argus-master:dev popd >/dev/null @@ -37,6 +50,12 @@ if [[ ! -x "$AGENT_BINARY" ]]; then exit 1 fi +# 中文提示：构建测试专用 bind9 镜像，确保解析服务可用 +pushd "$REPO_ROOT" >/dev/null +docker build -f src/bind/build/Dockerfile -t "$BIND_IMAGE_TAG" . +popd >/dev/null + echo "$AGENT_BINARY" > "$TMP_ROOT/agent_binary_path" +echo "$BIND_IMAGE_TAG" > "$TMP_ROOT/bind_image_tag" echo "[INFO] Agent E2E bootstrap complete" diff --git a/src/agent/tests/scripts/02_up.sh b/src/agent/tests/scripts/02_up.sh index f1a1234..fcb4b09 100755 --- a/src/agent/tests/scripts/02_up.sh +++ b/src/agent/tests/scripts/02_up.sh @@ -17,6 +17,11 @@ if [[ ! -x "$AGENT_BINARY" ]]; then exit 1 fi +BIND_IMAGE_TAG_VALUE="argus-bind9:e2e" +if [[ -f "$TMP_ROOT/bind_image_tag" ]]; then + BIND_IMAGE_TAG_VALUE="$(cat "$TMP_ROOT/bind_image_tag")" +fi + compose() { if docker compose version >/dev/null 2>&1; then docker compose "$@" @@ -25,13 +30,13 @@ compose() { fi } -docker container rm -f argus-agent-e2e >/dev/null 2>&1 || true +docker container rm -f argus-agent-e2e argus-master-agent-e2e argus-bind-agent-e2e >/dev/null 2>&1 || true docker network rm tests_default >/dev/null 2>&1 || true pushd "$TEST_ROOT" >/dev/null compose down --remove-orphans || true -compose up -d +BIND_IMAGE_TAG="$BIND_IMAGE_TAG_VALUE" compose up -d popd >/dev/null echo "[INFO] Master+Agent stack started" diff --git a/src/agent/tests/scripts/06_restart_agent_and_reregister.sh b/src/agent/tests/scripts/06_restart_agent_and_reregister.sh index 6a517b5..eb1ba18 100755 --- a/src/agent/tests/scripts/06_restart_agent_and_reregister.sh +++ b/src/agent/tests/scripts/06_restart_agent_and_reregister.sh @@ -9,6 +9,13 @@ NODE_ID="$(cat "$TMP_ROOT/node_id")" AGENT_HOSTNAME="dev-e2euser-e2einst-pod-0" NETWORK_NAME="tests_default" NEW_AGENT_IP="172.28.0.200" +ENTRYPOINT_SCRIPT="$SCRIPT_DIR/agent_entrypoint.sh" + +# 中文提示：重启场景也需要同样的入口脚本，确保 DNS 注册逻辑一致 +if [[ ! -f "$ENTRYPOINT_SCRIPT" ]]; then + echo "[ERROR] agent entrypoint script missing at $ENTRYPOINT_SCRIPT" >&2 + exit 1 +fi if [[ ! -f "$TMP_ROOT/agent_binary_path" ]]; then echo "[ERROR] Agent binary path missing; rerun bootstrap" >&2 @@ -68,21 +75,17 @@ if ! docker run -d \ --ip "$NEW_AGENT_IP" \ -v "$AGENT_DIR:/private/argus/agent/$AGENT_HOSTNAME" \ -v "$HEALTH_DIR:/private/argus/agent/health/$AGENT_HOSTNAME" \ + -v "$TEST_ROOT/private/argus/etc:/private/argus/etc" \ -v "$AGENT_BINARY:/usr/local/bin/argus-agent:ro" \ - -e MASTER_ENDPOINT=http://master:3000 \ + -v "$ENTRYPOINT_SCRIPT:/usr/local/bin/agent-entrypoint.sh:ro" \ + -e MASTER_ENDPOINT=http://master.argus.com:3000 \ -e REPORT_INTERVAL_SECONDS=2 \ - ubuntu:24.04 \ - sleep 300 >/dev/null; then + --entrypoint /usr/local/bin/agent-entrypoint.sh \ + ubuntu:24.04 >/dev/null; then echo "[ERROR] Failed to start agent container with custom IP" >&2 exit 1 fi -# 在容器内启动真实 agent 进程 -if ! docker exec -d argus-agent-e2e /usr/local/bin/argus-agent; then - echo "[ERROR] Failed to spawn agent process inside container" >&2 - exit 1 -fi - success=false detail_file="$TMP_ROOT/post_restart.json" for _ in {1..20}; do diff --git a/src/agent/tests/scripts/agent_entrypoint.sh b/src/agent/tests/scripts/agent_entrypoint.sh new file mode 100755 index 0000000..8536da1 --- /dev/null +++ b/src/agent/tests/scripts/agent_entrypoint.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash +set -euo pipefail + +LOG_PREFIX="[AGENT-ENTRYPOINT]" +DNS_SCRIPT="/private/argus/etc/update-dns.sh" +DNS_CONF="/private/argus/etc/dns.conf" +TARGET_DOMAIN="master.argus.com" + +log() { + echo "${LOG_PREFIX} $*" +} + +# 中文提示：等待 bind 下发的 update-dns.sh 脚本 +for _ in {1..30}; do + if [[ -x "$DNS_SCRIPT" ]]; then + break + fi + log "等待 update-dns.sh 准备就绪..." + sleep 1 +done + +if [[ -x "$DNS_SCRIPT" ]]; then + log "执行 update-dns.sh 更新容器 DNS" + if ! "$DNS_SCRIPT"; then + log "update-dns.sh 执行失败，继续尝试默认 DNS" + fi +else + log "未获取到 update-dns.sh，使用镜像默认 DNS" +fi + +# 中文提示：记录当前 dns.conf 内容，便于排查 +if [[ -f "$DNS_CONF" ]]; then + log "dns.conf 内容: $(tr '\n' ' ' < "$DNS_CONF")" +else + log "dns.conf 暂未生成" +fi + +# 中文提示：尝试解析 master 域名，失败不阻塞但会打日志 +for _ in {1..30}; do + if getent hosts "$TARGET_DOMAIN" >/dev/null 2>&1; then + MASTER_IP=$(getent hosts "$TARGET_DOMAIN" | awk '{print $1}' | head -n 1) + log "master.argus.com 解析成功: $MASTER_IP" + break + fi + sleep 1 +done + +log "启动 argus-agent" +exec /usr/local/bin/argus-agent diff --git a/src/master/README.md b/src/master/README.md index e10f08d..316f324 100644 --- a/src/master/README.md +++ b/src/master/README.md @@ -60,6 +60,12 @@ cd src/master/tests 镜像构建阶段会安装 `supervisor`/`net-tools`/`inetutils-ping`/`vim` 等基础工具，并在运行前把 apt 源切换到内网镜像，方便容器内进一步运维。 +## 域名注册与 DNS 联动 + +- Master 容器启动时会主动执行 `/private/argus/etc/update-dns.sh`（若存在），把自身 `/etc/resolv.conf` 指向 bind 服务提供的 DNS；随后解析 `eth0` 的 IPv4 地址并写入 `/private/argus/etc/master.argus.com`。该文件会被 bind 模块的 `argus_dns_sync.sh` 监控，用于生成 `master.argus.com` → 当前容器 IP 的 A 记录。 +- 测试与生产都需要将 bind 下发的 `update-dns.sh`、`dns.conf` 等文件挂载到 `/private/argus/etc/`。在 E2E 场景中，`tests/private/argus/etc` 会由脚本自动准备。 +- 其他模块（如 agent）在启动脚本中只需执行同一份 `update-dns.sh`，即可使用域名访问 master；若域名注册异常，agent 将无法成功上报，可据此快速定位问题。 + ## REST API 详解 基础路径：`/api/v1/master`，全部返回 JSON。 diff --git a/src/master/build/start-master.sh b/src/master/build/start-master.sh index 97a2e15..ec57f3d 100755 --- a/src/master/build/start-master.sh +++ b/src/master/build/start-master.sh @@ -1,6 +1,30 @@ #!/usr/bin/env bash set -euo pipefail +# 中文提示：确保共享目录与 DNS 相关脚本存在 +DNS_DIR="/private/argus/etc" +DNS_SCRIPT="${DNS_DIR}/update-dns.sh" +MASTER_DOMAIN_FILE="${DNS_DIR}/master.argus.com" + +mkdir -p "$DNS_DIR" + +if [[ -x "$DNS_SCRIPT" ]]; then + echo "[INFO] Running update-dns.sh before master starts" + # 中文提示：若脚本存在则执行，保证容器使用 bind 作为 DNS + "$DNS_SCRIPT" || echo "[WARN] update-dns.sh execution failed" +else + echo "[WARN] DNS update script not found or not executable: $DNS_SCRIPT" +fi + +# 中文提示：记录 master 当前 IP，供 bind 服务同步 +MASTER_IP=$(ifconfig | grep -A 1 eth0 | grep inet | awk '{print $2}' || true) +if [[ -n "${MASTER_IP}" ]]; then + echo "current IP: ${MASTER_IP}" + echo "${MASTER_IP}" > "$MASTER_DOMAIN_FILE" +else + echo "[WARN] Failed to detect master IP via ifconfig" +fi + WORKERS=${GUNICORN_WORKERS:-4} BIND_ADDR=${GUNICORN_BIND:-0.0.0.0:3000} EXTRA_OPTS=${GUNICORN_EXTRA_ARGS:-} diff --git a/src/master/tests/docker-compose.yml b/src/master/tests/docker-compose.yml index 8c24661..7aaecf9 100644 --- a/src/master/tests/docker-compose.yml +++ b/src/master/tests/docker-compose.yml @@ -11,6 +11,7 @@ services: volumes: - ./private/argus/master:/private/argus/master - ./private/argus/metric/prometheus:/private/argus/metric/prometheus + - ./private/argus/etc:/private/argus/etc restart: unless-stopped networks: diff --git a/src/master/tests/scripts/01_up_master.sh b/src/master/tests/scripts/01_up_master.sh index 10f6dc2..c66698a 100755 --- a/src/master/tests/scripts/01_up_master.sh +++ b/src/master/tests/scripts/01_up_master.sh @@ -6,10 +6,14 @@ TEST_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" MODULE_ROOT="$(cd "$TEST_ROOT/.." && pwd)" PRIVATE_ROOT="$TEST_ROOT/private" TMP_ROOT="$TEST_ROOT/tmp" +DNS_ROOT="$PRIVATE_ROOT/argus/etc" +BIND_UPDATE_SCRIPT_SRC="$(cd "$MODULE_ROOT/../bind" && pwd)/build/update-dns.sh" +BIND_UPDATE_SCRIPT_DEST="$DNS_ROOT/update-dns.sh" mkdir -p "$PRIVATE_ROOT/argus/master" mkdir -p "$PRIVATE_ROOT/argus/metric/prometheus" mkdir -p "$TMP_ROOT" +mkdir -p "$DNS_ROOT" # 确保上一次运行留下的容器/数据被清理 compose() { @@ -28,6 +32,15 @@ rm -rf "$TMP_ROOT" "$PRIVATE_ROOT" mkdir -p "$PRIVATE_ROOT/argus/master" mkdir -p "$PRIVATE_ROOT/argus/metric/prometheus" mkdir -p "$TMP_ROOT" +mkdir -p "$DNS_ROOT" + +# 中文提示：将 bind 模块自带的 update-dns.sh 下发到共享目录，模拟实际环境 +if [[ -f "$BIND_UPDATE_SCRIPT_SRC" ]]; then + cp "$BIND_UPDATE_SCRIPT_SRC" "$BIND_UPDATE_SCRIPT_DEST" + chmod +x "$BIND_UPDATE_SCRIPT_DEST" +else + echo "[WARN] bind update script missing at $BIND_UPDATE_SCRIPT_SRC" +fi pushd "$TEST_ROOT" >/dev/null compose down --remove-orphans || true diff --git a/src/master/tests/scripts/02_verify_ready_and_nodes_json.sh b/src/master/tests/scripts/02_verify_ready_and_nodes_json.sh index 1fa59df..65142dc 100755 --- a/src/master/tests/scripts/02_verify_ready_and_nodes_json.sh +++ b/src/master/tests/scripts/02_verify_ready_and_nodes_json.sh @@ -6,6 +6,7 @@ TEST_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" PRIVATE_ROOT="$TEST_ROOT/private" API_BASE="http://localhost:31300" NODES_JSON_PATH="$PRIVATE_ROOT/argus/metric/prometheus/nodes.json" +MASTER_DOMAIN_FILE="$PRIVATE_ROOT/argus/etc/master.argus.com" # 等待 readyz 返回 200，确保数据库初始化完成 for _ in {1..30}; do @@ -49,3 +50,11 @@ then fi echo "[INFO] nodes.json 初始状态校验通过" + +# 中文提示：输出 master 写入的域名文件，失败不影响测试 +if [[ -f "$MASTER_DOMAIN_FILE" ]]; then + MASTER_IP=$(<"$MASTER_DOMAIN_FILE") + echo "[INFO] master.argus.com 记录: $MASTER_IP" +else + echo "[WARN] 未找到 master.argus.com 记录文件，目录=$MASTER_DOMAIN_FILE" +fi