agent binary - show correct cores in lxc

This commit is contained in:
Henry Dollman
2024-09-26 15:00:48 -04:00
parent 8621a45383
commit e88e2bf3dc
4 changed files with 13 additions and 4 deletions

View File

@@ -211,7 +211,12 @@ func (a *Agent) getSystemStats() (system.Info, system.Stats) {
systemInfo.Cores = cores
}
if threads, err := cpu.Counts(true); err == nil {
systemInfo.Threads = threads
if threads > 0 && threads < systemInfo.Cores {
// in lxc logical cores reflects container limits, so use that as cores if lower
systemInfo.Cores = threads
} else {
systemInfo.Threads = threads
}
}
return systemInfo, systemStats

View File

@@ -48,7 +48,7 @@ type Info struct {
Hostname string `json:"h"`
KernelVersion string `json:"k,omitempty"`
Cores int `json:"c"`
Threads int `json:"t"`
Threads int `json:"t,omitempty"`
CpuModel string `json:"m"`
// Os string `json:"o"`
Uptime uint64 `json:"u"`