diff --git a/README.md b/README.md index d4282d6..49b1491 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ Agent of Nezha Monitoring naiba - - Crazy - zhangnew + + Crazy + 卖女孩的小火柴 diff --git a/pkg/monitor/monitor.go b/pkg/monitor/monitor.go index 35d11ee..6900184 100644 --- a/pkg/monitor/monitor.go +++ b/pkg/monitor/monitor.go @@ -58,15 +58,17 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host { ret.BootTime = hi.BootTime } + cpuModelCount := make(map[string]int) ci, err := cpu.Info() if err != nil { println("cpu.Info error:", err) - } - count, err := cpu.Counts(false) - if err != nil { - println("cpu.Counts error:", err) - } else if len(ci) > 0 { - ret.CPU = append(ret.CPU, fmt.Sprintf("%s %d %s Core", ci[0].ModelName, count, cpuType)) + } else { + for i := 0; i < len(ci); i++ { + cpuModelCount[ci[i].ModelName]++ + } + for model, count := range cpuModelCount { + ret.CPU = append(ret.CPU, fmt.Sprintf("%s %d %s Core", model, count, cpuType)) + } } ret.DiskTotal, _ = getDiskTotalAndUsed(agentConfig)