42 changed files with 253 additions and 371 deletions
--- a/src/alert/README.md
+++ b/src/alert/README.md
@ -1,31 +1,13 @@
 # Alertmanager

-## 构建
-1. 首先设置构建和部署的环境变量, 在项目根目录下执行：
-```bash
-cp src/alert/tests/.env.example src/alert/tests/.env
-```
-
-然后找到复制出来的.env文件，修改环境变量。
-
-2. 使用脚本构建，在项目根目录下执行：
+## 启动示例

 ```bash
-bash src/alert/alertmanager/build/build.sh
-```
-
-构建成功后，会在项目根目录下生成argus-alertmanager-latest.tar
-
-## 部署
-
-提供docker-compose部署。在src/alert/tests目录下
-```bash
-docker-compose up -d
+docker run -d --name alertmanager \
+  -p 9093:9093 \
+  -v /opt/alertmanager/data:/alertmanager \
+  argus-alert:latest
 ```

 ## 动态配置
-配置文件放在`/private/argus/alert/alertmanager/alertmanager.yml`下，修改alertmanager.yml后，调用`http://alertmanager.alert.argus.com:9093/-/reload`接口(POST)可以重新加载配置.
-
-```bash
-curl -X POST http://localhost:9093/-/reload
-```
+修改alertmanager.yml后，调用`/-/reload`接口可以重新加载配置
--- a/src/alert/alertmanager/build/Dockerfile
+++ b/src/alert/alertmanager/build/Dockerfile
@ -19,11 +19,8 @@ RUN wget https://github.com/prometheus/alertmanager/releases/download/v${ALERTMA
    rm alertmanager-${ALERTMANAGER_VERSION}.linux-amd64.tar.gz

 ENV ALERTMANAGER_BASE_PATH=/private/argus/alert/alertmanager
-
-ARG ARGUS_UID=2133
-ARG ARGUS_GID=2015
-ENV ARGUS_UID=${ARGUS_UID}
-ENV ARGUS_GID=${ARGUS_GID}
+ENV ARGUS_UID=2133
+ENV ARGUS_GID=2015

 RUN mkdir -p /usr/share/alertmanager && \
    mkdir -p ${ALERTMANAGER_BASE_PATH} && \
--- a/src/alert/alertmanager/build/build.sh
+++ b/src/alert/alertmanager/build/build.sh
@ -1,13 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-docker pull ubuntu:24.04
-
-source src/alert/tests/.env
-
-docker build \
-  --build-arg ARGUS_UID=${ARGUS_UID} \
-  --build-arg ARGUS_GID=${ARGUS_GID} \
-  -f src/alert/alertmanager/build/Dockerfile \
-  -t argus-alertmanager:latest .
-
-docker save -o argus-alertmanager-latest.tar argus-alertmanager:latest
--- a/src/alert/alertmanager/build/start-am-supervised.sh
+++ b/src/alert/alertmanager/build/start-am-supervised.sh
@ -18,7 +18,6 @@ DOMAIN=alertmanager.alert.argus.com
 IP=$(ifconfig | grep -A 1 eth0 | grep inet | awk '{print $2}')
 echo "current IP: ${IP}"
 echo "${IP}" > /private/argus/etc/${DOMAIN}
-chmod 755 /private/argus/etc/${DOMAIN}


 echo "[INFO] Starting Alertmanager process..."
--- a/src/alert/alertmanager/config/rule_files/README.md
+++ b/src/alert/alertmanager/config/rule_files/README.md
@ -55,6 +55,6 @@ alerting:
  alertmanagers:
    - static_configs:
        - targets:
-            - "alertmanager.alert.argus.com:9093"   # Alertmanager 地址
+            - "localhost:9093"   # Alertmanager 地址

 ```
--- a/src/alert/tests/.env
+++ b/src/alert/tests/.env
@ -1,5 +0,0 @@
-DATA_ROOT=/home/argus/tmp/private/argus
-ARGUS_UID=1048
-ARGUS_GID=1048
-
-USE_INTRANET=false
--- a/src/alert/tests/.env.example
+++ b/src/alert/tests/.env.example
@ -1,5 +0,0 @@
-DATA_ROOT=/home/argus/tmp/private/argus
-ARGUS_UID=1048
-ARGUS_GID=1048
-
-USE_INTRANET=false
--- a/src/alert/tests/data/alertmanager/alertmanager.yml
+++ b/src/alert/tests/data/alertmanager/alertmanager.yml
@ -0,0 +1,19 @@
+global:
+  resolve_timeout: 5m
+
+route:
+  group_by: ['alertname', 'instance']   # 分组：相同 alertname + instance 的告警合并
+  group_wait: 30s        # 第一个告警后，等 30s 看是否有同组告警一起发
+  group_interval: 5m     # 同组告警变化后，至少 5 分钟再发一次
+  repeat_interval: 3h    # 相同告警，3 小时重复提醒一次
+  receiver: 'null'
+
+receivers:
+  - name: 'null'
+
+inhibit_rules:
+  - source_match:
+      severity: 'critical'     # critical 告警存在时
+    target_match:
+      severity: 'warning'      # 抑制相同 instance 的 warning 告警
+    equal: ['instance']
--- a/src/alert/tests/data/alertmanager/nflog
+++ b/src/alert/tests/data/alertmanager/nflog
--- a/src/alert/tests/data/alertmanager/silences
+++ b/src/alert/tests/data/alertmanager/silences
--- a/src/alert/tests/data/etc/alertmanager.alert.argus.com
+++ b/src/alert/tests/data/etc/alertmanager.alert.argus.com
@ -0,0 +1 @@
+172.18.0.2
--- a/src/alert/tests/docker-compose.yml
+++ b/src/alert/tests/docker-compose.yml
@ -1,3 +1,4 @@
+version: '3.8'
 services:
  alertmanager:
    build:
@ -16,21 +17,20 @@ services:
    ports:
      - "${ARGUS_PORT:-9093}:9093"
    volumes:
-      - ${DATA_ROOT:-./data}/alert/alertmanager:/private/argus/alert/alertmanager
+      - ${DATA_ROOT:-./data}/alertmanager:/private/argus/alert/alertmanager
      - ${DATA_ROOT:-./data}/etc:/private/argus/etc
    networks:
-      - argus-debug-net
+      - argus-network
    restart: unless-stopped
    logging:
      driver: "json-file"
      options:
        max-size: "10m"
        max-file: "3"
-
 networks:
-  argus-debug-net:
+  argus-network:
    driver: bridge
-    name: argus-debug-net
+    name: argus-network

 volumes:
  alertmanager_data:
--- a/src/web/README.md
+++ b/src/web/README.md
@ -1,34 +1,12 @@
 # Argus-web

-前端页面架构：React + Vite + Mantine
+架构：React + Vite + Mantine

-该模块分为两个部分，argus-web-frontend和argus-web-proxy。其中argus-web-frontend负责前端页面展示，argus-web-proxy负责反向代理，实现对其他网站的反向代理功能

-## 构建
-在构建前需要设置构建和部署的环境变量。根目录下运行：
-```bash
-cp src/web/tests/.env.example src/web/tests/.env
-```
-修改.env的内容。
-
-### argus-web-frontend
+## 打包部署
 根目录下运行
 ```bash
 bash src/web/buld_tools/frontend/build.sh
 ```
-构建成功后，会在根目录下有一个打包好的tar包argus-web-frontend-latest.tar。

-### argus-web-proxy
-根目录下运行
-```bash
-bash src/web/build_tools/proxy/build.sh
-```
-构建成功后，会在根目录下有一个打包好的tar包argus-web-proxy-latest.tar。

-## 部署
-
-提供docker-compose部署。在src/web/tests目录下
-```bash
-docker-compose up -d
-```
-会同时启动argus-web-frontend和argus-web-proxy两个容器服务。
--- a/src/web/build_tools/frontend/Dockerfile
+++ b/src/web/build_tools/frontend/Dockerfile
@ -24,10 +24,8 @@ RUN apt-get update && \
    apt-get clean && rm -rf /var/lib/apt/lists/*

 ENV FRONTEND_BASE_PATH=/private/argus/web/frontend
-ARG ARGUS_UID=2133
-ARG ARGUS_GID=2015
-ENV ARGUS_UID=${ARGUS_UID}
-ENV ARGUS_GID=${ARGUS_GID}
+ENV ARGUS_UID=2133
+ENV ARGUS_GID=2015

 RUN mkdir -p ${FRONTEND_BASE_PATH} && \
    mkdir -p /private/argus/etc
@ -84,7 +82,7 @@ COPY src/web/build_tools/frontend/health-check.sh /usr/local/bin/health-check.sh
 RUN chmod +x /usr/local/bin/health-check.sh

 # 暴露端口
-EXPOSE 8080
+EXPOSE 80

 # 保持 root 用户，由 supervisor 控制 user 切换
 USER root
--- a/src/web/build_tools/frontend/build.sh
+++ b/src/web/build_tools/frontend/build.sh
@ -1,10 +1,4 @@
 docker pull node:20
 docker pull ubuntu:24.04
-
-source src/web/tests/.env
-
-docker build \
-  --build-arg ARGUS_UID=${ARGUS_UID} \
-  --build-arg ARGUS_GID=${ARGUS_GID} \
-  -f src/web/build_tools/frontend/Dockerfile -t argus-web-frontend:latest .
-docker save -o argus-web-frontend-latest.tar argus-web-frontend:latest
+docker build -f src/web/build_tools/frontend/Dockerfile -t argus-web:0.1.1 .
+rm -f argus-web-0.1.1.tar && sudo docker image save argus-web:0.1.1 > argus-web-0.1.1.tar
--- a/src/web/build_tools/frontend/health-check.sh
+++ b/src/web/build_tools/frontend/health-check.sh
@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail

-URL="http://127.0.0.1:8080"
+URL="http://127.0.0.1:80"

 echo "[INFO] Starting Argus web health check loop for $URL..."

--- a/src/web/build_tools/frontend/nginx.conf
+++ b/src/web/build_tools/frontend/nginx.conf
@ -12,7 +12,7 @@ http {

    # React 前端服务
    server {
-        listen 8080;
+        listen 80;
        server_name web.argus.com;

        root /usr/share/nginx/html;
@ -24,4 +24,33 @@ http {
        }
    }

+
+    # Master 服务，需要增加 CORS 支持
+    server {
+    listen 80;
+    server_name master.argus.com;
+
+    location / {
+        proxy_pass http://master.argus.com;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        # CORS 支持
+        add_header 'Access-Control-Allow-Origin' 'http://web.argus.com' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always;
+
+        if ($request_method = OPTIONS) {
+            add_header 'Access-Control-Allow-Origin' 'http://web.argus.com' always;
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+            add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always;
+            add_header 'Content-Length' 0;
+            add_header 'Content-Type' 'text/plain';
+            return 204;
+        }
+    }
+}
+
 }
--- a/src/web/build_tools/frontend/start-web-supervised.sh
+++ b/src/web/build_tools/frontend/start-web-supervised.sh
@ -8,12 +8,21 @@ DNS_SCRIPT="${DNS_DIR}/update-dns.sh"
 DOMAIN=web.argus.com
 WEB_DOMAIN_FILE="${DNS_DIR}/${DOMAIN}"
 RUNTIME_USER="${ARGUS_RUNTIME_USER:-argus}"
-RUNTIME_UID="${ARGUS_UID:-2133}"
-RUNTIME_GID="${ARGUS_GID:-2015}"
+RUNTIME_UID="${ARGUS_BUILD_UID:-2133}"
+RUNTIME_GID="${ARGUS_BUILD_GID:-2015}"

 mkdir -p "$DNS_DIR"
 chown -R "$RUNTIME_UID:$RUNTIME_GID" "$DNS_DIR" 2>/dev/null || true

+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
+
+
 # 记录容器 IP
 IP=$(ifconfig | grep -A 1 eth0 | grep inet | awk '{print $2}' || true)
 if [[ -n "${IP}" ]]; then
@ -23,7 +32,6 @@ if [[ -n "${IP}" ]]; then
 else
  echo "[WARN] Failed to detect web IP via ifconfig"
 fi
-chmod 755 "$WEB_DOMAIN_FILE"

 echo "[INFO] Launching nginx..."

--- a/src/web/build_tools/proxy/Dockerfile
+++ b/src/web/build_tools/proxy/Dockerfile
@ -8,10 +8,8 @@ RUN apt-get update && \
    apt-get clean && rm -rf /var/lib/apt/lists/*

 ENV FRONTEND_BASE_PATH=/private/argus/web/proxy
-ARG ARGUS_UID=2133
-ARG ARGUS_GID=2015
-ENV ARGUS_UID=${ARGUS_UID}
-ENV ARGUS_GID=${ARGUS_GID}
+ENV ARGUS_UID=2133
+ENV ARGUS_GID=2015

 RUN mkdir -p ${FRONTEND_BASE_PATH} && \
    mkdir -p /private/argus/etc
--- a/src/web/build_tools/proxy/build.sh
+++ b/src/web/build_tools/proxy/build.sh
@ -1,9 +0,0 @@
-docker pull ubuntu:24.04
-
-source src/web/tests/.env
-
-docker build \
-    --build-arg ARGUS_UID=${ARGUS_UID} \
-    --build-arg ARGUS_GID=${ARGUS_GID} \
-    -f src/web/build_tools/proxy/Dockerfile -t argus-web-proxy:latest .
-docker save -o argus-web-proxy-latest.tar argus-web-proxy:latest
--- a/src/web/build_tools/proxy/conf.d/alert.conf
+++ b/src/web/build_tools/proxy/conf.d/alert.conf
@ -3,7 +3,6 @@ server {
    server_name alertmanager.alert.argus.com;

    location / {
-        set $alert_backend http://alertmanager.alert.argus.com:9093;
-        proxy_pass $alert_backend;
+        proxy_pass http://alertmanager.alert.argus.com:9093;
    }
 }
--- a/src/web/build_tools/proxy/conf.d/log.conf
+++ b/src/web/build_tools/proxy/conf.d/log.conf
@ -4,8 +4,7 @@ server {
    server_name es.log.argus.com;

    location / {
-        set $es_backend http://es.log.argus.com:9200;
-        proxy_pass $es_backend;
+        proxy_pass http://es.log.argus.com;
    }
 }

@ -15,7 +14,6 @@ server {
    server_name kibana.log.argus.com;

    location / {
-        set $kibana_backend http://kibana.log.argus.com:5601;
-        proxy_pass $kibana_backend;
+        proxy_pass http://kibana.log.argus.com;
    }
 }
--- a/src/web/build_tools/proxy/conf.d/master.conf
+++ b/src/web/build_tools/proxy/conf.d/master.conf
@ -3,25 +3,25 @@ server {
    server_name master.argus.com;

    location / {
-        set $master_backend http://master.argus.com:3000;
-        proxy_pass $master_backend;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        # proxy_pass http://master.argus.com;
+        proxy_pass http://master.argus.com;
+        # proxy_set_header Host $host;
+        # proxy_set_header X-Real-IP $remote_addr;
+        # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        # proxy_set_header X-Forwarded-Proto $scheme;

-        # CORS 支持
-        add_header 'Access-Control-Allow-Origin' 'http://web.argus.com' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always;
+        # # CORS 支持
+        # add_header 'Access-Control-Allow-Origin' 'http://web.argus.com' always;
+        # add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+        # add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always;

-        if ($request_method = OPTIONS) {
-            add_header 'Access-Control-Allow-Origin' 'http://web.argus.com' always;
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-            add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always;
-            add_header 'Content-Length' 0;
-            add_header 'Content-Type' 'text/plain';
-            return 204;
-        }
+        # if ($request_method = OPTIONS) {
+        #     add_header 'Access-Control-Allow-Origin' 'http://web.argus.com' always;
+        #     add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
+        #     add_header 'Access-Control-Allow-Headers' 'Origin, Content-Type, Accept, Authorization' always;
+        #     add_header 'Content-Length' 0;
+        #     add_header 'Content-Type' 'text/plain';
+        #     return 204;
+        # }
    }
 }
--- a/src/web/build_tools/proxy/conf.d/metric.conf
+++ b/src/web/build_tools/proxy/conf.d/metric.conf
@ -4,18 +4,16 @@ server {
    server_name prometheus.metric.argus.com;

    location / {
-        set $prom_backend http://prom.metric.argus.com:9090;
-        proxy_pass $prom_backend;
+        proxy_pass http://prom.metric.argus.com;
    }
 }

-# Grafana
-server {
-    listen 80;
-    server_name grafana.metric.argus.com;
+# # Grafana
+# server {
+#     listen 80;
+#     server_name grafana.metric.argus.com;

-    location / {
-        set $grafana_backend http://grafana.metric.argus.com:3000;
-        proxy_pass $grafana_backend;
-    }
-}
+#     location / {
+#         proxy_pass http://grafana.metric.argus.com;
+#     }
+# }
--- a/src/web/build_tools/proxy/conf.d/web.conf
+++ b/src/web/build_tools/proxy/conf.d/web.conf
@ -3,7 +3,6 @@ server {
    server_name web.argus.com;

    location / {
-        set $web_backend http://web.argus.com:8080;
-        proxy_pass $web_backend;
+        proxy_pass http://web.argus.com:80;
    }
 }
--- a/src/web/build_tools/proxy/nginx.conf.template
+++ b/src/web/build_tools/proxy/nginx.conf.template
@ -5,6 +5,14 @@ events {
    worker_connections  1024;
 }

+server {
+    listen 80 default_server;
+    server_name _;
+
+    location / {
+        proxy_pass http://web.argus.com:80;
+    }
+}

 http {
    include       mime.types;
@ -24,16 +32,5 @@ http {
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
    proxy_set_header X-Forwarded-Proto $scheme;

-    server {
-        listen 80 default_server;
-        server_name _;
-
-        location / {
-            set $web_backend http://web.argus.com:8080;
-            proxy_pass $web_backend;
-        }
-    }
-
-
    include /etc/nginx/conf.d/*.conf;
 }
--- a/src/web/build_tools/proxy/start-proxy-supervised.sh
+++ b/src/web/build_tools/proxy/start-proxy-supervised.sh
@ -9,8 +9,8 @@ DNS_CONF_PRIVATE="/private/argus/etc/dns.conf"
 DNS_CONF_SYSTEM="/etc/resolv.conf"
 DNS_DIR="/private/argus/etc"
 DNS_SCRIPT="${DNS_DIR}/update-dns.sh"
-RUNTIME_UID="${ARGUS_UID:-2133}"
-RUNTIME_GID="${ARGUS_GID:-2015}"
+RUNTIME_UID="${ARGUS_BUILD_UID:-2133}"
+RUNTIME_GID="${ARGUS_BUILD_GID:-2015}"

 mkdir -p "$DNS_DIR"
 chown -R "$RUNTIME_UID:$RUNTIME_GID" "$DNS_DIR" 2>/dev/null || true
--- a/src/web/src/components/AlertFilters.jsx
+++ b/src/web/src/components/AlertFilters.jsx
@ -8,10 +8,10 @@ export function AlertFilters({ filters, setFilters, nodeOptions }) {
        value={filters.severity}
        onChange={(value) => setFilters((f) => ({ ...f, severity: value }))}
        data={[
-          { value: "all", label: "all" },
-          { value: "critical", label: "critical" },
-          { value: "warning", label: "warning" },
-          { value: "info", label: "info" },
+          { value: "all", label: "全部" },
+          { value: "critical", label: "严重" },
+          { value: "warning", label: "警告" },
+          { value: "info", label: "信息" },
        ]}
        w={150}
      />
@ -20,7 +20,7 @@ export function AlertFilters({ filters, setFilters, nodeOptions }) {
        value={filters.state}
        onChange={(value) => setFilters((f) => ({ ...f, state: value }))}
        data={[
-          { value: "all", label: "all" },
+          { value: "all", label: "全部" },
          { value: "active", label: "Active" },
          { value: "resolved", label: "Resolved" },
        ]}
--- a/src/web/src/components/AlertTable.jsx
+++ b/src/web/src/components/AlertTable.jsx
@ -1,6 +1,5 @@
-import { Table, Group, ActionIcon, Button, Code } from "@mantine/core";
-import { IconChevronUp, IconChevronDown, IconInfoCircle } from "@tabler/icons-react";
-import { useState } from "react";
+import { Table, Group, ActionIcon, Button } from "@mantine/core";
+import { IconChevronUp, IconChevronDown } from "@tabler/icons-react";

 export function AlertTable({
  alerts,
@ -17,11 +16,6 @@ export function AlertTable({
  formatRelativeTime,
 }) {
  const totalPages = Math.ceil(sortedAlerts.length / pageSize);
-  const [expandedRow, setExpandedRow] = useState(null);
-
-  const toggleExpand = (index) => {
-    setExpandedRow(expandedRow === index ? null : index);
-  };

  return (
    <>
@ -53,13 +47,10 @@ export function AlertTable({
                </Group>
              </Table.Th>
            ))}
-            <Table.Th>更多信息</Table.Th>
          </Table.Tr>
        </Table.Thead>
-
        <Table.Tbody>
          {paginatedAlerts.map((alert, i) => (
-            <>
            <Table.Tr key={i} style={{ backgroundColor: getRowColor(alert) }}>
              <Table.Td>{alert.labels?.alertname || "-"}</Table.Td>
              <Table.Td>{alert.labels?.instance || "-"}</Table.Td>
@ -73,32 +64,7 @@ export function AlertTable({
              </Table.Td>
              <Table.Td title={alert.updatedAt || "-"}>{formatRelativeTime(alert.updatedAt)}</Table.Td>
              <Table.Td>{alert.annotations?.summary || "-"}</Table.Td>
-                <Table.Td>
-                  <ActionIcon
-                    onClick={() => toggleExpand(i)}
-                    variant="subtle"
-                    color="blue"
-                    title="显示/隐藏更多信息"
-                  >
-                    <IconInfoCircle size={18} />
-                  </ActionIcon>
-                </Table.Td>
            </Table.Tr>
-
-              {expandedRow === i && (
-                <Table.Tr key={`details-${i}`} style={{ backgroundColor: "#f9fafb" }}>
-                  <Table.Td colSpan={9}>
-                    <div style={{ fontSize: "0.85rem", lineHeight: 1.5 }}>
-                      {Object.entries(alert.labels || {}).map(([k, v]) => (
-                        <div key={k}>
-                          <Code color="blue">{k}</Code> ：{v}
-                        </div>
-                      ))}
-                    </div>
-                  </Table.Td>
-                </Table.Tr>
-              )}
-            </>
          ))}
        </Table.Tbody>
      </Table>
--- a/src/web/src/components/NodeDetailDrawer.jsx
+++ b/src/web/src/components/NodeDetailDrawer.jsx
@ -102,6 +102,11 @@ export default function NodeDetailDrawer({ opened, nodeId, onClose }) {
          {/* 滚动内容 */}
          <ScrollArea style={{ flex: 1 }}>
            <Stack spacing="md">
+              {/* 配置信息 */}
+              <NodeConfigCard nodeId={node.id} config={node.config || {}} onSaved={() => fetchNodeDetail(node.id)} />
+
+              {/* 标签信息 */}
+              <NodeLabelCard nodeId={node.id} labels={Array.isArray(node.label) ? node.label : []} onSaved={() => fetchNodeDetail(node.id)} />

              {/* 元数据 */}
              <NodeMetaCard node={node} />
@ -109,12 +114,6 @@ export default function NodeDetailDrawer({ opened, nodeId, onClose }) {
              {/* 健康信息 */}
              <NodeHealthCard node={node} />

-              {/* 配置信息 */}
-              <NodeConfigCard nodeId={node.id} config={node.config || {}} onSaved={() => fetchNodeDetail(node.id)} />
-
-              {/* 标签信息 */}
-              <NodeLabelCard nodeId={node.id} labels={Array.isArray(node.label) ? node.label : []} onSaved={() => fetchNodeDetail(node.id)} />
-
              {/* 其他基础信息展示 */}
              <Stack spacing="xs">
                <Text fw={500}>注册时间: <Text span c="dimmed">{new Date(node.register_time).toLocaleString()}</Text></Text>
--- a/src/web/src/components/NodeHealthCard.jsx
+++ b/src/web/src/components/NodeHealthCard.jsx
@ -2,8 +2,10 @@ import { useState } from "react";
 import { Card, Text, Stack, Group, ActionIcon, Badge, Popover } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";

-// 子组件：单条健康信息
-function HealthItem({ moduleName, data }) {
+export default function NodeHealthCard({ node }) {
+  const health = node.health || {};
+
+  const renderHealthItem = (moduleName, data) => {
    const status = data?.status || "unknown";
    const color = status === "healthy" ? "green" : status === "unhealthy" ? "red" : "gray";
    const [opened, setOpened] = useState(false);
@ -21,12 +23,7 @@ function HealthItem({ moduleName, data }) {
            shadow="sm"
          >
            <Popover.Target>
-            <ActionIcon
-              size="xs"
-              color="blue"
-              variant="light"
-              onClick={() => setOpened((o) => !o)}
-            >
+              <ActionIcon size="xs" color="blue" variant="light" onClick={() => setOpened((o) => !o)}>
                <IconInfoCircle size={14} />
              </ActionIcon>
            </Popover.Target>
@ -44,19 +41,15 @@ function HealthItem({ moduleName, data }) {
        )}
      </Group>
    );
-}
-
-// 主组件：健康信息卡片
-export default function NodeHealthCard({ node }) {
-  const health = node.health || {};
+  };

  return (
    <Card shadow="xs" radius="md" withBorder>
      <Text fw={600} mb="sm">健康信息</Text>
      <Stack spacing="xs">
-        {Object.entries(health).map(([moduleName, data]) => (
-          <HealthItem key={moduleName} moduleName={moduleName} data={data} />
-        ))}
+        {Object.entries(health).map(([moduleName, data]) =>
+          renderHealthItem(moduleName, data)
+        )}
      </Stack>
    </Card>
  );
--- a/src/web/src/components/NodeTable.jsx
+++ b/src/web/src/components/NodeTable.jsx
@ -4,7 +4,7 @@ import { Link } from "react-router-dom";
 import NodeStatus from "./NodeStatus";
 import PaginationControl from "./PaginationControl";
 import { apiRequest } from "../config/request";
-import { MASTER_API, EXTERNAL_HOST } from "../config/api";
+import { MASTER_API } from "../config/api";

 export function NodeTable({
    withSearch = false,
@ -56,8 +56,6 @@ export function NodeTable({
            <Table.Td>{node.version}</Table.Td>
            {withActions && (
                <Table.Td>
-                    <Group spacing="xs">
-                        {/* 查看详情 */}
                    <Button
                        size="xs"
                        variant="light"
@ -65,19 +63,6 @@ export function NodeTable({
                    >
                        查看详情
                    </Button>
-
-                        {/* Grafana Dashboard 链接 */}
-                        <Button
-                            size="xs"
-                            variant="outline"
-                            component="a"
-                            href={`${EXTERNAL_HOST.GRAFANA}/d/node_gpu_metrics/node-and-gpu-metrics?var-hostname=${encodeURIComponent(node.name)}`}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                        >
-                            Grafana
-                        </Button>
-                    </Group>
                </Table.Td>
            )}
        </Table.Tr>
@ -86,6 +71,8 @@ export function NodeTable({
    return (
        <Card shadow="sm" radius="md" p="lg">
            {/* 标题 + 查看更多 */}
+
+
            {(title || viewMoreLink) && (
                <Group position="apart" mb="sm">
                    {title && <Text fw={700} size="lg">{title}</Text>}
--- a/src/web/src/components/Sidebar.jsx
+++ b/src/web/src/components/Sidebar.jsx
@ -12,7 +12,7 @@ export default function Sidebar() {
  const location = useLocation(); // 路由变化时会触发 Sidebar 重新渲染

  const links = [
-    { to: "/dashboard", label: "仪表盘", icon: <IconGauge size={16} /> },
+    { to: "/dashboard", label: "概览仪表盘", icon: <IconGauge size={16} /> },
    { to: "/nodeInfo", label: "节点信息", icon: <IconServer size={16} /> },
    { to: "/metrics", label: "指标详情", icon: <IconActivity size={16} /> },
    { to: "/logs", label: "日志详情", icon: <IconFileText size={16} /> },
--- a/src/web/src/config/api.js
+++ b/src/web/src/config/api.js
@ -17,14 +17,14 @@ export const MASTER_API = {

 // 其他外部 API
 export const EXTERNAL_API = {
-  ALERTS_INFOS: "http://alertmanager.alert.argus.com/api/v2/alerts",
+  ALERTS_INFOS: "http://localhost:9093/api/v2/alerts",
 };

 // 外部服务 Host
 export const EXTERNAL_HOST = {
-  ALERTS: "http://alertmanager.alert.argus.com",
+  ALERTS: "http://localhost:9093",
  GRAFANA: "http://grafana.metric.argus.com",
-  GRAFANA_DASHBOARD: "http://grafana.metric.argus.com/d/cluster-dashboard/cluster-dashboard",
  PROMETHEUS: "http://prometheus.metric.argus.com",
-  KIBANA: "http://kibana.log.argus.com/app/discover",
+  ES: "http://es.log.argus.com",
+  KIBANA: "http://kibana.log.argus.com",
 };
--- a/src/web/src/config/entries.js
+++ b/src/web/src/config/entries.js
@ -5,11 +5,12 @@ import kibanaLogo from "../assets/kibana.png";
 import { EXTERNAL_HOST } from "./api";

 export const metricsEntries = [
-  { label: "Grafana", href: EXTERNAL_HOST.GRAFANA_DASHBOARD, icon: grafanaLogo },
+  { label: "Grafana", href: EXTERNAL_HOST.GRAFANA, icon: grafanaLogo },
  { label: "Prometheus", href: EXTERNAL_HOST.PROMETHEUS, icon: prometheusLogo },
 ];

 export const logsEntries = [
+  { label: "Elasticsearch", href: EXTERNAL_HOST.ES, icon: esLogo },
  { label: "Kibana", href: EXTERNAL_HOST.KIBANA, icon: kibanaLogo },
 ];

--- a/src/web/src/pages/Alerts.jsx
+++ b/src/web/src/pages/Alerts.jsx
@ -1,5 +1,5 @@
 import { useEffect, useState, useMemo } from "react";
-import { Stack, Title, Loader, Center, Group, Button, Badge, ActionIcon, Switch } from "@mantine/core";
+import { Stack, Title, Loader, Center, Group, Button, Badge, ActionIcon } from "@mantine/core";
 import { IconRefresh } from "@tabler/icons-react";
 import { apiRequest } from "../config/request";
 import { EXTERNAL_API } from "../config/api";
@ -17,20 +17,18 @@ export default function Alerts() {
  const [page, setPage] = useState(1);
  const pageSize = 10;
  const [sortConfig, setSortConfig] = useState({ key: "startsAt", direction: "desc" });
-  const [autoRefresh, setAutoRefresh] = useState(true); // 默认开启自动刷新

  async function fetchAlerts() {
    setLoading(true);
    const data = await apiRequest(EXTERNAL_API.ALERTS_INFOS);
    if (data && Array.isArray(data)) {
      setAlerts(data);
-      const counts = { critical: 0, warning: 0, info: 0, total: 0 };
+      const counts = { critical: 0, warning: 0, info: 0 };
      data.forEach((alert) => {
        const sev = alert.labels?.severity || "info";
        if (sev === "critical") counts.critical++;
        else if (sev === "warning") counts.warning++;
        else counts.info++;
-        counts.total++;
      });
      setStats(counts);
    }
@ -39,14 +37,9 @@ export default function Alerts() {

  useEffect(() => {
    fetchAlerts();
-
-    let timer;
-    if (autoRefresh) {
-      timer = setInterval(fetchAlerts, 30000);
-    }
-
+    const timer = setInterval(fetchAlerts, 30000);
    return () => clearInterval(timer);
-  }, [autoRefresh]);
+  }, []);

  // 节点选项
  const nodeOptions = useMemo(() => {
@ -131,14 +124,7 @@ export default function Alerts() {
    <Stack spacing="lg" p="md">
      <Group position="apart">
        <Title order={2}>告警详情</Title>
-        <Switch
-          checked={autoRefresh}
-          onChange={(e) => setAutoRefresh(e.currentTarget.checked)}
-          label="自动刷新"
-          color="green"
-          size="sm"
-        />
-        <Button component="a" href={EXTERNAL_HOST.ALERTS} target="_blank" variant="outline">
+        <Button component="a" href="{EXTERNAL_HOST.ALERTS}" target="_blank" variant="outline">
          打开 Alertmanager
        </Button>
        <ActionIcon onClick={fetchAlerts} color="blue" variant="filled" size="lg" title="刷新">
--- a/src/web/src/pages/Dashboard.jsx
+++ b/src/web/src/pages/Dashboard.jsx
@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { Grid, Text, Stack, Title } from "@mantine/core";
+import { Grid, Text } from "@mantine/core";
 import { NodeTable } from "../components/NodeTable";
 import { HealthCard } from "../components/HealthCard";
 import { AlertStats } from "../components/AlertStats";
@ -14,13 +14,12 @@ export default function Dashboard() {
    const [loading, setLoading] = useState(true);

    const countAlerts = (data) => {
-        const stats = { critical: 0, warning: 0, info: 0, total: 0 };
+        const stats = { critical: 0, warning: 0, info: 0 };
        data?.forEach((alert) => {
            const severity = alert.labels?.severity || "info";
            if (severity === "critical") stats.critical++;
            else if (severity === "warning") stats.warning++;
            else stats.info++;
-            stats.total++;
        });
        return stats;
    };
@ -42,7 +41,7 @@ export default function Dashboard() {
                    status_statistics: healthRes?.status_statistics || [],
                });

-                setAlerts(countAlerts(alertsRes || []));
+                setAlerts(countAlerts(alertsRes?.data || []));
            } catch (err) {
                console.error("获取 Dashboard 数据失败:", err);
            } finally {
@ -62,8 +61,6 @@ export default function Dashboard() {
    }

    return (
-        <Stack spacing="lg" p="md">
-            <Title order={1} mb="md">仪表盘</Title>
        <Grid>

            <Grid.Col span={6}><HealthCard health={health} /></Grid.Col>
@ -72,6 +69,5 @@ export default function Dashboard() {
            </Grid.Col>
            <Grid.Col span={12}><NodeTable clusterData={cluster} title="集群节点" viewMoreLink="/nodeInfo" /></Grid.Col>
        </Grid>
-        </Stack>
    );
 }
--- a/src/web/src/pages/Metrics.jsx
+++ b/src/web/src/pages/Metrics.jsx
@ -5,7 +5,7 @@ import { metricsEntries } from "../config/entries";
 export default function Metrics() {
  return (
    <Stack spacing="lg" p="md">
-      <Title order={2}>指标详情</Title>
+      <Title order={2}>指标入口</Title>
      <Grid gutter="lg">
        {metricsEntries.map((entry) => (
          <Grid.Col key={entry.href} span={{ base: 12, sm: 4, md: 3 }}>
--- a/src/web/src/pages/NodePage.jsx
+++ b/src/web/src/pages/NodePage.jsx
@ -1,5 +1,5 @@
 import { useState } from "react";
-import { Grid, Stack, Title } from "@mantine/core";
+import { Grid } from "@mantine/core";
 import { apiRequest } from "../config/request";
 import { MASTER_API } from "../config/api";
 import { NodeTable } from "../components/NodeTable";
@ -23,11 +23,6 @@ export default function NodePage() {
    };

    return (
-        <Stack spacing="lg" p="md">
-            <Title order={2} mb="md">
-                节点信息
-            </Title>
-
        <Grid gutter="lg">
            {/* 左侧：节点表格 */}
            <Grid.Col span={drawerOpen ? 8 : 12}>
@ -47,6 +42,5 @@ export default function NodePage() {
                loading={detailLoading}
            />
        </Grid>
-        </Stack>
    );
 }
--- a/src/web/tests/.env.example
+++ b/src/web/tests/.env.example
@ -1,5 +0,0 @@
-DATA_ROOT=/home/argus/tmp/private/argus
-ARGUS_UID=1048
-ARGUS_GID=1048
-
-USE_INTRANET=false
--- a/src/web/tests/data/etc/web.argus.com
+++ b/src/web/tests/data/etc/web.argus.com
@ -0,0 +1 @@
+172.18.0.3
--- a/src/web/tests/docker-compose.yml
+++ b/src/web/tests/docker-compose.yml
@ -1,3 +1,4 @@
+version: '3.8'
 services:
  web-frontend:
    build:
@ -19,7 +20,7 @@ services:
      - ${DATA_ROOT:-./data}/web:/private/argus/web/frontend
      - ${DATA_ROOT:-./data}/etc:/private/argus/etc
    networks:
-      - argus-debug-net
+      - argus-network
    restart: unless-stopped
    logging:
      driver: "json-file"
@ -44,7 +45,7 @@ services:
    volumes:
      - ${DATA_ROOT:-./data}/etc:/private/argus/etc
    networks:
-      - argus-debug-net
+      - argus-network
    restart: unless-stopped
    logging:
      driver: "json-file"
@ -53,8 +54,9 @@ services:
        max-file: "3"

 networks:
-  argus-debug-net:
-    external: true
+  argus-network:
+    driver: bridge
+    name: argus-network

 volumes:
  web-frontend_data: