jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-08-18 08:17:47 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

agent: simplify FreeBSD temperature sensor names

Browse Source
This commit is contained in:
henrygd
2026-08-16 21:15:06 -04:00
parent 9f1128933f
commit ae037b278e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
agent/sensors_freebsd_common.go
View File

@@ -22,15 +22,15 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
return nil, err return nil, err
} }
temps := make([]sensors.TemperatureStat, 0, int(cpuCount)+freebsdAcpiThermalZoneCount) temps := make([]sensors.TemperatureStat, 0, int(cpuCount)+freebsdAcpiThermalZoneCount)
for cpu := uint32(0); cpu < cpuCount; cpu++ { for cpu := range cpuCount {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return temps, ctx.Err() return temps, ctx.Err()
default: default:
} }
sensorName := fmt.Sprintf("dev.cpu.%d.temperature", cpu) sysctlName := fmt.Sprintf("dev.cpu.%d.temperature", cpu)
value, err := readSysctl(sensorName) value, err := readSysctl(sysctlName)
if err != nil { if err != nil {
continue continue
} }
@@ -39,7 +39,7 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
continue continue
} }
temps = append(temps, sensors.TemperatureStat{ temps = append(temps, sensors.TemperatureStat{
SensorKey: sensorName, SensorKey: fmt.Sprintf("cpu.%d", cpu),
Temperature: temp, Temperature: temp,
}) })
} }
@@ -51,8 +51,8 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
default: default:
} }
sensorName := fmt.Sprintf("hw.acpi.thermal.tz%d.temperature", zone) sysctlName := fmt.Sprintf("hw.acpi.thermal.tz%d.temperature", zone)
value, err := readSysctl(sensorName) value, err := readSysctl(sysctlName)
if err != nil { if err != nil {
continue continue
} }
@@ -61,7 +61,7 @@ func getFreeBSDSensorTemps(ctx context.Context, readSysctl freebsdSysctlUintRead
continue continue
} }
temps = append(temps, sensors.TemperatureStat{ temps = append(temps, sensors.TemperatureStat{
SensorKey: sensorName, SensorKey: fmt.Sprintf("acpi.thermal.tz%d", zone),
Temperature: temp, Temperature: temp,
}) })
} }

10
agent/sensors_freebsd_common_test.go
View File

@@ -103,13 +103,13 @@ func TestGetFreeBSDSensorTemps(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Len(t, temps, 4) require.Len(t, temps, 4)
assert.Equal(t, "dev.cpu.0.temperature", temps[0].SensorKey) assert.Equal(t, "cpu.0", temps[0].SensorKey)
assert.InDelta(t, 50.0, temps[0].Temperature, 0.001) assert.InDelta(t, 50.0, temps[0].Temperature, 0.001)
assert.Equal(t, "dev.cpu.1.temperature", temps[1].SensorKey) assert.Equal(t, "cpu.1", temps[1].SensorKey)
assert.InDelta(t, 51.1, temps[1].Temperature, 0.001) assert.InDelta(t, 51.1, temps[1].Temperature, 0.001)
assert.Equal(t, "hw.acpi.thermal.tz0.temperature", temps[2].SensorKey) assert.Equal(t, "acpi.thermal.tz0", temps[2].SensorKey)
assert.InDelta(t, 37.0, temps[2].Temperature, 0.001) assert.InDelta(t, 37.0, temps[2].Temperature, 0.001)
assert.Equal(t, "hw.acpi.thermal.tz2.temperature", temps[3].SensorKey) assert.Equal(t, "acpi.thermal.tz2", temps[3].SensorKey)
assert.InDelta(t, 38.5, temps[3].Temperature, 0.001) assert.InDelta(t, 38.5, temps[3].Temperature, 0.001)
} }
@@ -149,7 +149,7 @@ func TestGetFreeBSDSensorTempsAcpiOnly(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Len(t, temps, 1) require.Len(t, temps, 1)
assert.Equal(t, "hw.acpi.thermal.tz0.temperature", temps[0].SensorKey) assert.Equal(t, "acpi.thermal.tz0", temps[0].SensorKey)
assert.InDelta(t, 35.0, temps[0].Temperature, 0.001) assert.InDelta(t, 35.0, temps[0].Temperature, 0.001)
} }