修复图表时间和查询区间不匹配问题

2025-12-02 23:20:10 +08:00
commit 4d66bdf633
49 changed files with 16275 additions and 0 deletions
--- a/agent/agent
+++ b/agent/agent
--- a/agent/agent.json
+++ b/agent/agent.json
@@ -0,0 +1,8 @@
+{
+  "server_url": "http://localhost:8080/api",
+  "id": "yunc",
+  "name": "cloud",
+  "device_id": "yunc",
+  "token": "0b1f00e76e28beaed3be71d13e25aceb",
+  "interval": "10s"
+}
--- a/agent/agent.json1
+++ b/agent/agent.json1
@@ -0,0 +1,8 @@
+{
+  "server_url": "http://localhost:8080/api",
+  "id": "agent-1764574150630675372-3392337",
+  "name": "cloud",
+  "device_id": "yunc",
+  "token": "",
+  "interval": "3s"
+}
--- a/agent/go.mod
+++ b/agent/go.mod
@@ -0,0 +1,16 @@
+module github.com/monitor/agent
+
+go 1.24.0
+
+toolchain go1.24.10
+
+require github.com/shirou/gopsutil v3.21.11+incompatible
+
+require (
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/stretchr/testify v1.11.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.16 // indirect
+	github.com/tklauser/numcpus v0.11.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+)
--- a/agent/go.sum
+++ b/agent/go.sum
@@ -0,0 +1,21 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
+github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
+github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw=
+github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/agent/main.go
+++ b/agent/main.go
@@ -0,0 +1,483 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"time"
+
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/disk"
+	"github.com/shirou/gopsutil/mem"
+	"github.com/shirou/gopsutil/net"
+)
+
+// Config Agent配置
+type Config struct {
+	ServerURL string `json:"server_url"`
+	ID        string `json:"id"`        // Agent唯一标识，自动生成
+	Name      string `json:"name"`      // Agent显示名称
+	DeviceID  string `json:"device_id"` // 向后兼容，保留
+	Token     string `json:"token"`     // 设备认证令牌
+	Interval  string `json:"interval"`  // 采集间隔
+}
+
+// Metrics 监控指标
+type Metrics struct {
+	CPU     float64            `json:"cpu"`
+	Memory  float64            `json:"memory"`
+	Disk    map[string]float64 `json:"disk"`
+	Network struct {
+		BytesSent     uint64 `json:"bytes_sent"`
+		BytesReceived uint64 `json:"bytes_received"`
+	} `json:"network"`
+}
+
+// 全局配置
+var config Config
+
+// 保存解析后的时间间隔
+var parsedInterval time.Duration
+
+// 保存上一次网络流量采集的数据
+var (
+	lastBytesSent     uint64
+	lastBytesReceived uint64
+	lastCollectTime   time.Time
+)
+
+// 初始化配置
+func initConfig() {
+	// 默认配置
+	config = Config{
+		ServerURL: "http://localhost:8080/api",
+		ID:        "",        // 自动生成
+		Name:      "",        // 自动生成或从配置读取
+		DeviceID:  "default", // 向后兼容，保留
+		Token:     "",        // 设备认证令牌，从配置或环境变量读取
+		Interval:  "10s",
+	}
+
+	// 读取配置文件
+	readConfigFile()
+
+	// 从环境变量读取配置（优先级高于配置文件）
+	loadFromEnv()
+
+	// 生成或确保ID存在
+	ensureAgentID()
+
+	// 确保名称存在
+	ensureAgentName()
+
+	// 保存配置到文件（如果有修改）
+	saveConfigFile()
+
+	// 解析时间间隔
+	var err error
+	parsedInterval, err = time.ParseDuration(config.Interval)
+	if err != nil {
+		log.Printf("Failed to parse interval: %v, using default 10s", err)
+		parsedInterval = 10 * time.Second
+	}
+
+	// 打印配置信息
+	log.Printf("Agent ID: %s, Name: %s, DeviceID: %s", config.ID, config.Name, config.DeviceID)
+}
+
+// 从环境变量读取配置
+func loadFromEnv() {
+	if serverURL := os.Getenv("AGENT_SERVER_URL"); serverURL != "" {
+		config.ServerURL = serverURL
+	}
+
+	if id := os.Getenv("AGENT_ID"); id != "" {
+		config.ID = id
+	}
+
+	if name := os.Getenv("AGENT_NAME"); name != "" {
+		config.Name = name
+	}
+
+	if deviceID := os.Getenv("AGENT_DEVICE_ID"); deviceID != "" {
+		config.DeviceID = deviceID
+	}
+
+	if token := os.Getenv("AGENT_TOKEN"); token != "" {
+		config.Token = token
+	}
+
+	if intervalStr := os.Getenv("AGENT_INTERVAL"); intervalStr != "" {
+		config.Interval = intervalStr
+	}
+}
+
+// 确保Agent ID存在，不存在则生成
+func ensureAgentID() {
+	if config.ID != "" {
+		return
+	}
+
+	// 使用时间戳和随机数生成唯一ID
+	config.ID = fmt.Sprintf("agent-%d-%d", time.Now().UnixNano(), os.Getpid())
+	log.Printf("Generated new Agent ID: %s", config.ID)
+}
+
+// 确保Agent名称存在，不存在则生成
+func ensureAgentName() {
+	if config.Name != "" {
+		return
+	}
+
+	// 尝试获取主机名作为默认名称
+	hostname, err := os.Hostname()
+	if err != nil {
+		// 如果获取主机名失败，使用ID的前8位作为默认名称
+		hostname = fmt.Sprintf("Agent-%s", config.ID[:8])
+	}
+	config.Name = hostname
+	log.Printf("Generated new Agent Name: %s", config.Name)
+}
+
+// 保存配置到文件
+func saveConfigFile() {
+	// 获取配置文件路径，默认./agent.json，可通过环境变量指定
+	configFile := os.Getenv("AGENT_CONFIG_FILE")
+	if configFile == "" {
+		configFile = "./agent.json"
+	}
+
+	// 将配置转换为JSON
+	jsonData, err := json.MarshalIndent(config, "", "  ")
+	if err != nil {
+		log.Printf("Failed to marshal config: %v", err)
+		return
+	}
+
+	// 保存配置到文件
+	if err := os.WriteFile(configFile, jsonData, 0644); err != nil {
+		log.Printf("Failed to save config to file: %v", err)
+		return
+	}
+
+	log.Printf("Config saved to %s", configFile)
+}
+
+// 读取配置文件
+func readConfigFile() {
+	// 获取配置文件路径，默认./agent.json，可通过环境变量指定
+	configFile := os.Getenv("AGENT_CONFIG_FILE")
+	if configFile == "" {
+		configFile = "./agent.json"
+	}
+
+	// 检查配置文件是否存在
+	if _, err := os.Stat(configFile); os.IsNotExist(err) {
+		log.Printf("Config file %s not found, using default config", configFile)
+		return
+	}
+
+	// 读取配置文件
+	content, err := os.ReadFile(configFile)
+	if err != nil {
+		log.Printf("Failed to read config file %s: %v, using default config", configFile, err)
+		return
+	}
+
+	// 解析配置文件
+	var fileConfig Config
+	if err := json.Unmarshal(content, &fileConfig); err != nil {
+		log.Printf("Failed to parse config file %s: %v, using default config", configFile, err)
+		return
+	}
+
+	// 合并配置：只覆盖非零值
+	if fileConfig.ServerURL != "" {
+		config.ServerURL = fileConfig.ServerURL
+	}
+
+	if fileConfig.ID != "" {
+		config.ID = fileConfig.ID
+	}
+
+	if fileConfig.Name != "" {
+		config.Name = fileConfig.Name
+	}
+
+	if fileConfig.DeviceID != "" {
+		config.DeviceID = fileConfig.DeviceID
+	}
+
+	if fileConfig.Token != "" {
+		config.Token = fileConfig.Token
+	}
+
+	if fileConfig.Interval != "" {
+		config.Interval = fileConfig.Interval
+	}
+
+	log.Printf("Config loaded from %s", configFile)
+}
+
+// 采集CPU使用率
+func collectCPU() (float64, error) {
+	percentages, err := cpu.Percent(0, false)
+	if err != nil {
+		return 0, err
+	}
+
+	return percentages[0], nil
+}
+
+// 采集内存使用率
+func collectMemory() (float64, error) {
+	vm, err := mem.VirtualMemory()
+	if err != nil {
+		return 0, err
+	}
+
+	return vm.UsedPercent, nil
+}
+
+// 采集磁盘使用率
+func collectDisk() (map[string]float64, error) {
+	// 获取系统所有挂载点
+	partitions, err := disk.Partitions(false)
+	if err != nil {
+		return nil, err
+	}
+
+	// 初始化返回值
+	diskUsageMap := make(map[string]float64)
+
+	// 遍历所有挂载点，采集磁盘使用率
+	for _, partition := range partitions {
+		// 只处理本地文件系统，跳过网络文件系统
+		if partition.Fstype == "" {
+			continue
+		}
+
+		// 采集磁盘使用率
+		usage, err := disk.Usage(partition.Mountpoint)
+		if err != nil {
+			continue
+		}
+
+		// 保存磁盘使用率
+		diskUsageMap[partition.Mountpoint] = usage.UsedPercent
+	}
+
+	return diskUsageMap, nil
+}
+
+// 采集网络流量
+func collectNetwork() (uint64, uint64, error) {
+	ioCounters, err := net.IOCounters(false)
+	if err != nil {
+		return 0, 0, err
+	}
+
+	if len(ioCounters) == 0 {
+		return 0, 0, nil
+	}
+
+	// 获取当前时间和流量
+	currentTime := time.Now()
+	currentBytesSent := ioCounters[0].BytesSent
+	currentBytesReceived := ioCounters[0].BytesRecv
+
+	// 计算速率
+	var bytesSentRate, bytesReceivedRate uint64
+	if !lastCollectTime.IsZero() {
+		// 计算时间差（秒）
+		timeDiff := currentTime.Sub(lastCollectTime).Seconds()
+		if timeDiff > 0 {
+			// 计算流量差
+			sentDiff := currentBytesSent - lastBytesSent
+			receivedDiff := currentBytesReceived - lastBytesReceived
+
+			// 计算速率（bytes/s）
+			bytesSentRate = uint64(float64(sentDiff) / timeDiff)
+			bytesReceivedRate = uint64(float64(receivedDiff) / timeDiff)
+		}
+	}
+
+	// 更新上一次采集的值
+	lastBytesSent = currentBytesSent
+	lastBytesReceived = currentBytesReceived
+	lastCollectTime = currentTime
+
+	// 返回速率而不是累计流量
+	return bytesSentRate, bytesReceivedRate, nil
+}
+
+// 采集所有监控指标
+func collectMetrics() (*Metrics, error) {
+	metrics := &Metrics{}
+
+	// 采集CPU使用率
+	cpuUsage, err := collectCPU()
+	if err != nil {
+		return nil, fmt.Errorf("failed to collect CPU metrics: %w", err)
+	}
+	metrics.CPU = cpuUsage
+
+	// 采集内存使用率
+	memoryUsage, err := collectMemory()
+	if err != nil {
+		return nil, fmt.Errorf("failed to collect memory metrics: %w", err)
+	}
+	metrics.Memory = memoryUsage
+
+	// 采集磁盘使用率
+	diskUsageMap, err := collectDisk()
+	if err != nil {
+		return nil, fmt.Errorf("failed to collect disk metrics: %w", err)
+	}
+	metrics.Disk = diskUsageMap
+
+	// 采集网络流量
+	bytesSent, bytesReceived, err := collectNetwork()
+	if err != nil {
+		return nil, fmt.Errorf("failed to collect network metrics: %w", err)
+	}
+	// 直接使用采集到的累计流量
+	metrics.Network.BytesSent = bytesSent
+	metrics.Network.BytesReceived = bytesReceived
+
+	return metrics, nil
+}
+
+// 发送指标到服务器
+func sendMetrics(metrics *Metrics) error {
+	// 创建HTTP客户端
+	client := &http.Client{
+		Timeout: 10 * time.Second,
+	}
+
+	// 将指标转换为JSON
+	jsonData, err := json.Marshal(metrics)
+	if err != nil {
+		return err
+	}
+
+	// 创建请求
+	req, err := http.NewRequest("POST", fmt.Sprintf("%s/metrics", config.ServerURL), bytes.NewBuffer(jsonData))
+	if err != nil {
+		return err
+	}
+
+	// 设置请求头
+	req.Header.Set("Content-Type", "application/json")
+	// 使用DeviceID作为设备唯一标识，与设备管理中的ID匹配
+	deviceID := config.DeviceID
+	if deviceID == "" {
+		deviceID = config.ID
+	}
+	req.Header.Set("X-Device-ID", deviceID)
+	// 设置Agent名称
+	req.Header.Set("X-Agent-Name", config.Name)
+	// 设置设备认证令牌
+	req.Header.Set("X-Device-Token", config.Token)
+
+	// 发送请求
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	// 检查响应状态码
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("server returned status code %d", resp.StatusCode)
+	}
+
+	return nil
+}
+
+// 启动HTTP服务器，提供本地指标查询
+// func startHTTPServer() {
+// 	// 指标查询端点
+// 	http.HandleFunc("/metrics", func(w http.ResponseWriter, r *http.Request) {
+// 		metrics, err := collectMetrics()
+// 		if err != nil {
+// 			http.Error(w, err.Error(), http.StatusInternalServerError)
+// 			return
+// 		}
+
+// 		// 设置响应头
+// 		w.Header().Set("Content-Type", "application/json")
+// 		// 返回JSON响应
+// 		json.NewEncoder(w).Encode(metrics)
+// 	})
+
+// 	// 健康检查端点
+// 	http.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
+// 		w.WriteHeader(http.StatusOK)
+// 		w.Write([]byte("OK"))
+// 	})
+
+// 	// 启动服务器
+// 	log.Println("Starting HTTP server on :8081")
+// 	if err := http.ListenAndServe(":8081", nil); err != nil {
+// 		log.Fatalf("Failed to start HTTP server: %v", err)
+// 	}
+// }
+
+func main() {
+	// 初始化配置
+	initConfig()
+
+	// 启动HTTP服务器（异步）
+	// go startHTTPServer()
+
+	log.Printf("Agent started, reporting to %s every %v", config.ServerURL, config.Interval)
+
+	// 启动时立即采集和发送一次指标
+	collectAndSendMetrics()
+
+	// 定期采集和发送指标
+	ticker := time.NewTicker(parsedInterval)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ticker.C:
+			collectAndSendMetrics()
+		}
+	}
+}
+
+// 采集并发送指标
+func collectAndSendMetrics() {
+	// 采集指标
+	metrics, err := collectMetrics()
+	if err != nil {
+		log.Printf("Failed to collect metrics: %v", err)
+		return
+	}
+
+	// 发送指标
+	if err := sendMetrics(metrics); err != nil {
+		log.Printf("Failed to send metrics: %v", err)
+		return
+	}
+
+	// 计算平均磁盘使用率
+	totalDiskUsage := 0.0
+	diskCount := 0
+	for _, usage := range metrics.Disk {
+		totalDiskUsage += usage
+		diskCount++
+	}
+	averageDiskUsage := 0.0
+	if diskCount > 0 {
+		averageDiskUsage = totalDiskUsage / float64(diskCount)
+	}
+
+	log.Printf("Metrics sent successfully: Agent=%s, CPU=%.2f%%, Memory=%.2f%%, Disk=%.2f%%",
+		config.Name, metrics.CPU, metrics.Memory, averageDiskUsage)
+}