From 429a027c7912f4c5942c629723133ebd968e8242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Mon, 26 Feb 2024 16:30:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A3=81=E7=9B=98=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=BA=E5=BA=8F=E8=B9=A6=E8=BF=AA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/tools/tools.go | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go
index d8cb5cad..0ec9bf5d 100644
--- a/pkg/tools/tools.go
+++ b/pkg/tools/tools.go
@@ -23,16 +23,16 @@ import (
 
 // MonitoringInfo 监控信息
 type MonitoringInfo struct {
-	Cpus      []cpu.InfoStat                 `json:"cpus"`
-	Percent   []float64                      `json:"percent"`
-	Load      *load.AvgStat                  `json:"load"`
-	Host      *host.InfoStat                 `json:"host"`
-	Mem       *mem.VirtualMemoryStat         `json:"mem"`
-	Swap      *mem.SwapMemoryStat            `json:"swap"`
-	Net       []net.IOCountersStat           `json:"net"`
-	DiskIO    map[string]disk.IOCountersStat `json:"disk_io"`
-	Disk      []disk.PartitionStat           `json:"disk"`
-	DiskUsage map[string]*disk.UsageStat     `json:"disk_usage"`
+	Cpus      []cpu.InfoStat         `json:"cpus"`
+	Percent   []float64              `json:"percent"`
+	Load      *load.AvgStat          `json:"load"`
+	Host      *host.InfoStat         `json:"host"`
+	Mem       *mem.VirtualMemoryStat `json:"mem"`
+	Swap      *mem.SwapMemoryStat    `json:"swap"`
+	Net       []net.IOCountersStat   `json:"net"`
+	DiskIO    []disk.IOCountersStat  `json:"disk_io"`
+	Disk      []disk.PartitionStat   `json:"disk"`
+	DiskUsage []disk.UsageStat       `json:"disk_usage"`
 }
 
 // GetMonitoringInfo 获取监控数据
@@ -45,16 +45,19 @@ func GetMonitoringInfo() MonitoringInfo {
 	res.Mem, _ = mem.VirtualMemory()
 	res.Swap, _ = mem.SwapMemory()
 	res.Net, _ = net.IOCounters(true)
-	res.DiskIO, _ = disk.IOCounters()
 	res.Disk, _ = disk.Partitions(true)
 
-	res.DiskUsage = make(map[string]*disk.UsageStat)
+	ioCounters, _ := disk.IOCounters()
+	for _, io := range ioCounters {
+		res.DiskIO = append(res.DiskIO, io)
+	}
+
 	for _, partition := range res.Disk {
 		if strings.HasPrefix(partition.Mountpoint, "/dev") || strings.HasPrefix(partition.Mountpoint, "/sys") || strings.HasPrefix(partition.Mountpoint, "/proc") || strings.HasPrefix(partition.Mountpoint, "/run") || strings.HasPrefix(partition.Mountpoint, "/boot") || strings.HasPrefix(partition.Mountpoint, "/usr") || strings.HasPrefix(partition.Mountpoint, "/var") {
 			continue
 		}
 		usage, _ := disk.Usage(partition.Mountpoint)
-		res.DiskUsage[partition.Mountpoint] = usage
+		res.DiskUsage = append(res.DiskUsage, *usage)
 	}
 
 	return res