fankes/beszel
2
0
Fork 0
mirror of https://github.com/fankes/beszel.git synced 2025-10-20 02:09:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add SYS_SENSORS env var

Browse Source
This commit is contained in:
Henry Dollman
2024-09-14 18:46:16 -04:00
parent 3e95269a7c
commit 3aeca6af2f
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
beszel/internal/agent/agent.go
View File

@@ -21,6 +21,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/shirou/gopsutil/v4/common"
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/disk" "github.com/shirou/gopsutil/v4/disk"
"github.com/shirou/gopsutil/v4/host" "github.com/shirou/gopsutil/v4/host"
@@ -42,6 +43,7 @@ type Agent struct {
netInterfaces map[string]struct{} netInterfaces map[string]struct{}
netIoStats *system.NetIoStats netIoStats *system.NetIoStats
dockerClient *http.Client dockerClient *http.Client
sensorsContext context.Context
bufferPool *sync.Pool bufferPool *sync.Pool
} }
@@ -54,6 +56,7 @@ func NewAgent(pubKey []byte, addr string) *Agent {
containerStatsMutex: &sync.Mutex{}, containerStatsMutex: &sync.Mutex{},
netIoStats: &system.NetIoStats{}, netIoStats: &system.NetIoStats{},
dockerClient: newDockerClient(), dockerClient: newDockerClient(),
sensorsContext: context.Background(),
bufferPool: &sync.Pool{ bufferPool: &sync.Pool{
New: func() interface{} { New: func() interface{} {
return new(bytes.Buffer) return new(bytes.Buffer)
@@ -177,7 +180,7 @@ func (a *Agent) getSystemStats() (system.Info, system.Stats) {
} }
// temperatures // temperatures
if temps, err := sensors.SensorsTemperatures(); err == nil { if temps, err := sensors.TemperaturesWithContext(a.sensorsContext); err == nil {
systemStats.Temperatures = make(map[string]float64) systemStats.Temperatures = make(map[string]float64)
// log.Printf("Temperatures: %+v\n", temps) // log.Printf("Temperatures: %+v\n", temps)
for i, temp := range temps { for i, temp := range temps {
@@ -438,6 +441,14 @@ func (a *Agent) Run() {
} }
} }
// set sensors context (allows overriding sys location for sensors)
if sysSensors, exists := os.LookupEnv("SYS_SENSORS"); exists {
// log.Println("Using sys location for sensors:", sysSensors)
a.sensorsContext = context.WithValue(a.sensorsContext,
common.EnvKey, common.EnvMap{common.HostSysEnvKey: sysSensors},
)
}
a.initializeDiskInfo(fsEnvVarExists) a.initializeDiskInfo(fsEnvVarExists)
a.initializeDiskIoStats() a.initializeDiskIoStats()
a.initializeNetIoStats() a.initializeNetIoStats()