tcjlj/nezha
1
0
Fork 0
mirror of https://github.com/nezhahq/nezha.git synced 2025-02-02 01:28:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "fix: correct minor typos in disk usage statistic"

Browse Source 
This reverts commit aebc257444.
This commit is contained in:
naiba 2021-02-27 18:56:59 +08:00
parent 8cd3612d07
commit 2133973579
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
service/monitor/monitor.go
View File

@ -35,13 +35,7 @@ func GetHost() *model.Host {
}
mv, _ := mem.VirtualMemory()
ms, _ := mem.SwapMemory()
u, _ := disk.Partitions(false)
var total uint64 = 0
for _, dev := range u {
usage, _ := disk.Usage(dev.Mountpoint)
total += usage.Total
}
fmt.Println(total)
u, _ := disk.Usage("/")
var ip ipDotSbGeoIP
resp, err := http.Get("https://api-ipv4.ip.sb/geoip")
if err == nil {
@ -60,7 +54,7 @@ func GetHost() *model.Host {
PlatformVersion: hi.PlatformVersion,
CPU: cpus,
MemTotal: mv.Total,
DiskTotal: total,
DiskTotal: u.Total,
SwapTotal: ms.Total,
Arch: hi.KernelArch,
Virtualization: hi.VirtualizationSystem,
@ -83,18 +77,13 @@ func GetState(delay int64) *model.HostState {
cpuPercent = cp[0]
}
// Disk
u, _ := disk.Partitions(false)
var used uint64 = 0
for _, dev := range u {
usage, _ := disk.Usage(dev.Mountpoint)
used += usage.Used
}
u, _ := disk.Usage("/")
return &model.HostState{
CPU: cpuPercent,
MemUsed: mv.Used,
SwapUsed: ms.Used,
DiskUsed: used,
DiskUsed: u.Used,
NetInTransfer: atomic.LoadUint64(&netInTransfer),
NetOutTransfer: atomic.LoadUint64(&netOutTransfer),
NetInSpeed: atomic.LoadUint64(&netInSpeed),