KJZH001/nezhahq-agent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

service: logging to syslog (#33)

Browse Source 
* service: logging to syslog

* chore: update gopsutil to v4

* chore: move println() to the util package

* gpu: only return 0 on failure
This commit is contained in:
UUBulb
2024-07-05 22:31:56 +08:00
committed by GitHub
parent 532bca8867
commit fb7b45527b
12 changed files with 94 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/gpu/stat/stat_darwin.go
+1 -1
View File
@@ -30,7 +30,7 @@ func GetGPUStat() (float64, error) {
ioreg := exec.Command("ioreg", "-rd1", "-c", "IOAccelerator")
gs, err := extractGPUStat(ioreg)
if err != nil || len(gs) == 0 {
return -1, err
return 0, err
}
return gs[0], nil
}
pkg/gpu/stat/stat_freebsd.go
+2 -2
View File
@@ -3,5 +3,5 @@
package stat
func GetGPUStat() (float64, error) {
return -1, nil
}
return 0, nil
}
pkg/gpu/stat/stat_linux.go
+1 -1
View File
@@ -38,7 +38,7 @@ func GetGPUStat() (float64, error) {
gs, err = getAMDStat()
}
if err != nil || len(gs) == 0 {
return -1, err
return 0, err
}
return gs[0], nil
}
pkg/gpu/stat/stat_windows.go
+4 -4
View File
@@ -11,7 +11,7 @@ import (
func GetGPUStat() (float64, error) {
shellPath, err := exec.LookPath("powershell.exe")
if err != nil || shellPath == "" {
return -1, err
return 0, err
}
cmd := exec.Command(
shellPath,
@@ -20,12 +20,12 @@ func GetGPUStat() (float64, error) {
)
output, err1 := cmd.CombinedOutput()
if err1 != nil {
return -1, err1
return 0, err1
}
t := strings.TrimSpace(string(output))
gs, err2 := strconv.ParseFloat(t, 64)
if err2 != nil {
return -1, err2
return 0, err2
}
return gs, nil
}
}
pkg/monitor/monitor.go
+22 -25
View File
@@ -13,17 +13,19 @@ import (
"time"
"github.com/dean2021/goss"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/disk"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v3/load"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v3/net"
"github.com/shirou/gopsutil/v3/process"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/disk"
"github.com/shirou/gopsutil/v4/host"
"github.com/shirou/gopsutil/v4/load"
"github.com/shirou/gopsutil/v4/mem"
"github.com/shirou/gopsutil/v4/net"
"github.com/shirou/gopsutil/v4/process"
"github.com/shirou/gopsutil/v4/sensors"
"github.com/nezhahq/agent/model"
"github.com/nezhahq/agent/pkg/gpu"
gpustat "github.com/nezhahq/agent/pkg/gpu/stat"
"github.com/nezhahq/agent/pkg/util"
)
var (
@@ -65,7 +67,7 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host {
var cpuType string
hi, err := host.Info()
if err != nil {
println("host.Info error:", err)
util.Println("host.Info error:", err)
} else {
if hi.VirtualizationRole == "guest" {
cpuType = "Virtual"
@@ -86,7 +88,7 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host {
cpuModelCount := make(map[string]int)
ci, err := cpu.Info()
if err != nil {
println("cpu.Info error:", err)
util.Println("cpu.Info error:", err)
} else {
for i := 0; i < len(ci); i++ {
cpuModelCount[ci[i].ModelName]++
@@ -108,7 +110,7 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host {
mv, err := mem.VirtualMemory()
if err != nil {
println("mem.VirtualMemory error:", err)
util.Println("mem.VirtualMemory error:", err)
} else {
ret.MemTotal = mv.Total
if runtime.GOOS != "windows" {
@@ -119,7 +121,7 @@ func GetHost(agentConfig *model.AgentConfig) *model.Host {
if runtime.GOOS == "windows" {
ms, err := mem.SwapMemory()
if err != nil {
println("mem.SwapMemory error:", err)
util.Println("mem.SwapMemory error:", err)
} else {
ret.SwapTotal = ms.Total
}
@@ -139,14 +141,14 @@ func GetState(agentConfig *model.AgentConfig, skipConnectionCount bool, skipProc
cp, err := cpu.Percent(0, false)
if err != nil || len(cp) == 0 {
println("cpu.Percent error:", err)
util.Println("cpu.Percent error:", err)
} else {
ret.CPU = cp[0]
}
vm, err := mem.VirtualMemory()
if err != nil {
println("mem.VirtualMemory error:", err)
util.Println("mem.VirtualMemory error:", err)
} else {
ret.MemUsed = vm.Total - vm.Available
if runtime.GOOS != "windows" {
@@ -157,7 +159,7 @@ func GetState(agentConfig *model.AgentConfig, skipConnectionCount bool, skipProc
// gopsutil 在 Windows 下不能正确取 swap
ms, err := mem.SwapMemory()
if err != nil {
println("mem.SwapMemory error:", err)
util.Println("mem.SwapMemory error:", err)
} else {
ret.SwapUsed = ms.Used
}
@@ -167,7 +169,7 @@ func GetState(agentConfig *model.AgentConfig, skipConnectionCount bool, skipProc
loadStat, err := load.Avg()
if err != nil {
println("load.Avg error:", err)
util.Println("load.Avg error:", err)
} else {
ret.Load1 = loadStat.Load1
ret.Load5 = loadStat.Load5
@@ -178,7 +180,7 @@ func GetState(agentConfig *model.AgentConfig, skipConnectionCount bool, skipProc
if !skipProcsCount {
procs, err = process.Pids()
if err != nil {
println("process.Pids error:", err)
util.Println("process.Pids error:", err)
} else {
ret.ProcessCount = uint64(len(procs))
}
@@ -325,13 +327,13 @@ func updateGPUStat(agentConfig *model.AgentConfig, gpuStat *uint64) {
if agentConfig.GPU {
gs, err := gpustat.GetGPUStat()
if err != nil {
fmt.Println("gpustat.GetGPUStat error:", err)
util.Println("gpustat.GetGPUStat error:", err)
atomicStoreFloat64(gpuStat, gs)
} else {
atomicStoreFloat64(gpuStat, gs)
}
} else {
atomicStoreFloat64(gpuStat, -1)
atomicStoreFloat64(gpuStat, 0)
}
}
@@ -342,10 +344,10 @@ func updateTemperatureStat() {
defer atomic.StoreInt32(&updateTempStatus, 0)
if deviceDataFetchAttempts["Temperatures"] <= maxDeviceDataFetchAttempts {
temperatures, err := host.SensorsTemperatures()
temperatures, err := sensors.SensorsTemperatures()
if err != nil {
deviceDataFetchAttempts["Temperatures"]++
println("host.SensorsTemperatures error:", err, "attempt:", deviceDataFetchAttempts["Temperatures"])
util.Println("host.SensorsTemperatures error:", err, "attempt:", deviceDataFetchAttempts["Temperatures"])
} else {
deviceDataFetchAttempts["Temperatures"] = 0
tempStat := []model.SensorTemperature{}
@@ -374,11 +376,6 @@ func isListContainsStr(list []string, str string) bool {
return false
}
func println(v ...interface{}) {
fmt.Printf("NEZHA@%s>> ", time.Now().Format("2006-01-02 15:04:05"))
fmt.Println(v...)
}
func atomicStoreFloat64(x *uint64, v float64) {
atomic.StoreUint64(x, math.Float64bits(v))
}
pkg/pty/pty_windows.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"github.com/UserExistsError/conpty"
"github.com/artdarek/go-unzip"
"github.com/iamacarpet/go-winpty"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v4/host"
)
var isWin10 bool
pkg/util/util.go
+17 -1
View File
@@ -1,13 +1,29 @@
package util
import (
"fmt"
"os"
"runtime"
"time"
jsoniter "github.com/json-iterator/go"
"github.com/nezhahq/service"
)
var Json = jsoniter.ConfigCompatibleWithStandardLibrary
var (
Json = jsoniter.ConfigCompatibleWithStandardLibrary
Logger service.Logger
)
func IsWindows() bool {
return os.PathSeparator == '\\' && os.PathListSeparator == ';'
}
func Println(v ...interface{}) {
if runtime.GOOS != "darwin" {
Logger.Infof("NEZHA@%s>> %v", time.Now().Format("2006-01-02 15:04:05"), fmt.Sprint(v...))
} else {
fmt.Printf("NEZHA@%s>> ", time.Now().Format("2006-01-02 15:04:05"))
fmt.Println(v...)
}
}