add temperature chart

beszel/internal/agent/agent.go

@@ -15,6 +15,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -23,6 +24,7 @@ import (
 	"github.com/shirou/gopsutil/v4/disk"
 	"github.com/shirou/gopsutil/v4/host"
 	"github.com/shirou/gopsutil/v4/mem"
+	"github.com/shirou/gopsutil/v4/sensors"
 
 	sshServer "github.com/gliderlabs/ssh"
 	psutilNet "github.com/shirou/gopsutil/v4/net"
@@ -140,6 +142,21 @@ func (a *Agent) getSystemStats() (*system.Info, *system.Stats) {
 		a.netIoStats.Time = time.Now()
 	}
 
+	// temperatures
+	if temps, err := sensors.SensorsTemperatures(); err == nil {
+		systemStats.Temperatures = make(map[string]float64)
+		// log.Printf("Temperatures: %+v\n", temps)
+		for i, temp := range temps {
+			if _, ok := systemStats.Temperatures[temp.SensorKey]; ok {
+				// if key already exists, append int to key
+				systemStats.Temperatures[temp.SensorKey+"_"+strconv.Itoa(i)] = twoDecimals(temp.Temperature)
+			} else {
+				systemStats.Temperatures[temp.SensorKey] = twoDecimals(temp.Temperature)
+			}
+		}
+		// log.Printf("Temperature map: %+v\n", systemStats.Temperatures)
+	}
+
 	systemInfo := &system.Info{
 		Cpu:          systemStats.Cpu,
 		MemPct:       systemStats.MemPct,

beszel/internal/entities/system/system.go

@@ -6,20 +6,21 @@ import (
 )
 
 type Stats struct {
-	Cpu          float64 `json:"cpu"`
-	Mem          float64 `json:"m"`
-	MemUsed      float64 `json:"mu"`
-	MemPct       float64 `json:"mp"`
-	MemBuffCache float64 `json:"mb"`
-	Swap         float64 `json:"s"`
-	SwapUsed     float64 `json:"su"`
-	Disk         float64 `json:"d"`
-	DiskUsed     float64 `json:"du"`
-	DiskPct      float64 `json:"dp"`
-	DiskRead     float64 `json:"dr"`
-	DiskWrite    float64 `json:"dw"`
-	NetworkSent  float64 `json:"ns"`
-	NetworkRecv  float64 `json:"nr"`
+	Cpu          float64            `json:"cpu"`
+	Mem          float64            `json:"m"`
+	MemUsed      float64            `json:"mu"`
+	MemPct       float64            `json:"mp"`
+	MemBuffCache float64            `json:"mb"`
+	Swap         float64            `json:"s"`
+	SwapUsed     float64            `json:"su"`
+	Disk         float64            `json:"d"`
+	DiskUsed     float64            `json:"du"`
+	DiskPct      float64            `json:"dp"`
+	DiskRead     float64            `json:"dr"`
+	DiskWrite    float64            `json:"dw"`
+	NetworkSent  float64            `json:"ns"`
+	NetworkRecv  float64            `json:"nr"`
+	Temperatures map[string]float64 `json:"t,omitempty"`
 }
 
 type DiskIoStats struct {

beszel/internal/records/records.go

@@ -166,7 +166,11 @@ func (rm *RecordManager) CreateLongerRecords() {
 // Calculate the average stats of a list of system_stats records without reflect
 func (rm *RecordManager) AverageSystemStats(records []*models.Record) system.Stats {
 	var sum system.Stats
+	sum.Temperatures = make(map[string]float64)
+
 	count := float64(len(records))
+	// use different counter for temps in case some records don't have them
+	tempCount := float64(0)
 
 	var stats system.Stats
 	for _, record := range records {
@@ -185,9 +189,18 @@ func (rm *RecordManager) AverageSystemStats(records []*models.Record) system.Sta
 		sum.DiskWrite += stats.DiskWrite
 		sum.NetworkSent += stats.NetworkSent
 		sum.NetworkRecv += stats.NetworkRecv
+		if stats.Temperatures != nil {
+			tempCount++
+			for key, value := range stats.Temperatures {
+				if _, ok := sum.Temperatures[key]; !ok {
+					sum.Temperatures[key] = 0
+				}
+				sum.Temperatures[key] += value
+			}
+		}
 	}
 
-	return system.Stats{
+	stats = system.Stats{
 		Cpu:          twoDecimals(sum.Cpu / count),
 		Mem:          twoDecimals(sum.Mem / count),
 		MemUsed:      twoDecimals(sum.MemUsed / count),
@@ -203,6 +216,15 @@ func (rm *RecordManager) AverageSystemStats(records []*models.Record) system.Sta
 		NetworkSent:  twoDecimals(sum.NetworkSent / count),
 		NetworkRecv:  twoDecimals(sum.NetworkRecv / count),
 	}
+
+	if len(sum.Temperatures) != 0 {
+		stats.Temperatures = make(map[string]float64)
+		for key, value := range sum.Temperatures {
+			stats.Temperatures[key] = twoDecimals(value / tempCount)
+		}
+	}
+
+	return stats
 }
 
 // Calculate the average stats of a list of container_stats records