refactor: 边缘节点与配置精简

- 边缘: Prometheus 改为 vmagent，统一 docker-compose.yml，内存+磁盘缓存 - 边缘脚本: 合并为 deploy.sh [--local]，删除 run-edge-local、quick-setup、run-edge-with-cache - 配置: 合并为 update-configs.sh，统一 targets.csv，生成 target-onvif/target-ping/target-topology - 删除 topology-editor、旧格式 devices.csv/ping-targets.csv、setup-remote-write、test-connection - 文档: 更新 EDGE_CACHE、TIANDITU（瓦片改 4090 直连 tile-cache） Made-with: Cursor
2026-02-28 19:44:46 -05:00
parent 72a5bf30b4
commit 650e5145f1
35 changed files with 319 additions and 2774 deletions
--- a/edge-agent/config/csv-to-json.sh
+++ b/edge-agent/config/csv-to-json.sh
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# CSV转JSON脚本 - 将设备CSV表格转换为Prometheus监控JSON配置
-# 使用方法: ./csv-to-json.sh devices.csv > onvif-targets.json
-
-set -e
-
-CSV_FILE=${1:-"devices.csv"}
-OUTPUT_FILE=${2:-"onvif-targets.json"}
-
-# 检查jq是否安装
-if ! command -v jq &> /dev/null; then
-    echo "❌ jq未安装，请先安装jq:"
-    echo "   Ubuntu/Debian: sudo apt-get install jq"
-    echo "   CentOS/RHEL: sudo yum install jq"
-    echo "   Alpine: apk add jq"
-    exit 1
-fi
-
-# 检查CSV文件是否存在
-if [ ! -f "$CSV_FILE" ]; then
-    echo "❌ CSV文件 $CSV_FILE 不存在"
-    exit 1
-fi
-
-echo "🔄 正在转换 $CSV_FILE 到 $OUTPUT_FILE..."
-
-# 使用jq将CSV转换为JSON
-# 1. 读取CSV文件，跳过标题行
-# 2. 将每行转换为JSON对象
-# 3. 构建Prometheus targets格式
-
-tail -n +2 "$CSV_FILE" | while IFS=',' read -r ip device_type model location username password onvif_port; do
-    # 构建labels对象
-    labels="{
-        \"device_type\": \"$device_type\",
-        \"model\": \"$model\",
-        \"location\": \"$location\",
-        \"username\": \"$username\",
-        \"password\": \"$password\""
-    
-    # 如果onvif_port不是默认的80，则添加到labels中
-    if [ "$onvif_port" != "80" ] && [ -n "$onvif_port" ]; then
-        labels="$labels,
-        \"onvif_port\": \"$onvif_port\""
-    fi
-    
-    labels="$labels
-    }"
-    
-    # 输出JSON对象
-    echo "{
-        \"targets\": [\"$ip\"],
-        \"labels\": $labels
-    }"
-done | jq -s '.' > "$OUTPUT_FILE"
-
-echo "✅ 转换完成！"
-echo "📊 生成了 $(jq length "$OUTPUT_FILE") 个设备配置"
-echo "📁 输出文件: $OUTPUT_FILE"
-echo ""
-echo "🔍 预览生成的JSON:"
-jq . "$OUTPUT_FILE"
--- a/edge-agent/config/csv-to-ping-json.sh
+++ b/edge-agent/config/csv-to-ping-json.sh
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# CSV转Ping JSON脚本 - 将Ping目标CSV表格转换为Prometheus监控JSON配置
-# 使用方法: ./csv-to-ping-json.sh ping-targets.csv > ping-targets.json
-
-set -e
-
-CSV_FILE=${1:-"ping-targets.csv"}
-OUTPUT_FILE=${2:-"ping-targets.json"}
-
-# 检查jq是否安装
-if ! command -v jq &> /dev/null; then
-    echo "❌ jq未安装，请先安装jq:"
-    echo "   Ubuntu/Debian: sudo apt-get install jq"
-    echo "   CentOS/RHEL: sudo yum install jq"
-    echo "   Alpine: apk add jq"
-    exit 1
-fi
-
-# 检查CSV文件是否存在
-if [ ! -f "$CSV_FILE" ]; then
-    echo "❌ CSV文件 $CSV_FILE 不存在"
-    exit 1
-fi
-
-echo "🔄 正在转换 $CSV_FILE 到 $OUTPUT_FILE..."
-
-# 使用jq将CSV转换为JSON
-tail -n +2 "$CSV_FILE" | while IFS=',' read -r ip device group network; do
-    # 构建labels对象
-    labels="{
-        \"device\": \"$device\""
-    
-    # 添加可选的group标签
-    if [ -n "$group" ]; then
-        labels="$labels,
-        \"group\": \"$group\""
-    fi
-    
-    # 添加可选的network标签
-    if [ -n "$network" ]; then
-        labels="$labels,
-        \"network\": \"$network\""
-    fi
-    
-    labels="$labels
-    }"
-    
-    # 输出JSON对象
-    echo "{
-        \"targets\": [\"$ip\"],
-        \"labels\": $labels
-    }"
-done | jq -s '.' > "$OUTPUT_FILE"
-
-echo "✅ 转换完成！"
-echo "📊 生成了 $(jq length "$OUTPUT_FILE") 个Ping目标配置"
-echo "📁 输出文件: $OUTPUT_FILE"
-echo ""
-echo "🔍 预览生成的JSON:"
-jq . "$OUTPUT_FILE"
--- a/edge-agent/config/csv-to-targets.sh
+++ b/edge-agent/config/csv-to-targets.sh
@@ -1,154 +0,0 @@
-#!/bin/bash
-
-# 统一目标配置转换脚本
-# 从 targets.csv 生成 onvif-targets.json 和 ping-targets.json
-# 使用方法: ./csv-to-targets.sh targets.csv
-
-set -e
-
-CSV_FILE=${1:-"targets.csv"}
-
-# 检查jq是否安装
-if ! command -v jq &> /dev/null; then
-    echo "❌ jq未安装，请先安装jq:"
-    echo "   Ubuntu/Debian: sudo apt-get install jq"
-    echo "   CentOS/RHEL: sudo yum install jq"
-    echo "   Fedora: sudo dnf install jq"
-    exit 1
-fi
-
-# 检查CSV文件是否存在
-if [ ! -f "$CSV_FILE" ]; then
-    echo "❌ CSV文件 $CSV_FILE 不存在"
-    exit 1
-fi
-
-echo "🔄 正在从 $CSV_FILE 生成配置文件..."
-echo ""
-
-# 临时文件
-ONVIF_TEMP=$(mktemp)
-PING_TEMP=$(mktemp)
-
-# 处理CSV文件（跳过注释行和标题行）
-# 列顺序: type,ip,name,role,parent,uplink_type,network,device_type,model,location,username,password,onvif_port,lat,lon
-tail -n +2 "$CSV_FILE" | grep -v '^#' | while IFS=',' read -r type ip name role parent uplink_type network device_type model location username password onvif_port lat lon; do
-    # 去除空格
-    type=$(echo "$type" | xargs)
-    ip=$(echo "$ip" | xargs)
-    
-    # 跳过空行
-    if [ -z "$type" ]; then
-        continue
-    fi
-    
-    if [ "$type" = "onvif" ]; then
-        # 处理 ONVIF 设备
-        device_type=$(echo "$device_type" | xargs)
-        model=$(echo "$model" | xargs)
-        location=$(echo "$location" | xargs)
-        username=$(echo "$username" | xargs)
-        password=$(echo "$password" | xargs)
-        onvif_port=$(echo "$onvif_port" | xargs)
-        lat=$(echo "$lat" | xargs)
-        lon=$(echo "$lon" | xargs)
-        
-        labels="{
-            \"device_type\": \"$device_type\",
-            \"model\": \"$model\",
-            \"location\": \"$location\",
-            \"username\": \"$username\",
-            \"password\": \"$password\""
-        
-        if [ "$onvif_port" != "80" ] && [ -n "$onvif_port" ]; then
-            labels="$labels,
-            \"onvif_port\": \"$onvif_port\""
-        fi
-
-        if [ -n "$lat" ]; then
-            labels="$labels,
-            \"lat\": \"$lat\""
-        fi
-
-        if [ -n "$lon" ]; then
-            labels="$labels,
-            \"lon\": \"$lon\""
-        fi
-        
-        labels="$labels
-        }"
-        
-        echo "{
-            \"targets\": [\"$ip\"],
-            \"labels\": $labels
-        }" >> "$ONVIF_TEMP"
-        
-    elif [ "$type" = "ping" ]; then
-        # 处理 Ping 目标
-        device=$(echo "$name" | xargs)   # name 作为 device 标签
-        role=$(echo "$role" | xargs)
-        parent=$(echo "$parent" | xargs)
-        uplink_type=$(echo "$uplink_type" | xargs)
-        network=$(echo "$network" | xargs)
-        
-        labels="{
-            \"device\": \"$device\""
-        
-        if [ -n "$uplink_type" ]; then
-            labels="$labels,
-            \"uplink_type\": \"$uplink_type\""
-        fi
-        
-        if [ -n "$network" ]; then
-            labels="$labels,
-            \"network\": \"$network\""
-        fi
-
-        if [ -n "$role" ]; then
-            labels="$labels,
-            \"role\": \"$role\""
-        fi
-
-        if [ -n "$parent" ]; then
-            labels="$labels,
-            \"parent\": \"$parent\""
-        fi
-        
-        labels="$labels
-        }"
-        
-        echo "{
-            \"targets\": [\"$ip\"],
-            \"labels\": $labels
-        }" >> "$PING_TEMP"
-    fi
-done
-
-# 生成 JSON 文件
-if [ -s "$ONVIF_TEMP" ]; then
-    jq -s '.' "$ONVIF_TEMP" > onvif-targets.json
-    ONVIF_COUNT=$(jq length onvif-targets.json)
-    echo "✅ 生成 ONVIF 设备配置: $ONVIF_COUNT 个设备"
-else
-    echo "[]" > onvif-targets.json
-    echo "⚠️  未找到 ONVIF 设备，生成空配置"
-fi
-
-if [ -s "$PING_TEMP" ]; then
-    jq -s '.' "$PING_TEMP" > ping-targets.json
-    PING_COUNT=$(jq length ping-targets.json)
-    echo "✅ 生成 Ping 目标配置: $PING_COUNT 个目标"
-else
-    echo "[]" > ping-targets.json
-    echo "⚠️  未找到 Ping 目标，生成空配置"
-fi
-
-# 清理临时文件
-rm -f "$ONVIF_TEMP" "$PING_TEMP"
-
-echo ""
-echo "✅ 配置文件生成完成！"
-echo "📁 生成的文件："
-echo "   - onvif-targets.json"
-echo "   - ping-targets.json"
-echo ""
--- a/edge-agent/config/csv-to-topology-geojson.sh
+++ b/edge-agent/config/csv-to-topology-geojson.sh
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-# 从 targets.csv 生成拓扑 GeoJSON（用于 Grafana Geomap）
-# - 支持 type: ping / onvif / topology
-# - 使用列: name, role, parent, lat, lon
-# - 输出: topology.geojson（FeatureCollection，含 Point 和 LineString）
-
-set -e
-
-CSV_FILE=${1:-"targets.csv"}
-OUTPUT_FILE=${2:-"topology.geojson"}
-
-if ! command -v jq &> /dev/null; then
-  echo "❌ jq 未安装，请先安装 jq"
-  exit 1
-fi
-
-if [ ! -f "$CSV_FILE" ]; then
-  echo "❌ CSV 文件 $CSV_FILE 不存在"
-  exit 1
-fi
-
-TMP_JSON=$(mktemp)
-
-echo "🔄 正在从 $CSV_FILE 生成拓扑 GeoJSON 到 $OUTPUT_FILE ..."
-
-# 列顺序: type,ip,name,role,parent,uplink_type,network,device_type,model,location,username,password,onvif_port,lat,lon
-tail -n +2 "$CSV_FILE" | grep -v '^#' | while IFS=',' read -r type ip name role parent uplink_type network device_type model location username password onvif_port lat lon; do
-  type=$(echo "$type" | xargs)
-  name=$(echo "$name" | xargs)
-
-  # 空行跳过
-  if [ -z "$type" ] || [ -z "$name" ]; then
-    continue
-  fi
-
-  cat >> "$TMP_JSON" <<EOF
-{"type":"$type","ip":"$ip","name":"$name","role":"$role","parent":"$parent","uplink_type":"$uplink_type","network":"$network","device_type":"$device_type","model":"$model","location":"$location","lat":"$lat","lon":"$lon"}
-EOF
-done
-
-# 用 jq 生成 FeatureCollection
-jq -s '
-  def toPoint:
-    select(.lat != "" and .lon != "") |
-    {
-      type: "Feature",
-      geometry: {
-        type: "Point",
-        coordinates: [ (.lon|tonumber), (.lat|tonumber) ]
-      },
-      properties: {
-        kind: .type,
-        name: .name,
-        role: .role,
-        parent: .parent,
-        ip: .ip,
-        uplink_type: .uplink_type,
-        network: .network,
-        device_type: .device_type,
-        model: .model,
-        location: .location
-      }
-    };
-
-  def toLine(all):
-    select(.parent != "" and .lat != "" and .lon != "") as $child
-    | (all[] | select(.name == $child.parent and .lat != "" and .lon != "")) as $parent
-    | {
-        type: "Feature",
-        geometry: {
-          type: "LineString",
-          coordinates: [
-            [ ($parent.lon|tonumber), ($parent.lat|tonumber) ],
-            [ ($child.lon|tonumber),  ($child.lat|tonumber)  ]
-          ]
-        },
-        properties: {
-          type: "link",
-          from: $parent.name,
-          to: $child.name,
-          from_role: $parent.role,
-          to_role: $child.role
-        }
-      };
-
-  . as $all
-  | {
-      type: "FeatureCollection",
-      features: (
-        [ $all[] | toPoint ] +
-        [ $all[] | toLine($all) ]
-      )
-    }
-' "$TMP_JSON" > "$OUTPUT_FILE"
-
-rm -f "$TMP_JSON"
-
-echo "✅ 已生成 $OUTPUT_FILE"
-
--- a/edge-agent/config/devices.csv
+++ b/edge-agent/config/devices.csv
@@ -1,5 +0,0 @@
-ip,device_type,model,location,username,password,onvif_port
-192.168.1.100,camera,HIKVISION_DS-2CD2342WD-I,front_door,admin,password1,80
-192.168.1.101,camera,DAHUA_IPC-HFW1230S,back_yard,admin,password2,80
-192.168.1.102,camera,UNIVIEW_IPC3120SR,living_room,admin,password3,8080
-192.168.1.50,nvr,HIKVISION_DS-7608NI-I2,server_rack,admin,password4,80
--- a/edge-agent/config/ping-targets.csv
+++ b/edge-agent/config/ping-targets.csv
@@ -1,6 +0,0 @@
-ip,device,group,network
-192.168.1.1,main_router,network,internal
-192.168.1.100,front_camera,onvif_cameras,internal
-192.168.1.101,back_camera,onvif_cameras,internal
-192.168.1.102,living_camera,onvif_cameras,internal
-8.8.8.8,google_dns,external,external
--- a/edge-agent/config/setup-remote-write.sh
+++ b/edge-agent/config/setup-remote-write.sh
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# 设置远程推送地址脚本
-# 使用方法: ./setup-remote-write.sh <中央服务器地址> [端口]
-# 支持IP地址和域名
-
-set -e
-
-CENTRAL_HOST=${1:-"192.168.1.10"}
-CENTRAL_PORT=${2:-"8428"}
-CONFIG_FILE="../prometheus-edge/prometheus.yml"
-
-echo "=== 设置Prometheus远程推送地址 ==="
-echo ""
-
-if [ -z "$1" ]; then
-    echo "使用方法: $0 <中央服务器地址> [端口]"
-    echo "示例: $0 192.168.1.10 8428"
-    echo "      $0 prometheus.company.com"
-    echo "      $0 prometheus.local 8428"
-    echo ""
-    read -p "请输入中央服务器地址 (IP或域名): " CENTRAL_HOST
-    read -p "请输入端口 (默认8428): " CENTRAL_PORT_INPUT
-    if [ -n "$CENTRAL_PORT_INPUT" ]; then
-        CENTRAL_PORT=$CENTRAL_PORT_INPUT
-    fi
-fi
-
-echo "🔧 配置信息："
-echo "   中央服务器地址: $CENTRAL_HOST"
-echo "   端口: $CENTRAL_PORT"
-echo "   配置文件: $CONFIG_FILE"
-echo ""
-
-# 检查配置文件是否存在
-if [ ! -f "$CONFIG_FILE" ]; then
-    echo "❌ 配置文件 $CONFIG_FILE 不存在"
-    exit 1
-fi
-
-# 备份原配置文件
-cp "$CONFIG_FILE" "${CONFIG_FILE}.backup.$(date +%Y%m%d_%H%M%S)"
-echo "📋 已备份原配置文件"
-
-# 更新配置文件中的远程推送地址
-sed -i "s|http://\${CENTRAL_SERVER_HOST}:\${CENTRAL_SERVER_PORT}|http://$CENTRAL_HOST:$CENTRAL_PORT|g" "$CONFIG_FILE"
-
-echo "✅ 远程推送地址已更新"
-echo ""
-
-# 显示更新后的配置
-echo "🔍 更新后的remote_write配置："
-grep -A 5 "remote_write:" "$CONFIG_FILE"
-
-echo ""
-echo "🔄 重启Prometheus服务以应用新配置："
-echo "   docker-compose restart prometheus-edge"
-echo ""
-echo "📊 检查远程写入状态："
-echo "   curl http://localhost:9090/api/v1/status/config"
-echo ""
-echo "🔗 查看远程写入目标："
-echo "   curl http://localhost:9090/api/v1/status/tsdb"
--- a/edge-agent/config/test-connection.sh
+++ b/edge-agent/config/test-connection.sh
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# 测试中央服务器连接脚本
-# 使用方法: ./test-connection.sh <中央服务器地址> [端口]
-
-set -e
-
-CENTRAL_HOST=${1:-"192.168.1.10"}
-CENTRAL_PORT=${2:-"8428"}
-
-echo "=== 测试中央服务器连接 ==="
-echo ""
-
-if [ -z "$1" ]; then
-    echo "使用方法: $0 <中央服务器地址> [端口]"
-    echo "示例: $0 192.168.1.10 8428"
-    echo "      $0 prometheus.company.com"
-    echo "      $0 prometheus.local 9090"
-    echo ""
-    read -p "请输入中央服务器地址 (IP或域名): " CENTRAL_HOST
-    read -p "请输入端口 (默认8428): " CENTRAL_PORT_INPUT
-    if [ -n "$CENTRAL_PORT_INPUT" ]; then
-        CENTRAL_PORT=$CENTRAL_PORT_INPUT
-    fi
-fi
-
-echo "🔧 测试配置："
-echo "   中央服务器地址: $CENTRAL_HOST"
-echo "   端口: $CENTRAL_PORT"
-echo ""
-
-# 测试域名解析
-echo "🌐 测试域名解析..."
-if command -v nslookup &> /dev/null; then
-    nslookup $CENTRAL_HOST
-else
-    echo "   nslookup 不可用，跳过DNS测试"
-fi
-
-# 测试网络连通性
-echo ""
-echo "📡 测试网络连通性..."
-if ping -c 3 $CENTRAL_HOST > /dev/null 2>&1; then
-    echo "   ✅ Ping 成功"
-else
-    echo "   ❌ Ping 失败"
-fi
-
-# 测试端口连通性
-echo ""
-echo "🔌 测试端口连通性..."
-if command -v nc &> /dev/null; then
-    if nc -z $CENTRAL_HOST $CENTRAL_PORT 2>/dev/null; then
-        echo "   ✅ 端口 $CENTRAL_PORT 可访问"
-    else
-        echo "   ❌ 端口 $CENTRAL_PORT 不可访问"
-    fi
-else
-    echo "   nc 不可用，跳过端口测试"
-fi
-
-# 测试HTTP连接
-echo ""
-echo "🌐 测试HTTP连接..."
-HTTP_URL="http://$CENTRAL_HOST:$CENTRAL_PORT"
-if command -v curl &> /dev/null; then
-    if curl -s --connect-timeout 5 $HTTP_URL > /dev/null 2>&1; then
-        echo "   ✅ HTTP连接成功: $HTTP_URL"
-        
-        # 测试VictoriaMetrics API
-        if curl -s --connect-timeout 5 "$HTTP_URL/api/v1/status" > /dev/null 2>&1; then
-            echo "   ✅ VictoriaMetrics API 可访问"
-        else
-            echo "   ⚠️  VictoriaMetrics API 不可访问 (可能不是VictoriaMetrics服务)"
-        fi
-    else
-        echo "   ❌ HTTP连接失败: $HTTP_URL"
-    fi
-else
-    echo "   curl 不可用，跳过HTTP测试"
-fi
-
-echo ""
-echo "📋 测试完成！"
-echo ""
-echo "💡 如果连接失败，请检查："
-echo "   1. 网络连接是否正常"
-echo "   2. 防火墙是否开放端口 $CENTRAL_PORT"
-echo "   3. 中央服务器是否正在运行"
-echo "   4. DNS解析是否正确"
--- a/edge-agent/config/update-configs.sh
+++ b/edge-agent/config/update-configs.sh
@@ -1,68 +1,61 @@
 #!/bin/bash
-
-# 更新配置文件脚本 - 从CSV生成所有JSON配置文件
-# 使用方法: ./update-configs.sh
-
+# 从 targets.csv 生成 target-onvif.json、target-ping.json、target-topology.geojson
+# 用法: ./update-configs.sh [targets.csv]
 set -e

-echo "=== 更新Prometheus监控配置文件 ==="
-echo ""
-
-# 检查jq是否安装
-if ! command -v jq &> /dev/null; then
-    echo "❌ jq未安装，请先安装jq:"
-    echo "   Ubuntu/Debian: sudo apt-get install jq"
-    echo "   CentOS/RHEL: sudo yum install jq"
-    echo "   Alpine: apk add jq"
-    exit 1
-fi
-
-# 进入脚本目录
 cd "$(dirname "$0")"
+command -v jq &>/dev/null || { echo "❌ 需要 jq"; exit 1; }

-echo "🔄 正在从CSV文件生成JSON配置..."
+CSV="${1:-targets.csv}"
+[ ! -f "$CSV" ] && { echo '[]' > target-onvif.json; echo '[]' > target-ping.json; echo '{"type":"FeatureCollection","features":[]}' > target-topology.geojson; exit 0; }

-# 优先使用统一的 targets.csv
-if [ -f "targets.csv" ]; then
-    echo "📋 使用统一配置文件 targets.csv..."
-    chmod +x csv-to-targets.sh 2>/dev/null || true
-    ./csv-to-targets.sh targets.csv
-else
-    echo "⚠️  targets.csv 不存在，使用旧格式配置文件..."
-    echo ""
-    
-    # 兼容旧格式：生成ONVIF设备配置
-    if [ -f "devices.csv" ]; then
-        echo "📱 生成ONVIF设备配置（从 devices.csv）..."
-        chmod +x csv-to-json.sh 2>/dev/null || true
-        ./csv-to-json.sh devices.csv onvif-targets.json
-    else
-        echo "⚠️  devices.csv 不存在，跳过ONVIF设备配置生成"
-        echo "[]" > onvif-targets.json
+ONVIF=$(mktemp)
+PING=$(mktemp)
+TMP=$(mktemp)
+trap "rm -f $ONVIF $PING $TMP" EXIT
+
+# target-onvif.json + target-ping.json
+tail -n +2 "$CSV" | grep -v '^#' | while IFS=',' read -r type ip name role parent uplink_type network device_type model location username password onvif_port lat lon; do
+    type=$(echo "$type" | xargs)
+    ip=$(echo "$ip" | xargs)
+    [ -z "$type" ] && continue
+
+    if [ "$type" = "onvif" ]; then
+        device_type=$(echo "$device_type" | xargs)
+        model=$(echo "$model" | xargs)
+        location=$(echo "$location" | xargs)
+        username=$(echo "$username" | xargs)
+        password=$(echo "$password" | xargs)
+        onvif_port=$(echo "$onvif_port" | xargs)
+        labels="{\"device_type\":\"$device_type\",\"model\":\"$model\",\"location\":\"$location\",\"username\":\"$username\",\"password\":\"$password\""
+        [ -n "$onvif_port" ] && [ "$onvif_port" != "80" ] && labels="${labels%?},\"onvif_port\":\"$onvif_port\"}"
+        echo "{\"targets\":[\"$ip\"],\"labels\":$labels}" >> "$ONVIF"
+    elif [ "$type" = "ping" ]; then
+        name=$(echo "$name" | xargs)
+        network=$(echo "$network" | xargs)
+        role=$(echo "$role" | xargs)
+        parent=$(echo "$parent" | xargs)
+        uplink_type=$(echo "$uplink_type" | xargs)
+        labels="{\"device\":\"$name\""
+        [ -n "$network" ] && labels="$labels,\"network\":\"$network\""
+        [ -n "$role" ] && labels="$labels,\"role\":\"$role\""
+        [ -n "$parent" ] && labels="$labels,\"parent\":\"$parent\""
+        [ -n "$uplink_type" ] && labels="$labels,\"uplink_type\":\"$uplink_type\""
+        labels="$labels}"
+        echo "{\"targets\":[\"$ip\"],\"labels\":$labels}" >> "$PING"
    fi
-    
-    # 兼容旧格式：生成Ping目标配置
-    if [ -f "ping-targets.csv" ]; then
-        echo "🌐 生成Ping目标配置（从 ping-targets.csv）..."
-        chmod +x csv-to-ping-json.sh 2>/dev/null || true
-        ./csv-to-ping-json.sh ping-targets.csv ping-targets.json
-    else
-        echo "⚠️  ping-targets.csv 不存在，跳过Ping目标配置生成"
-        echo "[]" > ping-targets.json
-    fi
-fi
+done

-echo ""
-echo "✅ 所有配置文件已更新！"
-echo ""
-echo "📋 生成的文件："
-ls -la *.json 2>/dev/null || echo "   (无JSON文件生成)"
-echo ""
-echo "🔄 配置热重载："
-echo "   - Prometheus会在5分钟内自动检测并重载配置"
-echo "   - 无需重启Docker容器！"
-echo ""
-echo "⚡ 强制立即重载 (可选)："
-echo "   docker-compose restart prometheus-edge"
-echo ""
-echo "📝 编辑CSV文件后重新运行此脚本即可更新配置"
+[ -s "$ONVIF" ] && jq -s '.' "$ONVIF" > target-onvif.json || echo '[]' > target-onvif.json
+[ -s "$PING" ] && jq -s '.' "$PING" > target-ping.json || echo '[]' > target-ping.json
+
+# target-topology.geojson
+tail -n +2 "$CSV" | grep -v '^#' | while IFS=',' read -r type ip name role parent uplink_type network device_type model location username password onvif_port lat lon; do
+    [ -z "$(echo $type | xargs)" ] || [ -z "$(echo $name | xargs)" ] && continue
+    echo "{\"type\":\"$type\",\"ip\":\"$ip\",\"name\":\"$name\",\"role\":\"$role\",\"parent\":\"$parent\",\"uplink_type\":\"$uplink_type\",\"network\":\"$network\",\"device_type\":\"$device_type\",\"model\":\"$model\",\"location\":\"$location\",\"lat\":\"$lat\",\"lon\":\"$lon\"}" >> "$TMP"
+done
+jq -s '
+  def toPoint: select(.lat != "" and .lon != "") | {type:"Feature", geometry:{type:"Point", coordinates:[(.lon|tonumber), (.lat|tonumber)]}, properties:{kind:.type, name:.name, role:.role, parent:.parent, ip:.ip, uplink_type:.uplink_type, network:.network, device_type:.device_type, model:.model, location:.location}};
+  def toLine(all): select(.parent != "" and .lat != "" and .lon != "") as $c | (all[] | select(.name == $c.parent and .lat != "" and .lon != "")) as $p | if $p then {type:"Feature", geometry:{type:"LineString", coordinates:[[($p.lon|tonumber), ($p.lat|tonumber)], [($c.lon|tonumber), ($c.lat|tonumber)]]}, properties:{type:"link", from:$p.name, to:$c.name}} else empty end;
+  . as $all | {type:"FeatureCollection", features: ([$all[] | toPoint] + [$all[] | toLine($all)])}
+' "$TMP" > target-topology.geojson 2>/dev/null || echo '{"type":"FeatureCollection","features":[]}' > target-topology.geojson