[Feature] Add detailed CPU metrics (User, System, IOWait, Steal) with per-core monitoring (#1356)

* Add user, system io wait

* add per cpu core

* add total

.github/workflows/docker-images.yml

@@ -10,7 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      max-parallel: 5
       matrix:
         include:
           # henrygd/beszel
@@ -25,18 +24,19 @@ jobs:
               type=semver,pattern={{major}}.{{minor}}
               type=semver,pattern={{major}}
               type=raw,value={{sha}},enable=${{ github.ref_type != 'tag' }}
-            
-          # henrygd/beszel-agent:alpine
+
+          # henrygd/beszel-agent
           - image: henrygd/beszel-agent
-            dockerfile: ./internal/dockerfile_agent_alpine
+            dockerfile: ./internal/dockerfile_agent
             registry: docker.io
             username_secret: DOCKERHUB_USERNAME
             password_secret: DOCKERHUB_TOKEN
             tags: |
-              type=raw,value=alpine
-              type=semver,pattern={{version}}-alpine
-              type=semver,pattern={{major}}.{{minor}}-alpine
-              type=semver,pattern={{major}}-alpine
+              type=raw,value=edge
+              type=semver,pattern={{version}}
+              type=semver,pattern={{major}}.{{minor}}
+              type=semver,pattern={{major}}
+              type=raw,value={{sha}},enable=${{ github.ref_type != 'tag' }}
 
           # henrygd/beszel-agent-nvidia
           - image: henrygd/beszel-agent-nvidia
@@ -66,6 +66,18 @@ jobs:
               type=semver,pattern={{major}}
               type=raw,value={{sha}},enable=${{ github.ref_type != 'tag' }}
 
+          # henrygd/beszel-agent:alpine
+          - image: henrygd/beszel-agent
+            dockerfile: ./internal/dockerfile_agent_alpine
+            registry: docker.io
+            username_secret: DOCKERHUB_USERNAME
+            password_secret: DOCKERHUB_TOKEN
+            tags: |
+              type=raw,value=alpine
+              type=semver,pattern={{version}}-alpine
+              type=semver,pattern={{major}}.{{minor}}-alpine
+              type=semver,pattern={{major}}-alpine
+
           # ghcr.io/henrygd/beszel
           - image: ghcr.io/${{ github.repository }}/beszel
             dockerfile: ./internal/dockerfile_hub
@@ -87,7 +99,6 @@ jobs:
             password_secret: GITHUB_TOKEN
             tags: |
               type=raw,value=edge
-              type=raw,value=latest
               type=semver,pattern={{version}}
               type=semver,pattern={{major}}.{{minor}}
               type=semver,pattern={{major}}
@@ -133,19 +144,6 @@ jobs:
               type=semver,pattern={{major}}.{{minor}}-alpine
               type=semver,pattern={{major}}-alpine
 
-          # henrygd/beszel-agent (keep at bottom so it gets built after :alpine and gets the latest tag)
-          - image: henrygd/beszel-agent
-            dockerfile: ./internal/dockerfile_agent
-            registry: docker.io
-            username_secret: DOCKERHUB_USERNAME
-            password_secret: DOCKERHUB_TOKEN
-            tags: |
-              type=raw,value=edge
-              type=semver,pattern={{version}}
-              type=semver,pattern={{major}}.{{minor}}
-              type=semver,pattern={{major}}
-              type=raw,value={{sha}},enable=${{ github.ref_type != 'tag' }}
-
     permissions:
       contents: read
       packages: write

.github/workflows/inactivity-actions.yml

@@ -10,25 +10,12 @@ permissions:
   pull-requests: write
 
 jobs:
-  lock-inactive:
-    name: Lock Inactive Issues
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: klaasnicolaas/action-inactivity-lock@v1.1.3
-        id: lock
-        with:
-          days-inactive-issues: 14
-          lock-reason-issues: ""
-          # Action can not skip PRs, set it to 100 years to cover it.
-          days-inactive-prs: 36524
-          lock-reason-prs: ""
-
   close-stale:
     name: Close Stale Issues
     runs-on: ubuntu-24.04
     steps:
       - name: Close Stale Issues
-        uses: actions/stale@v10
+        uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -45,8 +32,6 @@ jobs:
           # Timing
           days-before-issue-stale: 14
           days-before-issue-close: 7
-          # Action can not skip PRs, set it to 100 years to cover it.
-          days-before-pr-stale: 36524
 
           # Labels
           stale-issue-label: 'stale'

.goreleaser.yml

@@ -5,7 +5,6 @@ project_name: beszel
 before:
   hooks:
     - go mod tidy
-    - go generate -run fetchsmartctl ./agent
 
 builds:
   - id: beszel
@@ -16,21 +15,10 @@ builds:
     goos:
       - linux
       - darwin
-      - windows
-      - freebsd
     goarch:
       - amd64
       - arm64
       - arm
-    ignore:
-      - goos: windows
-        goarch: arm64
-      - goos: windows
-        goarch: arm
-      - goos: freebsd
-        goarch: arm64
-      - goos: freebsd
-        goarch: arm
 
   - id: beszel-agent
     binary: beszel-agent
@@ -97,9 +85,6 @@ archives:
       {{ .Binary }}_
       {{- .Os }}_
       {{- .Arch }}
-    format_overrides:
-      - goos: windows
-        formats: [zip]
 
 nfpms:
   - id: beszel-agent

Makefile

@@ -7,7 +7,7 @@ SKIP_WEB ?= false
 # Set executable extension based on target OS
 EXE_EXT := $(if $(filter windows,$(OS)),.exe,)
 
-.PHONY: tidy build-agent build-hub build-hub-dev build clean lint dev-server dev-agent dev-hub dev generate-locales fetch-smartctl-conditional
+.PHONY: tidy build-agent build-hub build-hub-dev build clean lint dev-server dev-agent dev-hub dev generate-locales
 .DEFAULT_GOAL := build
 
 clean:
@@ -46,14 +46,8 @@ build-dotnet-conditional:
 		fi; \
 	fi
 
-# Download smartctl.exe at build time for Windows (skips if already present)
-fetch-smartctl-conditional:
-	@if [ "$(OS)" = "windows" ]; then \
-		go generate -run fetchsmartctl ./agent; \
-	fi
-
 # Update build-agent to include conditional .NET build
-build-agent: tidy build-dotnet-conditional fetch-smartctl-conditional
+build-agent: tidy build-dotnet-conditional
 	GOOS=$(OS) GOARCH=$(ARCH) go build -o ./build/beszel-agent_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./internal/cmd/agent
 
 build-hub: tidy $(if $(filter false,$(SKIP_WEB)),build-web-ui)

agent/agent.go

@@ -12,12 +12,10 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/gliderlabs/ssh"
 	"github.com/henrygd/beszel"
 	"github.com/henrygd/beszel/agent/deltatracker"
-	"github.com/henrygd/beszel/internal/common"
 	"github.com/henrygd/beszel/internal/entities/system"
 	"github.com/shirou/gopsutil/v4/host"
 	gossh "golang.org/x/crypto/ssh"
@@ -31,15 +29,12 @@ type Agent struct {
 	fsNames                   []string                                              // List of filesystem device names being monitored
 	fsStats                   map[string]*system.FsStats                            // Keeps track of disk stats for each filesystem
 	diskPrev                  map[uint16]map[string]prevDisk                        // Previous disk I/O counters per cache interval
-	diskUsageCacheDuration    time.Duration                                         // How long to cache disk usage (to avoid waking sleeping disks)
-	lastDiskUsageUpdate       time.Time                                             // Last time disk usage was collected
 	netInterfaces             map[string]struct{}                                   // Stores all valid network interfaces
 	netIoStats                map[uint16]system.NetIoStats                          // Keeps track of bandwidth usage per cache interval
 	netInterfaceDeltaTrackers map[uint16]*deltatracker.DeltaTracker[string, uint64] // Per-cache-time NIC delta trackers
 	dockerManager             *dockerManager                                        // Manages Docker API requests
 	sensorConfig              *SensorConfig                                         // Sensors config
-	systemInfo                system.Info                                           // Host system info (dynamic)
-	systemDetails             system.Details                                        // Host system details (static, once-per-connection)
+	systemInfo                system.Info                                           // Host system info
 	gpuManager                *GPUManager                                           // Manages GPU data
 	cache                     *systemDataCache                                      // Cache for system stats based on cache time
 	connectionManager         *ConnectionManager                                    // Channel to signal connection events
@@ -48,7 +43,6 @@ type Agent struct {
 	dataDir                   string                                                // Directory for persisting data
 	keys                      []gossh.PublicKey                                     // SSH public keys
 	smartManager              *SmartManager                                         // Manages SMART data
-	systemdManager            *systemdManager                                       // Manages systemd services
 }
 
 // NewAgent creates a new agent with the given data directory for persisting data.
@@ -74,16 +68,6 @@ func NewAgent(dataDir ...string) (agent *Agent, err error) {
 
 	agent.memCalc, _ = GetEnv("MEM_CALC")
 	agent.sensorConfig = agent.newSensorConfig()
-
-	// Parse disk usage cache duration (e.g., "15m", "1h") to avoid waking sleeping disks
-	if diskUsageCache, exists := GetEnv("DISK_USAGE_CACHE"); exists {
-		if duration, err := time.ParseDuration(diskUsageCache); err == nil {
-			agent.diskUsageCacheDuration = duration
-			slog.Info("DISK_USAGE_CACHE", "duration", duration)
-		} else {
-			slog.Warn("Invalid DISK_USAGE_CACHE", "err", err)
-		}
-	}
 	// Set up slog with a log level determined by the LOG_LEVEL env var
 	if logLevelStr, exists := GetEnv("LOG_LEVEL"); exists {
 		switch strings.ToLower(logLevelStr) {
@@ -99,11 +83,8 @@ func NewAgent(dataDir ...string) (agent *Agent, err error) {
 
 	slog.Debug(beszel.Version)
 
-	// initialize docker manager
-	agent.dockerManager = newDockerManager()
-
 	// initialize system info
-	agent.refreshStaticInfo()
+	agent.initializeSystemInfo()
 
 	// initialize connection manager
 	agent.connectionManager = newConnectionManager(agent)
@@ -117,10 +98,8 @@ func NewAgent(dataDir ...string) (agent *Agent, err error) {
 	// initialize net io stats
 	agent.initializeNetIoStats()
 
-	agent.systemdManager, err = newSystemdManager()
-	if err != nil {
-		slog.Debug("Systemd", "err", err)
-	}
+	// initialize docker manager
+	agent.dockerManager = newDockerManager(agent)
 
 	agent.smartManager, err = NewSmartManager()
 	if err != nil {
@@ -135,7 +114,7 @@ func NewAgent(dataDir ...string) (agent *Agent, err error) {
 
 	// if debugging, print stats
 	if agent.debug {
-		slog.Debug("Stats", "data", agent.gatherStats(common.DataRequestOptions{CacheTimeMs: 60_000, IncludeDetails: true}))
+		slog.Debug("Stats", "data", agent.gatherStats(0))
 	}
 
 	return agent, nil
@@ -150,11 +129,10 @@ func GetEnv(key string) (value string, exists bool) {
 	return os.LookupEnv(key)
 }
 
-func (a *Agent) gatherStats(options common.DataRequestOptions) *system.CombinedData {
+func (a *Agent) gatherStats(cacheTimeMs uint16) *system.CombinedData {
 	a.Lock()
 	defer a.Unlock()
 
-	cacheTimeMs := options.CacheTimeMs
 	data, isCached := a.cache.Get(cacheTimeMs)
 	if isCached {
 		slog.Debug("Cached data", "cacheTimeMs", cacheTimeMs)
@@ -165,12 +143,6 @@ func (a *Agent) gatherStats(options common.DataRequestOptions) *system.CombinedD
 		Stats: a.getSystemStats(cacheTimeMs),
 		Info:  a.systemInfo,
 	}
-
-	// Include static info only when requested
-	if options.IncludeDetails {
-		data.Details = &a.systemDetails
-	}
-
 	// slog.Info("System data", "data", data, "cacheTimeMs", cacheTimeMs)
 
 	if a.dockerManager != nil {
@@ -182,20 +154,7 @@ func (a *Agent) gatherStats(options common.DataRequestOptions) *system.CombinedD
 		}
 	}
 
-	// skip updating systemd services if cache time is not the default 60sec interval
-	if a.systemdManager != nil && cacheTimeMs == 60_000 {
-		totalCount := uint16(a.systemdManager.getServiceStatsCount())
-		if totalCount > 0 {
-			numFailed := a.systemdManager.getFailedServiceCount()
-			data.Info.Services = []uint16{totalCount, numFailed}
-		}
-		if a.systemdManager.hasFreshStats {
-			data.SystemdServices = a.systemdManager.getServiceStats(nil, false)
-		}
-	}
-
 	data.Stats.ExtraFs = make(map[string]*system.FsStats)
-	data.Info.ExtraFsPct = make(map[string]float64)
 	for name, stats := range a.fsStats {
 		if !stats.Root && stats.DiskTotal > 0 {
 			// Use custom name if available, otherwise use device name
@@ -204,11 +163,6 @@ func (a *Agent) gatherStats(options common.DataRequestOptions) *system.CombinedD
 				key = stats.Name
 			}
 			data.Stats.ExtraFs[key] = stats
-			// Add percentages to Info struct for dashboard
-			if stats.DiskTotal > 0 {
-				pct := twoDecimals((stats.DiskUsed / stats.DiskTotal) * 100)
-				data.Info.ExtraFsPct[key] = pct
-			}
 		}
 	}
 	slog.Debug("Extra FS", "data", data.Stats.ExtraFs)
@@ -234,7 +188,7 @@ func (a *Agent) getFingerprint() string {
 	// if no fingerprint is found, generate one
 	fingerprint, err := host.HostID()
 	if err != nil || fingerprint == "" {
-		fingerprint = a.systemDetails.Hostname + a.systemDetails.CpuModel
+		fingerprint = a.systemInfo.Hostname + a.systemInfo.CpuModel
 	}
 
 	// hash fingerprint

agent/agent_cache_test.go

@@ -22,7 +22,7 @@ func createTestCacheData() *system.CombinedData {
 			DiskTotal: 100000,
 		},
 		Info: system.Info{
-			AgentVersion: "0.12.0",
+			Hostname: "test-host",
 		},
 		Containers: []*container.Stats{
 			{
@@ -128,7 +128,7 @@ func TestCacheMultipleIntervals(t *testing.T) {
 				Mem: 16384,
 			},
 			Info: system.Info{
-				AgentVersion: "0.12.0",
+				Hostname: "test-host-2",
 			},
 			Containers: []*container.Stats{},
 		}
@@ -171,7 +171,7 @@ func TestCacheOverwrite(t *testing.T) {
 			Mem: 32768,
 		},
 		Info: system.Info{
-			AgentVersion: "0.12.0",
+			Hostname: "updated-host",
 		},
 		Containers: []*container.Stats{},
 	}

agent/battery/battery.go

@@ -6,7 +6,6 @@ package battery
 import (
 	"errors"
 	"log/slog"
-	"math"
 
 	"github.com/distatus/battery"
 )
@@ -52,26 +51,21 @@ func GetBatteryStats() (batteryPercent uint8, batteryState uint8, err error) {
 	totalCharge := float64(0)
 	errs, partialErrs := err.(battery.Errors)
 
-	batteryState = math.MaxUint8
-
 	for i, bat := range batteries {
 		if partialErrs && errs[i] != nil {
 			// if there were some errors, like missing data, skip it
 			continue
 		}
-		if bat == nil || bat.Full == 0 {
+		if bat.Full == 0 {
 			// skip batteries with no capacity. Charge is unlikely to ever be zero, but
 			// we can't guarantee that, so don't skip based on charge.
 			continue
 		}
 		totalCapacity += bat.Full
 		totalCharge += bat.Current
-		if bat.State.Raw >= 0 {
-			batteryState = uint8(bat.State.Raw)
-		}
 	}
 
-	if totalCapacity == 0 || batteryState == math.MaxUint8 {
+	if totalCapacity == 0 {
 		// for macs there's sometimes a ghost battery with 0 capacity
 		// https://github.com/distatus/battery/issues/34
 		// Instead of skipping over those batteries, we'll check for total 0 capacity
@@ -80,5 +74,6 @@ func GetBatteryStats() (batteryPercent uint8, batteryState uint8, err error) {
 	}
 
 	batteryPercent = uint8(totalCharge / totalCapacity * 100)
+	batteryState = uint8(batteries[0].State.Raw)
 	return batteryPercent, batteryState, nil
 }

agent/client.go

@@ -17,7 +17,6 @@ import (
 	"github.com/henrygd/beszel/internal/common"
 	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/henrygd/beszel/internal/entities/system"
-	"github.com/henrygd/beszel/internal/entities/systemd"
 
 	"github.com/fxamacker/cbor/v2"
 	"github.com/lxzan/gws"
@@ -201,7 +200,7 @@ func (client *WebSocketClient) handleAuthChallenge(msg *common.HubRequest[cbor.R
 
 	if authRequest.NeedSysInfo {
 		response.Name, _ = GetEnv("SYSTEM_NAME")
-		response.Hostname = client.agent.systemDetails.Hostname
+		response.Hostname = client.agent.systemInfo.Hostname
 		serverAddr := client.agent.connectionManager.serverOptions.Addr
 		_, response.Port, _ = net.SplitHostPort(serverAddr)
 	}
@@ -277,8 +276,6 @@ func (client *WebSocketClient) sendResponse(data any, requestID *uint32) error {
 			response.String = &v
 		case map[string]smart.SmartData:
 			response.SmartData = v
-		case systemd.ServiceDetails:
-			response.ServiceInfo = v
 		// case []byte:
 		// 	response.RawBytes = v
 		// case string:

agent/cpu.go

@@ -4,7 +4,6 @@ import (
 	"math"
 	"runtime"
 
-	"github.com/henrygd/beszel/internal/entities/system"
 	"github.com/shirou/gopsutil/v4/cpu"
 )
 
@@ -29,7 +28,23 @@ type CpuMetrics struct {
 	System float64
 	Iowait float64
 	Steal  float64
-	Idle   float64
+}
+
+// getCpuPercent calculates the CPU usage percentage using cached previous measurements.
+// It uses the specified cache time interval to determine the time window for calculation.
+// Returns the CPU usage percentage (0-100) and any error encountered.
+func getCpuPercent(cacheTimeMs uint16) (float64, error) {
+	times, err := cpu.Times(false)
+	if err != nil || len(times) == 0 {
+		return 0, err
+	}
+	// if cacheTimeMs is not in lastCpuTimes, use 60000 as fallback lastCpuTime
+	if _, ok := lastCpuTimes[cacheTimeMs]; !ok {
+		lastCpuTimes[cacheTimeMs] = lastCpuTimes[60000]
+	}
+	delta := calculateBusy(lastCpuTimes[cacheTimeMs], times[0])
+	lastCpuTimes[cacheTimeMs] = times[0]
+	return delta, nil
 }
 
 // getCpuMetrics calculates detailed CPU usage metrics using cached previous measurements.
@@ -47,8 +62,8 @@ func getCpuMetrics(cacheTimeMs uint16) (CpuMetrics, error) {
 	t1 := lastCpuTimes[cacheTimeMs]
 	t2 := times[0]
 
-	t1All, _ := getAllBusy(t1)
-	t2All, _ := getAllBusy(t2)
+	t1All, t1Busy := getAllBusy(t1)
+	t2All, t2Busy := getAllBusy(t2)
 
 	totalDelta := t2All - t1All
 	if totalDelta <= 0 {
@@ -56,12 +71,11 @@ func getCpuMetrics(cacheTimeMs uint16) (CpuMetrics, error) {
 	}
 
 	metrics := CpuMetrics{
-		Total:  calculateBusy(t1, t2),
+		Total:  clampPercent((t2Busy - t1Busy) / totalDelta * 100),
 		User:   clampPercent((t2.User - t1.User) / totalDelta * 100),
 		System: clampPercent((t2.System - t1.System) / totalDelta * 100),
 		Iowait: clampPercent((t2.Iowait - t1.Iowait) / totalDelta * 100),
 		Steal:  clampPercent((t2.Steal - t1.Steal) / totalDelta * 100),
-		Idle:   clampPercent((t2.Idle - t1.Idle) / totalDelta * 100),
 	}
 
 	lastCpuTimes[cacheTimeMs] = times[0]
@@ -73,9 +87,9 @@ func clampPercent(value float64) float64 {
 	return math.Min(100, math.Max(0, value))
 }
 
-// getPerCoreCpuUsage calculates per-core CPU busy usage as integer percentages (0-100).
-// It uses cached previous measurements for the provided cache interval.
-func getPerCoreCpuUsage(cacheTimeMs uint16) (system.Uint8Slice, error) {
+// getPerCoreCpuMetrics calculates per-core CPU usage metrics.
+// Returns a map where the key is "cpu0", "cpu1", etc. and the value is an array of [user, system, iowait, steal] percentages.
+func getPerCoreCpuMetrics(cacheTimeMs uint16) (map[string][4]float64, error) {
 	perCoreTimes, err := cpu.Times(true)
 	if err != nil || len(perCoreTimes) == 0 {
 		return nil, err
@@ -87,22 +101,36 @@ func getPerCoreCpuUsage(cacheTimeMs uint16) (system.Uint8Slice, error) {
 	}
 
 	lastTimes := lastPerCoreCpuTimes[cacheTimeMs]
+	result := make(map[string][4]float64)
 
-	// Limit to the number of cores available in both samples
-	length := len(perCoreTimes)
-	if len(lastTimes) < length {
-		length = len(lastTimes)
-	}
+	// Calculate metrics for each core
+	for i, currentTime := range perCoreTimes {
+		if i >= len(lastTimes) {
+			break
+		}
 
-	usage := make([]uint8, length)
-	for i := 0; i < length; i++ {
 		t1 := lastTimes[i]
-		t2 := perCoreTimes[i]
-		usage[i] = uint8(math.Round(calculateBusy(t1, t2)))
+		t2 := currentTime
+
+		t1All, _ := getAllBusy(t1)
+		t2All, _ := getAllBusy(t2)
+
+		totalDelta := t2All - t1All
+		if totalDelta <= 0 {
+			continue
+		}
+
+		// Store as [user, system, iowait, steal]
+		result[currentTime.CPU] = [4]float64{
+			clampPercent((t2.User - t1.User) / totalDelta * 100),
+			clampPercent((t2.System - t1.System) / totalDelta * 100),
+			clampPercent((t2.Iowait - t1.Iowait) / totalDelta * 100),
+			clampPercent((t2.Steal - t1.Steal) / totalDelta * 100),
+		}
 	}
 
 	lastPerCoreCpuTimes[cacheTimeMs] = perCoreTimes
-	return usage, nil
+	return result, nil
 }
 
 // calculateBusy calculates the CPU busy percentage between two time points.
@@ -112,10 +140,13 @@ func calculateBusy(t1, t2 cpu.TimesStat) float64 {
 	t1All, t1Busy := getAllBusy(t1)
 	t2All, t2Busy := getAllBusy(t2)
 
-	if t2All <= t1All || t2Busy <= t1Busy {
+	if t2Busy <= t1Busy {
 		return 0
 	}
-	return clampPercent((t2Busy - t1Busy) / (t2All - t1All) * 100)
+	if t2All <= t1All {
+		return 100
+	}
+	return math.Min(100, math.Max(0, (t2Busy-t1Busy)/(t2All-t1All)*100))
 }
 
 // getAllBusy calculates the total CPU time and busy CPU time from CPU times statistics.

agent/disk.go

@@ -31,7 +31,6 @@ func (a *Agent) initializeDiskInfo() {
 	filesystem, _ := GetEnv("FILESYSTEM")
 	efPath := "/extra-filesystems"
 	hasRoot := false
-	isWindows := runtime.GOOS == "windows"
 
 	partitions, err := disk.Partitions(false)
 	if err != nil {
@@ -39,13 +38,6 @@ func (a *Agent) initializeDiskInfo() {
 	}
 	slog.Debug("Disk", "partitions", partitions)
 
-	// trim trailing backslash for Windows devices (#1361)
-	if isWindows {
-		for i, p := range partitions {
-			partitions[i].Device = strings.TrimSuffix(p.Device, "\\")
-		}
-	}
-
 	// ioContext := context.WithValue(a.sensorsContext,
 	// 	common.EnvKey, common.EnvMap{common.HostProcEnvKey: "/tmp/testproc"},
 	// )
@@ -60,7 +52,7 @@ func (a *Agent) initializeDiskInfo() {
 	// Helper function to add a filesystem to fsStats if it doesn't exist
 	addFsStat := func(device, mountpoint string, root bool, customName ...string) {
 		var key string
-		if isWindows {
+		if runtime.GOOS == "windows" {
 			key = device
 		} else {
 			key = filepath.Base(device)
@@ -95,9 +87,6 @@ func (a *Agent) initializeDiskInfo() {
 		}
 	}
 
-	// Get the appropriate root mount point for this system
-	rootMountPoint := a.getRootMountPoint()
-
 	// Use FILESYSTEM env var to find root filesystem
 	if filesystem != "" {
 		for _, p := range partitions {
@@ -141,7 +130,7 @@ func (a *Agent) initializeDiskInfo() {
 	for _, p := range partitions {
 		// fmt.Println(p.Device, p.Mountpoint)
 		// Binary root fallback or docker root fallback
-		if !hasRoot && (p.Mountpoint == rootMountPoint || (p.Mountpoint == "/etc/hosts" && strings.HasPrefix(p.Device, "/dev"))) {
+		if !hasRoot && (p.Mountpoint == "/" || (p.Mountpoint == "/etc/hosts" && strings.HasPrefix(p.Device, "/dev"))) {
 			fs, match := findIoDevice(filepath.Base(p.Device), diskIoCounters, a.fsStats)
 			if match {
 				addFsStat(fs, p.Mountpoint, true)
@@ -177,8 +166,8 @@ func (a *Agent) initializeDiskInfo() {
 	// If no root filesystem set, use fallback
 	if !hasRoot {
 		rootDevice, _ := findIoDevice(filepath.Base(filesystem), diskIoCounters, a.fsStats)
-		slog.Info("Root disk", "mountpoint", rootMountPoint, "io", rootDevice)
-		a.fsStats[rootDevice] = &system.FsStats{Root: true, Mountpoint: rootMountPoint}
+		slog.Info("Root disk", "mountpoint", "/", "io", rootDevice)
+		a.fsStats[rootDevice] = &system.FsStats{Root: true, Mountpoint: "/"}
 	}
 
 	a.initializeDiskIoStats(diskIoCounters)
@@ -225,19 +214,8 @@ func (a *Agent) initializeDiskIoStats(diskIoCounters map[string]disk.IOCountersS
 
 // Updates disk usage statistics for all monitored filesystems
 func (a *Agent) updateDiskUsage(systemStats *system.Stats) {
-	// Check if we should skip extra filesystem collection to avoid waking sleeping disks.
-	// Root filesystem is always updated since it can't be sleeping while the agent runs.
-	// Always collect on first call (lastDiskUsageUpdate is zero) or if caching is disabled.
-	cacheExtraFs := a.diskUsageCacheDuration > 0 &&
-		!a.lastDiskUsageUpdate.IsZero() &&
-		time.Since(a.lastDiskUsageUpdate) < a.diskUsageCacheDuration
-
 	// disk usage
 	for _, stats := range a.fsStats {
-		// Skip non-root filesystems if caching is active
-		if cacheExtraFs && !stats.Root {
-			continue
-		}
 		if d, err := disk.Usage(stats.Mountpoint); err == nil {
 			stats.DiskTotal = bytesToGigabytes(d.Total)
 			stats.DiskUsed = bytesToGigabytes(d.Used)
@@ -255,11 +233,6 @@ func (a *Agent) updateDiskUsage(systemStats *system.Stats) {
 			stats.TotalWrite = 0
 		}
 	}
-
-	// Update the last disk usage update time when we've collected extra filesystems
-	if !cacheExtraFs {
-		a.lastDiskUsageUpdate = time.Now()
-	}
 }
 
 // Updates disk I/O statistics for all monitored filesystems
@@ -331,32 +304,3 @@ func (a *Agent) updateDiskIo(cacheTimeMs uint16, systemStats *system.Stats) {
 		}
 	}
 }
-
-// getRootMountPoint returns the appropriate root mount point for the system
-// For immutable systems like Fedora Silverblue, it returns /sysroot instead of /
-func (a *Agent) getRootMountPoint() string {
-	// 1. Check if /etc/os-release contains indicators of an immutable system
-	if osReleaseContent, err := os.ReadFile("/etc/os-release"); err == nil {
-		content := string(osReleaseContent)
-		if strings.Contains(content, "fedora") && strings.Contains(content, "silverblue") ||
-			strings.Contains(content, "coreos") ||
-			strings.Contains(content, "flatcar") ||
-			strings.Contains(content, "rhel-atomic") ||
-			strings.Contains(content, "centos-atomic") {
-			// Verify that /sysroot exists before returning it
-			if _, err := os.Stat("/sysroot"); err == nil {
-				return "/sysroot"
-			}
-		}
-	}
-
-	// 2. Check if /run/ostree is present (ostree-based systems like Silverblue)
-	if _, err := os.Stat("/run/ostree"); err == nil {
-		// Verify that /sysroot exists before returning it
-		if _, err := os.Stat("/sysroot"); err == nil {
-			return "/sysroot"
-		}
-	}
-
-	return "/"
-}

agent/disk_test.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/henrygd/beszel/internal/entities/system"
 	"github.com/shirou/gopsutil/v4/disk"
@@ -234,86 +233,3 @@ func TestExtraFsKeyGeneration(t *testing.T) {
 		})
 	}
 }
-
-func TestDiskUsageCaching(t *testing.T) {
-	t.Run("caching disabled updates all filesystems", func(t *testing.T) {
-		agent := &Agent{
-			fsStats: map[string]*system.FsStats{
-				"sda": {Root: true, Mountpoint: "/"},
-				"sdb": {Root: false, Mountpoint: "/mnt/storage"},
-			},
-			diskUsageCacheDuration: 0, // caching disabled
-		}
-
-		var stats system.Stats
-		agent.updateDiskUsage(&stats)
-
-		// Both should be updated (non-zero values from disk.Usage)
-		// Root stats should be populated in systemStats
-		assert.True(t, agent.lastDiskUsageUpdate.IsZero() || !agent.lastDiskUsageUpdate.IsZero(),
-			"lastDiskUsageUpdate should be set when caching is disabled")
-	})
-
-	t.Run("caching enabled always updates root filesystem", func(t *testing.T) {
-		agent := &Agent{
-			fsStats: map[string]*system.FsStats{
-				"sda": {Root: true, Mountpoint: "/", DiskTotal: 100, DiskUsed: 50},
-				"sdb": {Root: false, Mountpoint: "/mnt/storage", DiskTotal: 200, DiskUsed: 100},
-			},
-			diskUsageCacheDuration: 1 * time.Hour,
-			lastDiskUsageUpdate:    time.Now(), // cache is fresh
-		}
-
-		// Store original extra fs values
-		originalExtraTotal := agent.fsStats["sdb"].DiskTotal
-		originalExtraUsed := agent.fsStats["sdb"].DiskUsed
-
-		var stats system.Stats
-		agent.updateDiskUsage(&stats)
-
-		// Root should be updated (systemStats populated from disk.Usage call)
-		// We can't easily check if disk.Usage was called, but we verify the flow works
-
-		// Extra filesystem should retain cached values (not reset)
-		assert.Equal(t, originalExtraTotal, agent.fsStats["sdb"].DiskTotal,
-			"extra filesystem DiskTotal should be unchanged when cached")
-		assert.Equal(t, originalExtraUsed, agent.fsStats["sdb"].DiskUsed,
-			"extra filesystem DiskUsed should be unchanged when cached")
-	})
-
-	t.Run("first call always updates all filesystems", func(t *testing.T) {
-		agent := &Agent{
-			fsStats: map[string]*system.FsStats{
-				"sda": {Root: true, Mountpoint: "/"},
-				"sdb": {Root: false, Mountpoint: "/mnt/storage"},
-			},
-			diskUsageCacheDuration: 1 * time.Hour,
-			// lastDiskUsageUpdate is zero (first call)
-		}
-
-		var stats system.Stats
-		agent.updateDiskUsage(&stats)
-
-		// After first call, lastDiskUsageUpdate should be set
-		assert.False(t, agent.lastDiskUsageUpdate.IsZero(),
-			"lastDiskUsageUpdate should be set after first call")
-	})
-
-	t.Run("expired cache updates extra filesystems", func(t *testing.T) {
-		agent := &Agent{
-			fsStats: map[string]*system.FsStats{
-				"sda": {Root: true, Mountpoint: "/"},
-				"sdb": {Root: false, Mountpoint: "/mnt/storage"},
-			},
-			diskUsageCacheDuration: 1 * time.Millisecond,
-			lastDiskUsageUpdate:    time.Now().Add(-1 * time.Second), // cache expired
-		}
-
-		var stats system.Stats
-		agent.updateDiskUsage(&stats)
-
-		// lastDiskUsageUpdate should be refreshed since cache expired
-		assert.True(t, time.Since(agent.lastDiskUsageUpdate) < time.Second,
-			"lastDiskUsageUpdate should be refreshed when cache expires")
-	})
-}

agent/docker.go

@@ -14,7 +14,6 @@ import (
 	"net/url"
 	"os"
 	"path"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -25,10 +24,6 @@ import (
 	"github.com/blang/semver"
 )
 
-// ansiEscapePattern matches ANSI escape sequences (colors, cursor movement, etc.)
-// This includes CSI sequences like \x1b[...m and simple escapes like \x1b[K
-var ansiEscapePattern = regexp.MustCompile(`\x1b\[[0-9;]*[a-zA-Z]|\x1b\][^\x07]*\x07|\x1b[@-Z\\-_]`)
-
 const (
 	// Docker API timeout in milliseconds
 	dockerTimeoutMs = 2100
@@ -60,7 +55,6 @@ type dockerManager struct {
 	decoder             *json.Decoder               // Reusable JSON decoder that reads from buf
 	apiStats            *container.ApiStats         // Reusable API stats object
 	excludeContainers   []string                    // Patterns to exclude containers by name
-	usingPodman         bool                        // Whether the Docker Engine API is running on Podman
 
 	// Cache-time-aware tracking for CPU stats (similar to cpu.go)
 	// Maps cache time intervals to container-specific CPU usage tracking
@@ -479,7 +473,7 @@ func (dm *dockerManager) deleteContainerStatsSync(id string) {
 }
 
 // Creates a new http client for Docker or Podman API
-func newDockerManager() *dockerManager {
+func newDockerManager(a *Agent) *dockerManager {
 	dockerHost, exists := GetEnv("DOCKER_HOST")
 	if exists {
 		// return nil if set to empty string
@@ -565,7 +559,7 @@ func newDockerManager() *dockerManager {
 
 	// If using podman, return client
 	if strings.Contains(dockerHost, "podman") {
-		manager.usingPodman = true
+		a.systemInfo.Podman = true
 		manager.goodDockerVersion = true
 		return manager
 	}
@@ -698,17 +692,13 @@ func (dm *dockerManager) getLogs(ctx context.Context, containerID string) (strin
 		return "", err
 	}
 
-	// Strip ANSI escape sequences from logs for clean display in web UI
-	logs := builder.String()
-	if strings.Contains(logs, "\x1b") {
-		logs = ansiEscapePattern.ReplaceAllString(logs, "")
-	}
-	return logs, nil
+	return builder.String(), nil
 }
 
 func decodeDockerLogStream(reader io.Reader, builder *strings.Builder) error {
 	const headerSize = 8
 	var header [headerSize]byte
+	buf := make([]byte, 0, dockerLogsTail*200)
 	totalBytesRead := 0
 
 	for {
@@ -732,38 +722,36 @@ func decodeDockerLogStream(reader io.Reader, builder *strings.Builder) error {
 		// Check if reading this frame would exceed total log size limit
 		if totalBytesRead+int(frameLen) > maxTotalLogSize {
 			// Read and discard remaining data to avoid blocking
-			_, _ = io.CopyN(io.Discard, reader, int64(frameLen))
+			_, _ = io.Copy(io.Discard, io.LimitReader(reader, int64(frameLen)))
 			slog.Debug("Truncating logs: limit reached", "read", totalBytesRead, "limit", maxTotalLogSize)
 			return nil
 		}
 
-		n, err := io.CopyN(builder, reader, int64(frameLen))
-		if err != nil {
+		buf = allocateBuffer(buf, int(frameLen))
+		if _, err := io.ReadFull(reader, buf[:frameLen]); err != nil {
 			if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
+				if len(buf) > 0 {
+					builder.Write(buf[:min(int(frameLen), len(buf))])
+				}
 				return nil
 			}
 			return err
 		}
-		totalBytesRead += int(n)
+		builder.Write(buf[:frameLen])
+		totalBytesRead += int(frameLen)
 	}
 }
 
-// GetHostInfo fetches the system info from Docker
-func (dm *dockerManager) GetHostInfo() (info container.HostInfo, err error) {
-	resp, err := dm.client.Get("http://localhost/info")
-	if err != nil {
-		return info, err
+func allocateBuffer(current []byte, needed int) []byte {
+	if cap(current) >= needed {
+		return current[:needed]
 	}
-	defer resp.Body.Close()
-
-	if err := json.NewDecoder(resp.Body).Decode(&info); err != nil {
-		slog.Error("Failed to decode Docker version response", "error", err)
-		return info, err
-	}
-
-	return info, nil
+	return make([]byte, needed)
 }
 
-func (dm *dockerManager) IsPodman() bool {
-	return dm.usingPodman
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
 }

agent/docker_test.go

@@ -802,24 +802,6 @@ func TestNetworkRateCalculationFormula(t *testing.T) {
 	}
 }
 
-func TestGetHostInfo(t *testing.T) {
-	data, err := os.ReadFile("test-data/system_info.json")
-	require.NoError(t, err)
-
-	var info container.HostInfo
-	err = json.Unmarshal(data, &info)
-	require.NoError(t, err)
-
-	assert.Equal(t, "6.8.0-31-generic", info.KernelVersion)
-	assert.Equal(t, "Ubuntu 24.04 LTS", info.OperatingSystem)
-	// assert.Equal(t, "24.04", info.OSVersion)
-	// assert.Equal(t, "linux", info.OSType)
-	// assert.Equal(t, "x86_64", info.Architecture)
-	assert.EqualValues(t, 4, info.NCPU)
-	assert.EqualValues(t, 2095882240, info.MemTotal)
-	// assert.Equal(t, "27.0.1", info.ServerVersion)
-}
-
 func TestDeltaTrackerCacheTimeIsolation(t *testing.T) {
 	// Test that different cache times have separate DeltaTracker instances
 	dm := &dockerManager{
@@ -1071,6 +1053,53 @@ func TestDecodeDockerLogStreamMemoryProtection(t *testing.T) {
 	})
 }
 
+func TestAllocateBuffer(t *testing.T) {
+	tests := []struct {
+		name          string
+		currentCap    int
+		needed        int
+		expectedCap   int
+		shouldRealloc bool
+	}{
+		{
+			name:          "buffer has enough capacity",
+			currentCap:    1024,
+			needed:        512,
+			expectedCap:   1024,
+			shouldRealloc: false,
+		},
+		{
+			name:          "buffer needs reallocation",
+			currentCap:    512,
+			needed:        1024,
+			expectedCap:   1024,
+			shouldRealloc: true,
+		},
+		{
+			name:          "buffer needs exact size",
+			currentCap:    1024,
+			needed:        1024,
+			expectedCap:   1024,
+			shouldRealloc: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			current := make([]byte, 0, tt.currentCap)
+			result := allocateBuffer(current, tt.needed)
+
+			assert.Equal(t, tt.needed, len(result))
+			assert.GreaterOrEqual(t, cap(result), tt.expectedCap)
+
+			if tt.shouldRealloc {
+				// If reallocation was needed, capacity should be at least the needed size
+				assert.GreaterOrEqual(t, cap(result), tt.needed)
+			}
+		})
+	}
+}
+
 func TestShouldExcludeContainer(t *testing.T) {
 	tests := []struct {
 		name          string
@@ -1174,59 +1203,3 @@ func TestShouldExcludeContainer(t *testing.T) {
 		})
 	}
 }
-
-func TestAnsiEscapePattern(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected string
-	}{
-		{
-			name:     "no ANSI codes",
-			input:    "Hello, World!",
-			expected: "Hello, World!",
-		},
-		{
-			name:     "simple color code",
-			input:    "\x1b[34mINFO\x1b[0m client mode",
-			expected: "INFO client mode",
-		},
-		{
-			name:     "multiple color codes",
-			input:    "\x1b[31mERROR\x1b[0m: \x1b[33mWarning\x1b[0m message",
-			expected: "ERROR: Warning message",
-		},
-		{
-			name:     "bold and color",
-			input:    "\x1b[1;32mSUCCESS\x1b[0m",
-			expected: "SUCCESS",
-		},
-		{
-			name:     "cursor movement codes",
-			input:    "Line 1\x1b[KLine 2",
-			expected: "Line 1Line 2",
-		},
-		{
-			name:     "256 color code",
-			input:    "\x1b[38;5;196mRed text\x1b[0m",
-			expected: "Red text",
-		},
-		{
-			name:     "RGB/truecolor code",
-			input:    "\x1b[38;2;255;0;0mRed text\x1b[0m",
-			expected: "Red text",
-		},
-		{
-			name:     "mixed content with newlines",
-			input:    "\x1b[34m2024-01-01 12:00:00\x1b[0m INFO Starting\n\x1b[31m2024-01-01 12:00:01\x1b[0m ERROR Failed",
-			expected: "2024-01-01 12:00:00 INFO Starting\n2024-01-01 12:00:01 ERROR Failed",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := ansiEscapePattern.ReplaceAllString(tt.input, "")
-			assert.Equal(t, tt.expected, result)
-		})
-	}
-}

agent/gpu_intel.go

@@ -49,12 +49,7 @@ func (gm *GPUManager) updateIntelFromStats(sample *intelGpuStats) bool {
 
 // collectIntelStats executes intel_gpu_top in text mode (-l) and parses the output
 func (gm *GPUManager) collectIntelStats() (err error) {
-	// Build command arguments, optionally selecting a device via -d
-	args := []string{"-s", intelGpuStatsInterval, "-l"}
-	if dev, ok := GetEnv("INTEL_GPU_DEVICE"); ok && dev != "" {
-		args = append(args, "-d", dev)
-	}
-	cmd := exec.Command(intelGpuStatsCmd, args...)
+	cmd := exec.Command(intelGpuStatsCmd, "-s", intelGpuStatsInterval, "-l")
 	// Avoid blocking if intel_gpu_top writes to stderr
 	cmd.Stderr = io.Discard
 	stdout, err := cmd.StdoutPipe()
@@ -134,9 +129,7 @@ func (gm *GPUManager) parseIntelHeaders(header1 string, header2 string) (engineN
 	powerIndex = -1 // Initialize to -1, will be set to actual index if found
 	// Collect engine names from header1
 	for _, col := range h1 {
-		key := strings.TrimRightFunc(col, func(r rune) bool {
-			return (r >= '0' && r <= '9') || r == '/'
-		})
+		key := strings.TrimRightFunc(col, func(r rune) bool { return r >= '0' && r <= '9' })
 		var friendly string
 		switch key {
 		case "RCS":

agent/gpu_test.go

@@ -4,10 +4,8 @@
 package agent
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -1439,15 +1437,6 @@ func TestParseIntelHeaders(t *testing.T) {
 			wantPowerIndex:    4, // "gpu" is at index 4
 			wantPreEngineCols: 8, // 17 total cols - 3*3 = 8
 		},
-		{
-			name:              "basic headers with RCS BCS VCS using index in name",
-			header1:           "Freq MHz      IRQ RC6     Power W     IMC MiB/s           RCS/0           BCS/1           VCS/2",
-			header2:           " req  act       /s   %   gpu   pkg     rd     wr       %  se  wa       %  se  wa       %  se  wa",
-			wantEngineNames:   []string{"RCS", "BCS", "VCS"},
-			wantFriendlyNames: []string{"Render/3D", "Blitter", "Video"},
-			wantPowerIndex:    4, // "gpu" is at index 4
-			wantPreEngineCols: 8, // 17 total cols - 3*3 = 8
-		},
 		{
 			name:              "headers with only RCS",
 			header1:           "Freq MHz      IRQ RC6     Power W     IMC MiB/s             RCS",
@@ -1635,42 +1624,3 @@ func TestParseIntelData(t *testing.T) {
 		})
 	}
 }
-
-func TestIntelCollectorDeviceEnv(t *testing.T) {
-	dir := t.TempDir()
-	t.Setenv("PATH", dir)
-
-	// Prepare a file to capture args
-	argsFile := filepath.Join(dir, "args.txt")
-
-	// Create a fake intel_gpu_top that records its arguments and prints minimal valid output
-	scriptPath := filepath.Join(dir, "intel_gpu_top")
-	script := fmt.Sprintf(`#!/bin/sh
-echo "$@" > %s
-echo "Freq MHz      IRQ RC6     Power W     IMC MiB/s             RCS             VCS"
-echo " req  act       /s   %%   gpu   pkg     rd     wr       %%  se  wa       %%  se  wa"
-echo "226  223      338  58  2.00  2.69   1820    965   0.00    0   0    0.00   0   0"
-echo "189  187      412  67  1.80  2.45   1950    823   8.50    2   1    15.00   1   0"
-`, argsFile)
-	if err := os.WriteFile(scriptPath, []byte(script), 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	// Set device selector via prefixed env var
-	t.Setenv("BESZEL_AGENT_INTEL_GPU_DEVICE", "sriov")
-
-	gm := &GPUManager{GpuDataMap: make(map[string]*system.GPUData)}
-	if err := gm.collectIntelStats(); err != nil {
-		t.Fatalf("collectIntelStats error: %v", err)
-	}
-
-	// Verify that -d sriov was passed
-	data, err := os.ReadFile(argsFile)
-	if err != nil {
-		t.Fatalf("failed reading args file: %v", err)
-	}
-	argsStr := strings.TrimSpace(string(data))
-	require.Contains(t, argsStr, "-d sriov")
-	require.Contains(t, argsStr, "-s ")
-	require.Contains(t, argsStr, "-l")
-}

agent/handlers.go

@@ -50,7 +50,6 @@ func NewHandlerRegistry() *HandlerRegistry {
 	registry.Register(common.GetContainerLogs, &GetContainerLogsHandler{})
 	registry.Register(common.GetContainerInfo, &GetContainerInfoHandler{})
 	registry.Register(common.GetSmartData, &GetSmartDataHandler{})
-	registry.Register(common.GetSystemdInfo, &GetSystemdInfoHandler{})
 
 	return registry
 }
@@ -94,7 +93,7 @@ func (h *GetDataHandler) Handle(hctx *HandlerContext) error {
 	var options common.DataRequestOptions
 	_ = cbor.Unmarshal(hctx.Request.Data, &options)
 
-	sysStats := hctx.Agent.gatherStats(options)
+	sysStats := hctx.Agent.gatherStats(options.CacheTimeMs)
 	return hctx.SendResponse(sysStats, hctx.RequestID)
 }
 
@@ -175,31 +174,3 @@ func (h *GetSmartDataHandler) Handle(hctx *HandlerContext) error {
 	data := hctx.Agent.smartManager.GetCurrentData()
 	return hctx.SendResponse(data, hctx.RequestID)
 }
-
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-
-// GetSystemdInfoHandler handles detailed systemd service info requests
-type GetSystemdInfoHandler struct{}
-
-func (h *GetSystemdInfoHandler) Handle(hctx *HandlerContext) error {
-	if hctx.Agent.systemdManager == nil {
-		return errors.ErrUnsupported
-	}
-
-	var req common.SystemdInfoRequest
-	if err := cbor.Unmarshal(hctx.Request.Data, &req); err != nil {
-		return err
-	}
-	if req.ServiceName == "" {
-		return errors.New("service name is required")
-	}
-
-	details, err := hctx.Agent.systemdManager.getServiceDetails(req.ServiceName)
-	if err != nil {
-		return err
-	}
-
-	return hctx.SendResponse(details, hctx.RequestID)
-}

agent/server.go

@@ -15,7 +15,6 @@ import (
 	"github.com/henrygd/beszel/internal/common"
 	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/henrygd/beszel/internal/entities/system"
-	"github.com/henrygd/beszel/internal/entities/systemd"
 
 	"github.com/blang/semver"
 	"github.com/fxamacker/cbor/v2"
@@ -174,8 +173,6 @@ func (a *Agent) handleSSHRequest(w io.Writer, req *common.HubRequest[cbor.RawMes
 			response.String = &v
 		case map[string]smart.SmartData:
 			response.SmartData = v
-		case systemd.ServiceDetails:
-			response.ServiceInfo = v
 		default:
 			response.Error = fmt.Sprintf("unsupported response type: %T", data)
 		}
@@ -202,7 +199,7 @@ func (a *Agent) handleSSHRequest(w io.Writer, req *common.HubRequest[cbor.RawMes
 
 // handleLegacyStats serves the legacy one-shot stats payload for older hubs
 func (a *Agent) handleLegacyStats(w io.Writer, hubVersion semver.Version) error {
-	stats := a.gatherStats(common.DataRequestOptions{CacheTimeMs: 60_000})
+	stats := a.gatherStats(60_000)
 	return a.writeToSession(w, stats, hubVersion)
 }
 

agent/server_test.go

@@ -513,7 +513,7 @@ func TestWriteToSessionEncoding(t *testing.T) {
 				err = json.Unmarshal([]byte(encodedData), &decodedJson)
 				assert.Error(t, err, "Should not be valid JSON data")
 
-				assert.Equal(t, testData.Details.Hostname, decodedCbor.Details.Hostname)
+				assert.Equal(t, testData.Info.Hostname, decodedCbor.Info.Hostname)
 				assert.Equal(t, testData.Stats.Cpu, decodedCbor.Stats.Cpu)
 			} else {
 				// Should be JSON - try to decode as JSON
@@ -526,7 +526,7 @@ func TestWriteToSessionEncoding(t *testing.T) {
 				assert.Error(t, err, "Should not be valid CBOR data")
 
 				// Verify the decoded JSON data matches our test data
-				assert.Equal(t, testData.Details.Hostname, decodedJson.Details.Hostname)
+				assert.Equal(t, testData.Info.Hostname, decodedJson.Info.Hostname)
 				assert.Equal(t, testData.Stats.Cpu, decodedJson.Stats.Cpu)
 
 				// Verify it looks like JSON (starts with '{' and contains readable field names)
@@ -551,8 +551,12 @@ func createTestCombinedData() *system.CombinedData {
 			DiskPct:   50.0,
 		},
 		Info: system.Info{
+			Hostname:     "test-host",
+			Cores:        8,
+			CpuModel:     "Test CPU Model",
 			Uptime:       3600,
 			AgentVersion: "0.12.0",
+			Os:           system.Linux,
 		},
 		Containers: []*container.Stats{
 			{

agent/smart.go

@@ -1,6 +1,3 @@
-//go:generate -command fetchsmartctl go run ./tools/fetchsmartctl
-//go:generate fetchsmartctl -out ./smartmontools/smartctl.exe -url https://static.beszel.dev/bin/smartctl/smartctl-nc.exe -sha 3912249c3b329249aa512ce796fd1b64d7cbd8378b68ad2756b39163d9c30b47
-
 package agent
 
 import (
@@ -8,10 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"os"
 	"os/exec"
-	"path/filepath"
-	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -25,12 +19,10 @@ import (
 // SmartManager manages data collection for SMART devices
 type SmartManager struct {
 	sync.Mutex
-	SmartDataMap    map[string]*smart.SmartData
-	SmartDevices    []*DeviceInfo
-	refreshMutex    sync.Mutex
-	lastScanTime    time.Time
-	binPath         string
-	excludedDevices map[string]struct{}
+	SmartDataMap map[string]*smart.SmartData
+	SmartDevices []*DeviceInfo
+	refreshMutex sync.Mutex
+	lastScanTime time.Time
 }
 
 type scanOutput struct {
@@ -168,7 +160,7 @@ func (sm *SmartManager) ScanDevices(force bool) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	cmd := exec.CommandContext(ctx, sm.binPath, "--scan", "-j")
+	cmd := exec.CommandContext(ctx, "smartctl", "--scan", "-j")
 	output, err := cmd.Output()
 
 	var (
@@ -187,7 +179,6 @@ func (sm *SmartManager) ScanDevices(force bool) error {
 	}
 
 	finalDevices := mergeDeviceLists(currentDevices, scannedDevices, configuredDevices)
-	finalDevices = sm.filterExcludedDevices(finalDevices)
 	sm.updateSmartDevices(finalDevices)
 
 	if len(finalDevices) == 0 {
@@ -235,47 +226,6 @@ func (sm *SmartManager) parseConfiguredDevices(config string) ([]*DeviceInfo, er
 	return devices, nil
 }
 
-func (sm *SmartManager) refreshExcludedDevices() {
-	rawValue, _ := GetEnv("EXCLUDE_SMART")
-	sm.excludedDevices = make(map[string]struct{})
-
-	for entry := range strings.SplitSeq(rawValue, ",") {
-		device := strings.TrimSpace(entry)
-		if device == "" {
-			continue
-		}
-		sm.excludedDevices[device] = struct{}{}
-	}
-}
-
-func (sm *SmartManager) isExcludedDevice(deviceName string) bool {
-	_, exists := sm.excludedDevices[deviceName]
-	return exists
-}
-
-func (sm *SmartManager) filterExcludedDevices(devices []*DeviceInfo) []*DeviceInfo {
-	if devices == nil {
-		return []*DeviceInfo{}
-	}
-
-	excluded := sm.excludedDevices
-	if len(excluded) == 0 {
-		return devices
-	}
-
-	filtered := make([]*DeviceInfo, 0, len(devices))
-	for _, device := range devices {
-		if device == nil || device.Name == "" {
-			continue
-		}
-		if _, skip := excluded[device.Name]; skip {
-			continue
-		}
-		filtered = append(filtered, device)
-	}
-	return filtered
-}
-
 // detectSmartOutputType inspects sections that are unique to each smartctl
 // JSON schema (NVMe, ATA/SATA, SCSI) to determine which parser should be used
 // when the reported device type is ambiguous or missing.
@@ -422,21 +372,17 @@ func (sm *SmartManager) parseSmartOutput(deviceInfo *DeviceInfo, output []byte)
 // Uses -n standby to avoid waking up sleeping disks, but bypasses standby mode
 // for initial data collection when no cached data exists
 func (sm *SmartManager) CollectSmart(deviceInfo *DeviceInfo) error {
-	if deviceInfo != nil && sm.isExcludedDevice(deviceInfo.Name) {
-		return errNoValidSmartData
-	}
-
 	// slog.Info("collecting SMART data", "device", deviceInfo.Name, "type", deviceInfo.Type, "has_existing_data", sm.hasDataForDevice(deviceInfo.Name))
 
 	// Check if we have any existing data for this device
 	hasExistingData := sm.hasDataForDevice(deviceInfo.Name)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 
 	// Try with -n standby first if we have existing data
 	args := sm.smartctlArgs(deviceInfo, true)
-	cmd := exec.CommandContext(ctx, sm.binPath, args...)
+	cmd := exec.CommandContext(ctx, "smartctl", args...)
 	output, err := cmd.CombinedOutput()
 
 	// Check if device is in standby (exit status 2)
@@ -446,49 +392,21 @@ func (sm *SmartManager) CollectSmart(deviceInfo *DeviceInfo) error {
 			return nil
 		}
 		// No cached data, need to collect initial data by bypassing standby
-		ctx2, cancel2 := context.WithTimeout(context.Background(), 15*time.Second)
+		ctx2, cancel2 := context.WithTimeout(context.Background(), 2*time.Second)
 		defer cancel2()
 		args = sm.smartctlArgs(deviceInfo, false)
-		cmd = exec.CommandContext(ctx2, sm.binPath, args...)
+		cmd = exec.CommandContext(ctx2, "smartctl", args...)
 		output, err = cmd.CombinedOutput()
 	}
 
 	hasValidData := sm.parseSmartOutput(deviceInfo, output)
 
-	// If NVMe controller path failed, try namespace path as fallback.
-	// NVMe controllers (/dev/nvme0) don't always support SMART queries. See github.com/henrygd/beszel/issues/1504
-	if !hasValidData && err != nil && isNvmeControllerPath(deviceInfo.Name) {
-		controllerPath := deviceInfo.Name
-		namespacePath := controllerPath + "n1"
-		if !sm.isExcludedDevice(namespacePath) {
-			deviceInfo.Name = namespacePath
-
-			ctx3, cancel3 := context.WithTimeout(context.Background(), 15*time.Second)
-			defer cancel3()
-			args = sm.smartctlArgs(deviceInfo, false)
-			cmd = exec.CommandContext(ctx3, sm.binPath, args...)
-			output, err = cmd.CombinedOutput()
-			hasValidData = sm.parseSmartOutput(deviceInfo, output)
-
-			// Auto-exclude the controller path so future scans don't re-add it
-			if hasValidData {
-				sm.Lock()
-				if sm.excludedDevices == nil {
-					sm.excludedDevices = make(map[string]struct{})
-				}
-				sm.excludedDevices[controllerPath] = struct{}{}
-				sm.Unlock()
-				slog.Debug("auto-excluded NVMe controller path", "path", controllerPath)
-			}
-		}
-	}
-
 	if !hasValidData {
 		if err != nil {
-			slog.Info("smartctl failed", "device", deviceInfo.Name, "err", err)
+			slog.Debug("smartctl failed", "device", deviceInfo.Name, "err", err)
 			return err
 		}
-		slog.Info("no valid SMART data found", "device", deviceInfo.Name)
+		slog.Debug("no valid SMART data found", "device", deviceInfo.Name)
 		return errNoValidSmartData
 	}
 
@@ -957,54 +875,13 @@ func (sm *SmartManager) parseSmartForNvme(output []byte) (bool, int) {
 }
 
 // detectSmartctl checks if smartctl is installed, returns an error if not
-func (sm *SmartManager) detectSmartctl() (string, error) {
-	isWindows := runtime.GOOS == "windows"
-
-	// Load embedded smartctl.exe for Windows amd64 builds.
-	if isWindows && runtime.GOARCH == "amd64" {
-		if path, err := ensureEmbeddedSmartctl(); err == nil {
-			return path, nil
-		}
+func (sm *SmartManager) detectSmartctl() error {
+	if _, err := exec.LookPath("smartctl"); err == nil {
+		slog.Debug("smartctl found")
+		return nil
 	}
-
-	if path, err := exec.LookPath("smartctl"); err == nil {
-		return path, nil
-	}
-	locations := []string{}
-	if isWindows {
-		locations = append(locations,
-			"C:\\Program Files\\smartmontools\\bin\\smartctl.exe",
-		)
-	} else {
-		locations = append(locations, "/opt/homebrew/bin/smartctl")
-	}
-	for _, location := range locations {
-		if _, err := os.Stat(location); err == nil {
-			return location, nil
-		}
-	}
-	return "", errors.New("smartctl not found")
-}
-
-// isNvmeControllerPath checks if the path matches an NVMe controller pattern
-// like /dev/nvme0, /dev/nvme1, etc. (without namespace suffix like n1)
-func isNvmeControllerPath(path string) bool {
-	base := filepath.Base(path)
-	if !strings.HasPrefix(base, "nvme") {
-		return false
-	}
-	suffix := strings.TrimPrefix(base, "nvme")
-	if suffix == "" {
-		return false
-	}
-	// Controller paths are just "nvme" + digits (e.g., nvme0, nvme1)
-	// Namespace paths have "n" after the controller number (e.g., nvme0n1)
-	for _, c := range suffix {
-		if c < '0' || c > '9' {
-			return false
-		}
-	}
-	return true
+	slog.Debug("smartctl not found")
+	return errors.New("smartctl not found")
 }
 
 // NewSmartManager creates and initializes a new SmartManager
@@ -1012,13 +889,9 @@ func NewSmartManager() (*SmartManager, error) {
 	sm := &SmartManager{
 		SmartDataMap: make(map[string]*smart.SmartData),
 	}
-	sm.refreshExcludedDevices()
-	path, err := sm.detectSmartctl()
-	if err != nil {
-		slog.Debug(err.Error())
+	if err := sm.detectSmartctl(); err != nil {
 		return nil, err
 	}
-	slog.Debug("smartctl", "path", path)
-	sm.binPath = path
+
 	return sm, nil
 }

agent/smart_nonwindows.go

@@ -1,9 +0,0 @@
-//go:build !windows
-
-package agent
-
-import "errors"
-
-func ensureEmbeddedSmartctl() (string, error) {
-	return "", errors.ErrUnsupported
-}

agent/smart_test.go

@@ -588,228 +588,3 @@ func TestIsVirtualDeviceScsi(t *testing.T) {
 		})
 	}
 }
-
-func TestRefreshExcludedDevices(t *testing.T) {
-	tests := []struct {
-		name         string
-		envValue     string
-		expectedDevs map[string]struct{}
-	}{
-		{
-			name:         "empty env",
-			envValue:     "",
-			expectedDevs: map[string]struct{}{},
-		},
-		{
-			name:     "single device",
-			envValue: "/dev/sda",
-			expectedDevs: map[string]struct{}{
-				"/dev/sda": {},
-			},
-		},
-		{
-			name:     "multiple devices",
-			envValue: "/dev/sda,/dev/sdb,/dev/nvme0",
-			expectedDevs: map[string]struct{}{
-				"/dev/sda":   {},
-				"/dev/sdb":   {},
-				"/dev/nvme0": {},
-			},
-		},
-		{
-			name:     "devices with whitespace",
-			envValue: " /dev/sda , /dev/sdb ,  /dev/nvme0  ",
-			expectedDevs: map[string]struct{}{
-				"/dev/sda":   {},
-				"/dev/sdb":   {},
-				"/dev/nvme0": {},
-			},
-		},
-		{
-			name:     "duplicate devices",
-			envValue: "/dev/sda,/dev/sdb,/dev/sda",
-			expectedDevs: map[string]struct{}{
-				"/dev/sda": {},
-				"/dev/sdb": {},
-			},
-		},
-		{
-			name:     "empty entries and whitespace",
-			envValue: "/dev/sda,, /dev/sdb , , ",
-			expectedDevs: map[string]struct{}{
-				"/dev/sda": {},
-				"/dev/sdb": {},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.envValue != "" {
-				t.Setenv("EXCLUDE_SMART", tt.envValue)
-			} else {
-				// Ensure env var is not set for empty test
-				os.Unsetenv("EXCLUDE_SMART")
-			}
-
-			sm := &SmartManager{}
-			sm.refreshExcludedDevices()
-
-			assert.Equal(t, tt.expectedDevs, sm.excludedDevices)
-		})
-	}
-}
-
-func TestIsExcludedDevice(t *testing.T) {
-	sm := &SmartManager{
-		excludedDevices: map[string]struct{}{
-			"/dev/sda":   {},
-			"/dev/nvme0": {},
-		},
-	}
-
-	tests := []struct {
-		name         string
-		deviceName   string
-		expectedBool bool
-	}{
-		{"excluded device sda", "/dev/sda", true},
-		{"excluded device nvme0", "/dev/nvme0", true},
-		{"non-excluded device sdb", "/dev/sdb", false},
-		{"non-excluded device nvme1", "/dev/nvme1", false},
-		{"empty device name", "", false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := sm.isExcludedDevice(tt.deviceName)
-			assert.Equal(t, tt.expectedBool, result)
-		})
-	}
-}
-
-func TestFilterExcludedDevices(t *testing.T) {
-	tests := []struct {
-		name           string
-		excludedDevs   map[string]struct{}
-		inputDevices   []*DeviceInfo
-		expectedDevs   []*DeviceInfo
-		expectedLength int
-	}{
-		{
-			name:         "no exclusions",
-			excludedDevs: map[string]struct{}{},
-			inputDevices: []*DeviceInfo{
-				{Name: "/dev/sda"},
-				{Name: "/dev/sdb"},
-				{Name: "/dev/nvme0"},
-			},
-			expectedDevs: []*DeviceInfo{
-				{Name: "/dev/sda"},
-				{Name: "/dev/sdb"},
-				{Name: "/dev/nvme0"},
-			},
-			expectedLength: 3,
-		},
-		{
-			name: "some devices excluded",
-			excludedDevs: map[string]struct{}{
-				"/dev/sda":   {},
-				"/dev/nvme0": {},
-			},
-			inputDevices: []*DeviceInfo{
-				{Name: "/dev/sda"},
-				{Name: "/dev/sdb"},
-				{Name: "/dev/nvme0"},
-				{Name: "/dev/nvme1"},
-			},
-			expectedDevs: []*DeviceInfo{
-				{Name: "/dev/sdb"},
-				{Name: "/dev/nvme1"},
-			},
-			expectedLength: 2,
-		},
-		{
-			name: "all devices excluded",
-			excludedDevs: map[string]struct{}{
-				"/dev/sda": {},
-				"/dev/sdb": {},
-			},
-			inputDevices: []*DeviceInfo{
-				{Name: "/dev/sda"},
-				{Name: "/dev/sdb"},
-			},
-			expectedDevs:   []*DeviceInfo{},
-			expectedLength: 0,
-		},
-		{
-			name:           "nil devices",
-			excludedDevs:   map[string]struct{}{},
-			inputDevices:   nil,
-			expectedDevs:   []*DeviceInfo{},
-			expectedLength: 0,
-		},
-		{
-			name: "filter nil and empty name devices",
-			excludedDevs: map[string]struct{}{
-				"/dev/sda": {},
-			},
-			inputDevices: []*DeviceInfo{
-				{Name: "/dev/sda"},
-				nil,
-				{Name: ""},
-				{Name: "/dev/sdb"},
-			},
-			expectedDevs: []*DeviceInfo{
-				{Name: "/dev/sdb"},
-			},
-			expectedLength: 1,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			sm := &SmartManager{
-				excludedDevices: tt.excludedDevs,
-			}
-
-			result := sm.filterExcludedDevices(tt.inputDevices)
-
-			assert.Len(t, result, tt.expectedLength)
-			assert.Equal(t, tt.expectedDevs, result)
-		})
-	}
-}
-
-func TestIsNvmeControllerPath(t *testing.T) {
-	tests := []struct {
-		path     string
-		expected bool
-	}{
-		// Controller paths (should return true)
-		{"/dev/nvme0", true},
-		{"/dev/nvme1", true},
-		{"/dev/nvme10", true},
-		{"nvme0", true},
-
-		// Namespace paths (should return false)
-		{"/dev/nvme0n1", false},
-		{"/dev/nvme1n1", false},
-		{"/dev/nvme0n1p1", false},
-		{"nvme0n1", false},
-
-		// Non-NVMe paths (should return false)
-		{"/dev/sda", false},
-		{"/dev/sda1", false},
-		{"/dev/hda", false},
-		{"", false},
-		{"/dev/nvme", false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.path, func(t *testing.T) {
-			result := isNvmeControllerPath(tt.path)
-			assert.Equal(t, tt.expected, result, "path: %s", tt.path)
-		})
-	}
-}

agent/smart_windows.go

@@ -1,40 +0,0 @@
-//go:build windows
-
-package agent
-
-import (
-	_ "embed"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-)
-
-//go:embed smartmontools/smartctl.exe
-var embeddedSmartctl []byte
-
-var (
-	smartctlOnce sync.Once
-	smartctlPath string
-	smartctlErr  error
-)
-
-func ensureEmbeddedSmartctl() (string, error) {
-	smartctlOnce.Do(func() {
-		destDir := filepath.Join(os.TempDir(), "beszel", "smartmontools")
-		if err := os.MkdirAll(destDir, 0o755); err != nil {
-			smartctlErr = fmt.Errorf("failed to create smartctl directory: %w", err)
-			return
-		}
-
-		destPath := filepath.Join(destDir, "smartctl.exe")
-		if err := os.WriteFile(destPath, embeddedSmartctl, 0o755); err != nil {
-			smartctlErr = fmt.Errorf("failed to write embedded smartctl: %w", err)
-			return
-		}
-
-		smartctlPath = destPath
-	})
-
-	return smartctlPath, smartctlErr
-}

agent/system.go

@@ -2,18 +2,15 @@ package agent
 
 import (
 	"bufio"
-	"errors"
 	"fmt"
 	"log/slog"
 	"os"
-	"runtime"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/henrygd/beszel"
 	"github.com/henrygd/beszel/agent/battery"
-	"github.com/henrygd/beszel/internal/entities/container"
 	"github.com/henrygd/beszel/internal/entities/system"
 
 	"github.com/shirou/gopsutil/v4/cpu"
@@ -30,79 +27,41 @@ type prevDisk struct {
 }
 
 // Sets initial / non-changing values about the host system
-func (a *Agent) refreshStaticInfo() {
+func (a *Agent) initializeSystemInfo() {
 	a.systemInfo.AgentVersion = beszel.Version
-
-	// get host info from Docker if available
-	var hostInfo container.HostInfo
-
-	if a.dockerManager != nil {
-		a.systemDetails.Podman = a.dockerManager.IsPodman()
-		hostInfo, _ = a.dockerManager.GetHostInfo()
-	}
-
-	a.systemDetails.Hostname, _ = os.Hostname()
-	if arch, err := host.KernelArch(); err == nil {
-		a.systemDetails.Arch = arch
-	} else {
-		a.systemDetails.Arch = runtime.GOARCH
-	}
+	a.systemInfo.Hostname, _ = os.Hostname()
 
 	platform, _, version, _ := host.PlatformInformation()
 
 	if platform == "darwin" {
-		a.systemDetails.Os = system.Darwin
-		a.systemDetails.OsName = fmt.Sprintf("macOS %s", version)
+		a.systemInfo.KernelVersion = version
+		a.systemInfo.Os = system.Darwin
 	} else if strings.Contains(platform, "indows") {
-		a.systemDetails.Os = system.Windows
-		a.systemDetails.OsName = strings.Replace(platform, "Microsoft ", "", 1)
-		a.systemDetails.Kernel = version
+		a.systemInfo.KernelVersion = fmt.Sprintf("%s %s", strings.Replace(platform, "Microsoft ", "", 1), version)
+		a.systemInfo.Os = system.Windows
 	} else if platform == "freebsd" {
-		a.systemDetails.Os = system.Freebsd
-		a.systemDetails.Kernel, _ = host.KernelVersion()
-		if prettyName, err := getOsPrettyName(); err == nil {
-			a.systemDetails.OsName = prettyName
-		} else {
-			a.systemDetails.OsName = "FreeBSD"
-		}
+		a.systemInfo.Os = system.Freebsd
+		a.systemInfo.KernelVersion = version
 	} else {
-		a.systemDetails.Os = system.Linux
-		a.systemDetails.OsName = hostInfo.OperatingSystem
-		if a.systemDetails.OsName == "" {
-			if prettyName, err := getOsPrettyName(); err == nil {
-				a.systemDetails.OsName = prettyName
-			} else {
-				a.systemDetails.OsName = platform
-			}
-		}
-		a.systemDetails.Kernel = hostInfo.KernelVersion
-		if a.systemDetails.Kernel == "" {
-			a.systemDetails.Kernel, _ = host.KernelVersion()
-		}
+		a.systemInfo.Os = system.Linux
+	}
+
+	if a.systemInfo.KernelVersion == "" {
+		a.systemInfo.KernelVersion, _ = host.KernelVersion()
 	}
 
 	// cpu model
 	if info, err := cpu.Info(); err == nil && len(info) > 0 {
-		a.systemDetails.CpuModel = info[0].ModelName
+		a.systemInfo.CpuModel = info[0].ModelName
 	}
 	// cores / threads
-	cores, _ := cpu.Counts(false)
-	threads := hostInfo.NCPU
-	if threads == 0 {
-		threads, _ = cpu.Counts(true)
-	}
-	// in lxc, logical cores reflects container limits, so use that as cores if lower
-	if threads > 0 && threads < cores {
-		cores = threads
-	}
-	a.systemDetails.Cores = cores
-	a.systemDetails.Threads = threads
-
-	// total memory
-	a.systemDetails.MemoryTotal = hostInfo.MemTotal
-	if a.systemDetails.MemoryTotal == 0 {
-		if v, err := mem.VirtualMemory(); err == nil {
-			a.systemDetails.MemoryTotal = v.Total
+	a.systemInfo.Cores, _ = cpu.Counts(false)
+	if threads, err := cpu.Counts(true); err == nil {
+		if threads > 0 && threads < a.systemInfo.Cores {
+			// in lxc logical cores reflects container limits, so use that as cores if lower
+			a.systemInfo.Cores = threads
+		} else {
+			a.systemInfo.Threads = threads
 		}
 	}
 
@@ -128,20 +87,17 @@ func (a *Agent) getSystemStats(cacheTimeMs uint16) system.Stats {
 	cpuMetrics, err := getCpuMetrics(cacheTimeMs)
 	if err == nil {
 		systemStats.Cpu = twoDecimals(cpuMetrics.Total)
-		systemStats.CpuBreakdown = []float64{
-			twoDecimals(cpuMetrics.User),
-			twoDecimals(cpuMetrics.System),
-			twoDecimals(cpuMetrics.Iowait),
-			twoDecimals(cpuMetrics.Steal),
-			twoDecimals(cpuMetrics.Idle),
-		}
+		systemStats.CpuUser = twoDecimals(cpuMetrics.User)
+		systemStats.CpuSystem = twoDecimals(cpuMetrics.System)
+		systemStats.CpuIowait = twoDecimals(cpuMetrics.Iowait)
+		systemStats.CpuSteal = twoDecimals(cpuMetrics.Steal)
 	} else {
 		slog.Error("Error getting cpu metrics", "err", err)
 	}
 
-	// per-core cpu usage
-	if perCoreUsage, err := getPerCoreCpuUsage(cacheTimeMs); err == nil {
-		systemStats.CpuCoresUsage = perCoreUsage
+	// per-core cpu metrics
+	if perCoreCpuMetrics, err := getPerCoreCpuMetrics(cacheTimeMs); err == nil && len(perCoreCpuMetrics) > 0 {
+		systemStats.CpuCores = perCoreCpuMetrics
 	}
 
 	// load average
@@ -236,16 +192,20 @@ func (a *Agent) getSystemStats(cacheTimeMs uint16) system.Stats {
 		}
 	}
 
-	// update system info
+	// update base system info
 	a.systemInfo.ConnectionType = a.connectionManager.ConnectionType
 	a.systemInfo.Cpu = systemStats.Cpu
 	a.systemInfo.LoadAvg = systemStats.LoadAvg
+	// TODO: remove these in future release in favor of load avg array
+	a.systemInfo.LoadAvg1 = systemStats.LoadAvg[0]
+	a.systemInfo.LoadAvg5 = systemStats.LoadAvg[1]
+	a.systemInfo.LoadAvg15 = systemStats.LoadAvg[2]
 	a.systemInfo.MemPct = systemStats.MemPct
 	a.systemInfo.DiskPct = systemStats.DiskPct
-	a.systemInfo.Battery = systemStats.Battery
 	a.systemInfo.Uptime, _ = host.Uptime()
+	// TODO: in future release, remove MB bandwidth values in favor of bytes
+	a.systemInfo.Bandwidth = twoDecimals(systemStats.NetworkSent + systemStats.NetworkRecv)
 	a.systemInfo.BandwidthBytes = systemStats.Bandwidth[0] + systemStats.Bandwidth[1]
-	a.systemInfo.Threads = a.systemDetails.Threads
 	slog.Debug("sysinfo", "data", a.systemInfo)
 
 	return systemStats
@@ -276,24 +236,3 @@ func getARCSize() (uint64, error) {
 
 	return 0, fmt.Errorf("failed to parse size field")
 }
-
-// getOsPrettyName attempts to get the pretty OS name from /etc/os-release on Linux systems
-func getOsPrettyName() (string, error) {
-	file, err := os.Open("/etc/os-release")
-	if err != nil {
-		return "", err
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if after, ok := strings.CutPrefix(line, "PRETTY_NAME="); ok {
-			value := after
-			value = strings.Trim(value, `"`)
-			return value, nil
-		}
-	}
-
-	return "", errors.New("pretty name not found")
-}

agent/systemd.go

@@ -1,273 +0,0 @@
-//go:build linux
-
-package agent
-
-import (
-	"context"
-	"errors"
-	"log/slog"
-	"maps"
-	"math"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/coreos/go-systemd/v22/dbus"
-	"github.com/henrygd/beszel/internal/entities/systemd"
-)
-
-var errNoActiveTime = errors.New("no active time")
-
-// systemdManager manages the collection of systemd service statistics.
-type systemdManager struct {
-	sync.Mutex
-	serviceStatsMap map[string]*systemd.Service
-	isRunning       bool
-	hasFreshStats   bool
-	patterns        []string
-}
-
-// newSystemdManager creates a new systemdManager.
-func newSystemdManager() (*systemdManager, error) {
-	if skipSystemd, _ := GetEnv("SKIP_SYSTEMD"); skipSystemd == "true" {
-		return nil, nil
-	}
-	conn, err := dbus.NewSystemConnectionContext(context.Background())
-	if err != nil {
-		slog.Debug("Error connecting to systemd", "err", err, "ref", "https://beszel.dev/guide/systemd")
-		return nil, err
-	}
-
-	manager := &systemdManager{
-		serviceStatsMap: make(map[string]*systemd.Service),
-		patterns:        getServicePatterns(),
-	}
-
-	manager.startWorker(conn)
-
-	return manager, nil
-}
-
-func (sm *systemdManager) startWorker(conn *dbus.Conn) {
-	if sm.isRunning {
-		return
-	}
-	sm.isRunning = true
-	// prime the service stats map with the current services
-	_ = sm.getServiceStats(conn, true)
-	// update the services every 10 minutes
-	go func() {
-		for {
-			time.Sleep(time.Minute * 10)
-			_ = sm.getServiceStats(nil, true)
-		}
-	}()
-}
-
-// getServiceStatsCount returns the number of systemd services.
-func (sm *systemdManager) getServiceStatsCount() int {
-	return len(sm.serviceStatsMap)
-}
-
-// getFailedServiceCount returns the number of systemd services in a failed state.
-func (sm *systemdManager) getFailedServiceCount() uint16 {
-	sm.Lock()
-	defer sm.Unlock()
-	count := uint16(0)
-	for _, service := range sm.serviceStatsMap {
-		if service.State == systemd.StatusFailed {
-			count++
-		}
-	}
-	return count
-}
-
-// getServiceStats collects statistics for all running systemd services.
-func (sm *systemdManager) getServiceStats(conn *dbus.Conn, refresh bool) []*systemd.Service {
-	// start := time.Now()
-	// defer func() {
-	// 	slog.Info("systemdManager.getServiceStats", "duration", time.Since(start))
-	// }()
-
-	var services []*systemd.Service
-	var err error
-
-	if !refresh {
-		// return nil
-		sm.Lock()
-		defer sm.Unlock()
-		for _, service := range sm.serviceStatsMap {
-			services = append(services, service)
-		}
-		sm.hasFreshStats = false
-		return services
-	}
-
-	if conn == nil || !conn.Connected() {
-		conn, err = dbus.NewSystemConnectionContext(context.Background())
-		if err != nil {
-			return nil
-		}
-		defer conn.Close()
-	}
-
-	units, err := conn.ListUnitsByPatternsContext(context.Background(), []string{"loaded"}, sm.patterns)
-	if err != nil {
-		slog.Error("Error listing systemd service units", "err", err)
-		return nil
-	}
-
-	for _, unit := range units {
-		service, err := sm.updateServiceStats(conn, unit)
-		if err != nil {
-			continue
-		}
-		services = append(services, service)
-	}
-	sm.hasFreshStats = true
-	return services
-}
-
-// updateServiceStats updates the statistics for a single systemd service.
-func (sm *systemdManager) updateServiceStats(conn *dbus.Conn, unit dbus.UnitStatus) (*systemd.Service, error) {
-	sm.Lock()
-	defer sm.Unlock()
-
-	ctx := context.Background()
-
-	// if service has never been active (no active since time), skip it
-	if activeEnterTsProp, err := conn.GetUnitTypePropertyContext(ctx, unit.Name, "Unit", "ActiveEnterTimestamp"); err == nil {
-		if ts, ok := activeEnterTsProp.Value.Value().(uint64); !ok || ts == 0 || ts == math.MaxUint64 {
-			return nil, errNoActiveTime
-		}
-	} else {
-		return nil, err
-	}
-
-	service, serviceExists := sm.serviceStatsMap[unit.Name]
-	if !serviceExists {
-		service = &systemd.Service{Name: unescapeServiceName(strings.TrimSuffix(unit.Name, ".service"))}
-		sm.serviceStatsMap[unit.Name] = service
-	}
-
-	memPeak := service.MemPeak
-	if memPeakProp, err := conn.GetUnitTypePropertyContext(ctx, unit.Name, "Service", "MemoryPeak"); err == nil {
-		// If memPeak is MaxUint64 the api is saying it's not available
-		if v, ok := memPeakProp.Value.Value().(uint64); ok && v != math.MaxUint64 {
-			memPeak = v
-		}
-	}
-
-	var memUsage uint64
-	if memProp, err := conn.GetUnitTypePropertyContext(ctx, unit.Name, "Service", "MemoryCurrent"); err == nil {
-		// If memUsage is MaxUint64 the api is saying it's not available
-		if v, ok := memProp.Value.Value().(uint64); ok && v != math.MaxUint64 {
-			memUsage = v
-		}
-	}
-
-	service.State = systemd.ParseServiceStatus(unit.ActiveState)
-	service.Sub = systemd.ParseServiceSubState(unit.SubState)
-
-	// some systems always return 0 for mem peak, so we should update the peak if the current usage is greater
-	if memUsage > memPeak {
-		memPeak = memUsage
-	}
-
-	var cpuUsage uint64
-	if cpuProp, err := conn.GetUnitTypePropertyContext(ctx, unit.Name, "Service", "CPUUsageNSec"); err == nil {
-		if v, ok := cpuProp.Value.Value().(uint64); ok {
-			cpuUsage = v
-		}
-	}
-
-	service.Mem = memUsage
-	if memPeak > service.MemPeak {
-		service.MemPeak = memPeak
-	}
-	service.UpdateCPUPercent(cpuUsage)
-
-	return service, nil
-}
-
-// getServiceDetails collects extended information for a specific systemd service.
-func (sm *systemdManager) getServiceDetails(serviceName string) (systemd.ServiceDetails, error) {
-	conn, err := dbus.NewSystemConnectionContext(context.Background())
-	if err != nil {
-		return nil, err
-	}
-	defer conn.Close()
-
-	unitName := serviceName
-	if !strings.HasSuffix(unitName, ".service") {
-		unitName += ".service"
-	}
-
-	ctx := context.Background()
-	props, err := conn.GetUnitPropertiesContext(ctx, unitName)
-	if err != nil {
-		return nil, err
-	}
-
-	// Start with all unit properties
-	details := make(systemd.ServiceDetails)
-	maps.Copy(details, props)
-
-	// // Add service-specific properties
-	servicePropNames := []string{
-		"MainPID", "ExecMainPID", "TasksCurrent", "TasksMax",
-		"MemoryCurrent", "MemoryPeak", "MemoryLimit", "CPUUsageNSec",
-		"NRestarts", "ExecMainStartTimestampRealtime", "Result",
-	}
-
-	for _, propName := range servicePropNames {
-		if variant, err := conn.GetUnitTypePropertyContext(ctx, unitName, "Service", propName); err == nil {
-			value := variant.Value.Value()
-			// Check if the value is MaxUint64, which indicates unlimited/infinite
-			if uint64Value, ok := value.(uint64); ok && uint64Value == math.MaxUint64 {
-				// Set to nil to indicate unlimited - frontend will handle this appropriately
-				details[propName] = nil
-			} else {
-				details[propName] = value
-			}
-		}
-	}
-
-	return details, nil
-}
-
-// unescapeServiceName unescapes systemd service names that contain C-style escape sequences like \x2d
-func unescapeServiceName(name string) string {
-	if !strings.Contains(name, "\\x") {
-		return name
-	}
-	unescaped, err := strconv.Unquote("\"" + name + "\"")
-	if err != nil {
-		return name
-	}
-	return unescaped
-}
-
-// getServicePatterns returns the list of service patterns to match.
-// It reads from the SERVICE_PATTERNS environment variable if set,
-// otherwise defaults to "*service".
-func getServicePatterns() []string {
-	patterns := []string{}
-	if envPatterns, _ := GetEnv("SERVICE_PATTERNS"); envPatterns != "" {
-		for pattern := range strings.SplitSeq(envPatterns, ",") {
-			pattern = strings.TrimSpace(pattern)
-			if pattern == "" {
-				continue
-			}
-			if !strings.HasSuffix(pattern, ".service") {
-				pattern += ".service"
-			}
-			patterns = append(patterns, pattern)
-		}
-	}
-	if len(patterns) == 0 {
-		patterns = []string{"*.service"}
-	}
-	return patterns
-}

agent/systemd_nonlinux.go

@@ -1,38 +0,0 @@
-//go:build !linux
-
-package agent
-
-import (
-	"errors"
-
-	"github.com/henrygd/beszel/internal/entities/systemd"
-)
-
-// systemdManager manages the collection of systemd service statistics.
-type systemdManager struct {
-	hasFreshStats bool
-}
-
-// newSystemdManager creates a new systemdManager.
-func newSystemdManager() (*systemdManager, error) {
-	return &systemdManager{}, nil
-}
-
-// getServiceStats returns nil for non-linux systems.
-func (sm *systemdManager) getServiceStats(conn any, refresh bool) []*systemd.Service {
-	return nil
-}
-
-// getServiceStatsCount returns 0 for non-linux systems.
-func (sm *systemdManager) getServiceStatsCount() int {
-	return 0
-}
-
-// getFailedServiceCount returns 0 for non-linux systems.
-func (sm *systemdManager) getFailedServiceCount() uint16 {
-	return 0
-}
-
-func (sm *systemdManager) getServiceDetails(string) (systemd.ServiceDetails, error) {
-	return nil, errors.New("systemd manager unavailable")
-}

agent/systemd_nonlinux_test.go

@@ -1,53 +0,0 @@
-//go:build !linux && testing
-
-package agent
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewSystemdManager(t *testing.T) {
-	manager, err := newSystemdManager()
-	assert.NoError(t, err)
-	assert.NotNil(t, manager)
-}
-
-func TestSystemdManagerGetServiceStats(t *testing.T) {
-	manager, err := newSystemdManager()
-	assert.NoError(t, err)
-
-	// Test with refresh = true
-	result := manager.getServiceStats(true)
-	assert.Nil(t, result)
-
-	// Test with refresh = false
-	result = manager.getServiceStats(false)
-	assert.Nil(t, result)
-}
-
-func TestSystemdManagerGetServiceDetails(t *testing.T) {
-	manager, err := newSystemdManager()
-	assert.NoError(t, err)
-
-	result, err := manager.getServiceDetails("any-service")
-	assert.Error(t, err)
-	assert.Equal(t, "systemd manager unavailable", err.Error())
-	assert.Nil(t, result)
-
-	// Test with empty service name
-	result, err = manager.getServiceDetails("")
-	assert.Error(t, err)
-	assert.Equal(t, "systemd manager unavailable", err.Error())
-	assert.Nil(t, result)
-}
-
-func TestSystemdManagerFields(t *testing.T) {
-	manager, err := newSystemdManager()
-	assert.NoError(t, err)
-
-	// The non-linux manager should be a simple struct with no special fields
-	// We can't test private fields directly, but we can test the methods work
-	assert.NotNil(t, manager)
-}

agent/systemd_test.go

@@ -1,158 +0,0 @@
-//go:build linux && testing
-
-package agent
-
-import (
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestUnescapeServiceName(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected string
-	}{
-		{"nginx.service", "nginx.service"},                                     // No escaping needed
-		{"test\\x2dwith\\x2ddashes.service", "test-with-dashes.service"},       // \x2d is dash
-		{"service\\x20with\\x20spaces.service", "service with spaces.service"}, // \x20 is space
-		{"mixed\\x2dand\\x2dnormal", "mixed-and-normal"},                       // Mixed escaped and normal
-		{"no-escape-here", "no-escape-here"},                                   // No escape sequences
-		{"", ""},                                                               // Empty string
-		{"\\x2d\\x2d", "--"},                                                   // Multiple escapes
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			result := unescapeServiceName(test.input)
-			assert.Equal(t, test.expected, result)
-		})
-	}
-}
-
-func TestUnescapeServiceNameInvalid(t *testing.T) {
-	// Test invalid escape sequences - should return original string
-	invalidInputs := []string{
-		"invalid\\x",   // Incomplete escape
-		"invalid\\xZZ", // Invalid hex
-		"invalid\\x2",  // Incomplete hex
-		"invalid\\xyz", // Not a valid escape
-	}
-
-	for _, input := range invalidInputs {
-		t.Run(input, func(t *testing.T) {
-			result := unescapeServiceName(input)
-			assert.Equal(t, input, result, "Invalid escape sequences should return original string")
-		})
-	}
-}
-
-func TestGetServicePatterns(t *testing.T) {
-	tests := []struct {
-		name           string
-		prefixedEnv    string
-		unprefixedEnv  string
-		expected       []string
-		cleanupEnvVars bool
-	}{
-		{
-			name:           "default when no env var set",
-			prefixedEnv:    "",
-			unprefixedEnv:  "",
-			expected:       []string{"*.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "single pattern with prefixed env",
-			prefixedEnv:    "nginx",
-			unprefixedEnv:  "",
-			expected:       []string{"nginx.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "single pattern with unprefixed env",
-			prefixedEnv:    "",
-			unprefixedEnv:  "nginx",
-			expected:       []string{"nginx.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "prefixed env takes precedence",
-			prefixedEnv:    "nginx",
-			unprefixedEnv:  "apache",
-			expected:       []string{"nginx.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "multiple patterns",
-			prefixedEnv:    "nginx,apache,postgresql",
-			unprefixedEnv:  "",
-			expected:       []string{"nginx.service", "apache.service", "postgresql.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "patterns with .service suffix",
-			prefixedEnv:    "nginx.service,apache.service",
-			unprefixedEnv:  "",
-			expected:       []string{"nginx.service", "apache.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "mixed patterns with and without suffix",
-			prefixedEnv:    "nginx.service,apache,postgresql.service",
-			unprefixedEnv:  "",
-			expected:       []string{"nginx.service", "apache.service", "postgresql.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "patterns with whitespace",
-			prefixedEnv:    " nginx , apache , postgresql ",
-			unprefixedEnv:  "",
-			expected:       []string{"nginx.service", "apache.service", "postgresql.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "empty patterns are skipped",
-			prefixedEnv:    "nginx,,apache,  ,postgresql",
-			unprefixedEnv:  "",
-			expected:       []string{"nginx.service", "apache.service", "postgresql.service"},
-			cleanupEnvVars: true,
-		},
-		{
-			name:           "wildcard pattern",
-			prefixedEnv:    "*nginx*,*apache*",
-			unprefixedEnv:  "",
-			expected:       []string{"*nginx*.service", "*apache*.service"},
-			cleanupEnvVars: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Clean up any existing env vars
-			os.Unsetenv("BESZEL_AGENT_SERVICE_PATTERNS")
-			os.Unsetenv("SERVICE_PATTERNS")
-
-			// Set up environment variables
-			if tt.prefixedEnv != "" {
-				os.Setenv("BESZEL_AGENT_SERVICE_PATTERNS", tt.prefixedEnv)
-			}
-			if tt.unprefixedEnv != "" {
-				os.Setenv("SERVICE_PATTERNS", tt.unprefixedEnv)
-			}
-
-			// Run the function
-			result := getServicePatterns()
-
-			// Verify results
-			assert.Equal(t, tt.expected, result, "Patterns should match expected values")
-
-			// Cleanup
-			if tt.cleanupEnvVars {
-				os.Unsetenv("BESZEL_AGENT_SERVICE_PATTERNS")
-				os.Unsetenv("SERVICE_PATTERNS")
-			}
-		})
-	}
-}

agent/test-data/system_info.json

@@ -1,17 +0,0 @@
-{
-  "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-  "Containers": 14,
-  "ContainersRunning": 3,
-  "ContainersPaused": 1,
-  "ContainersStopped": 10,
-  "Images": 508,
-  "Driver": "overlay2",
-  "KernelVersion": "6.8.0-31-generic",
-  "OperatingSystem": "Ubuntu 24.04 LTS",
-  "OSVersion": "24.04",
-  "OSType": "linux",
-  "Architecture": "x86_64",
-  "NCPU": 4,
-  "MemTotal": 2095882240,
-  "ServerVersion": "27.0.1"
-}

agent/tools/fetchsmartctl/main.go

@@ -1,130 +0,0 @@
-package main
-
-import (
-	"crypto/sha1"
-	"crypto/sha256"
-	"encoding/hex"
-	"flag"
-	"fmt"
-	"hash"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// Download smartctl.exe from the given URL and save it to the given destination.
-// This is used to embed smartctl.exe in the Windows build.
-
-func main() {
-	url := flag.String("url", "", "URL to download smartctl.exe from (required)")
-	out := flag.String("out", "", "Destination path for smartctl.exe (required)")
-	sha := flag.String("sha", "", "Optional SHA1/SHA256 checksum for integrity validation")
-	force := flag.Bool("force", false, "Force re-download even if destination exists")
-	flag.Parse()
-
-	if *url == "" || *out == "" {
-		fatalf("-url and -out are required")
-	}
-
-	if !*force {
-		if info, err := os.Stat(*out); err == nil && info.Size() > 0 {
-			fmt.Println("smartctl.exe already present, skipping download")
-			return
-		}
-	}
-
-	if err := downloadFile(*url, *out, *sha); err != nil {
-		fatalf("download failed: %v", err)
-	}
-}
-
-func downloadFile(url, dest, shaHex string) error {
-	// Prepare destination
-	if err := os.MkdirAll(filepath.Dir(dest), 0o755); err != nil {
-		return fmt.Errorf("create dir: %w", err)
-	}
-
-	// HTTP client
-	client := &http.Client{Timeout: 60 * time.Second}
-	req, err := http.NewRequest(http.MethodGet, url, nil)
-	if err != nil {
-		return fmt.Errorf("new request: %w", err)
-	}
-	req.Header.Set("User-Agent", "beszel-fetchsmartctl/1.0")
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return fmt.Errorf("http get: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("unexpected HTTP status: %s", resp.Status)
-	}
-
-	tmp := dest + ".tmp"
-	f, err := os.OpenFile(tmp, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o644)
-	if err != nil {
-		return fmt.Errorf("open tmp: %w", err)
-	}
-
-	// Determine hash algorithm based on length (SHA1=40, SHA256=64)
-	var hasher hash.Hash
-	if shaHex := strings.TrimSpace(shaHex); shaHex != "" {
-		cleanSha := strings.ToLower(strings.ReplaceAll(shaHex, " ", ""))
-		switch len(cleanSha) {
-		case 40:
-			hasher = sha1.New()
-		case 64:
-			hasher = sha256.New()
-		default:
-			f.Close()
-			os.Remove(tmp)
-			return fmt.Errorf("unsupported hash length: %d (expected 40 for SHA1 or 64 for SHA256)", len(cleanSha))
-		}
-	}
-
-	var mw io.Writer = f
-	if hasher != nil {
-		mw = io.MultiWriter(f, hasher)
-	}
-	if _, err := io.Copy(mw, resp.Body); err != nil {
-		f.Close()
-		os.Remove(tmp)
-		return fmt.Errorf("write tmp: %w", err)
-	}
-	if err := f.Close(); err != nil {
-		os.Remove(tmp)
-		return fmt.Errorf("close tmp: %w", err)
-	}
-
-	if hasher != nil && shaHex != "" {
-		cleanSha := strings.ToLower(strings.ReplaceAll(strings.TrimSpace(shaHex), " ", ""))
-		got := strings.ToLower(hex.EncodeToString(hasher.Sum(nil)))
-		if got != cleanSha {
-			os.Remove(tmp)
-			return fmt.Errorf("hash mismatch: got %s want %s", got, cleanSha)
-		}
-	}
-
-	// Make executable and move into place
-	if err := os.Chmod(tmp, 0o755); err != nil {
-		os.Remove(tmp)
-		return fmt.Errorf("chmod: %w", err)
-	}
-	if err := os.Rename(tmp, dest); err != nil {
-		os.Remove(tmp)
-		return fmt.Errorf("rename: %w", err)
-	}
-
-	fmt.Println("smartctl.exe downloaded to", dest)
-	return nil
-}
-
-func fatalf(format string, a ...any) {
-	fmt.Fprintf(os.Stderr, format+"\n", a...)
-	os.Exit(1)
-}

beszel.go

@@ -6,7 +6,7 @@ import "github.com/blang/semver"
 
 const (
 	// Version is the current version of the application.
-	Version = "0.18.0-beta.1"
+	Version = "0.15.2"
 	// AppName is the name of the application.
 	AppName = "beszel"
 )

go.mod

@@ -1,25 +1,24 @@
 module github.com/henrygd/beszel
 
-go 1.25.5
+go 1.25.3
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/coreos/go-systemd/v22 v22.6.0
 	github.com/distatus/battery v0.11.0
 	github.com/fxamacker/cbor/v2 v2.9.0
 	github.com/gliderlabs/ssh v0.3.8
 	github.com/google/uuid v1.6.0
 	github.com/lxzan/gws v1.8.9
-	github.com/nicholas-fedor/shoutrrr v0.12.1
+	github.com/nicholas-fedor/shoutrrr v0.11.0
 	github.com/pocketbase/dbx v1.11.0
-	github.com/pocketbase/pocketbase v0.34.0
-	github.com/shirou/gopsutil/v4 v4.25.10
+	github.com/pocketbase/pocketbase v0.31.0
+	github.com/shirou/gopsutil/v4 v4.25.9
 	github.com/spf13/cast v1.10.0
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10
 	github.com/stretchr/testify v1.11.1
-	golang.org/x/crypto v0.45.0
-	golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39
+	golang.org/x/crypto v0.43.0
+	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -31,14 +30,13 @@ require (
 	github.com/dolthub/maphash v0.1.0 // indirect
 	github.com/domodwyer/mailyak/v3 v3.6.2 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ebitengine/purego v0.9.1 // indirect
+	github.com/ebitengine/purego v0.9.0 // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.10 // indirect
 	github.com/ganigeorgiev/fexpr v0.5.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
 	github.com/go-sql-driver/mysql v1.9.1 // indirect
-	github.com/godbus/dbus/v5 v5.2.0 // indirect
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/compress v1.18.1 // indirect
@@ -49,20 +47,20 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/tklauser/go-sysconf v0.3.16 // indirect
-	github.com/tklauser/numcpus v0.11.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.15 // indirect
+	github.com/tklauser/numcpus v0.10.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/image v0.33.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.33.0 // indirect
-	golang.org/x/sync v0.18.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/image v0.32.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/oauth2 v0.32.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/term v0.36.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	howett.net/plist v1.0.1 // indirect
 	modernc.org/libc v1.66.10 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.40.1 // indirect
+	modernc.org/sqlite v1.39.1 // indirect
 )

go.sum

@@ -9,8 +9,6 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
-github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -25,16 +23,16 @@ github.com/domodwyer/mailyak/v3 v3.6.2 h1:x3tGMsyFhTCaxp6ycgR0FE/bu5QiNp+hetUuCO
 github.com/domodwyer/mailyak/v3 v3.6.2/go.mod h1:lOm/u9CyCVWHeaAmHIdF4RiKVxKUT/H5XX10lIKAL6c=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
-github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.9.0 h1:mh0zpKBIXDceC63hpvPuGLiJ8ZAa3DfrFTudmfi8A4k=
+github.com/ebitengine/purego v0.9.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik=
-github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
+github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
 github.com/ganigeorgiev/fexpr v0.5.0 h1:XA9JxtTE/Xm+g/JFI6RfZEHSiQlk+1glLvRK1Lpv/Tk=
 github.com/ganigeorgiev/fexpr v0.5.0/go.mod h1:RyGiGqmeXhEQ6+mlGdnUleLHgtzzu/VGO2WtJkF5drE=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
@@ -51,19 +49,15 @@ github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtS
 github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
-github.com/godbus/dbus/v5 v5.2.0 h1:3WexO+U+yg9T70v9FdHr9kCxYlazaAXUhx2VMkbfax8=
-github.com/godbus/dbus/v5 v5.2.0/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
 github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
 github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8 h1:3DsUAV+VNEQa2CUVLxCY3f87278uWfIDhJnbdvDjvmE=
-github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
+github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d h1:KJIErDwbSHjnp/SGzE5ed8Aol7JsKiI5X7yWKAtzhM0=
+github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A=
@@ -85,10 +79,10 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/nicholas-fedor/shoutrrr v0.12.1 h1:8NjY+I3K7cGHy89ncnaPGUA0ex44XbYK3SAFJX9YMI8=
-github.com/nicholas-fedor/shoutrrr v0.12.1/go.mod h1:64qWuPpvTUv9ZppEoR6OdroiFmgf9w11YSaR0h9KZGg=
-github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
-github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
+github.com/nicholas-fedor/shoutrrr v0.11.0 h1:hAMv2uM8OfFXkMHVP977elkP3Wgw5/YpVX5GxXQwiWA=
+github.com/nicholas-fedor/shoutrrr v0.11.0/go.mod h1:0kRF9ral22xUn/0BlxfhLQUeJDTySCPsuNvaclyagb4=
+github.com/onsi/ginkgo/v2 v2.27.1 h1:0LJC8MpUSQnfnp4n/3W3GdlmJP3ENGF0ZPzjQGLPP7s=
+github.com/onsi/ginkgo/v2 v2.27.1/go.mod h1:wmy3vCqiBjirARfVhAqFpYt8uvX0yaFe+GudAqqcCqA=
 github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
 github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -96,8 +90,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pocketbase/dbx v1.11.0 h1:LpZezioMfT3K4tLrqA55wWFw1EtH1pM4tzSVa7kgszU=
 github.com/pocketbase/dbx v1.11.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs=
-github.com/pocketbase/pocketbase v0.34.0 h1:5W80PrGvkRYIMAIK90F7w031/hXgZVz1KSuCJqSpgJo=
-github.com/pocketbase/pocketbase v0.34.0/go.mod h1:K/9z/Zb9PR9yW2Qyoc73jHV/EKT8cMTk9bQWyrzYlvI=
+github.com/pocketbase/pocketbase v0.31.0 h1:JaOtSDytdA+a0r4689Mrjda4rmq+BaHgEJkPeOIydms=
+github.com/pocketbase/pocketbase v0.31.0/go.mod h1:p4a83n+DlBcTvvqhC7QDy0KDmQ2la2c6dgxdIBWwKiE=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
@@ -105,8 +99,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qq
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shirou/gopsutil/v4 v4.25.10 h1:at8lk/5T1OgtuCp+AwrDofFRjnvosn0nkN2OLQ6g8tA=
-github.com/shirou/gopsutil/v4 v4.25.10/go.mod h1:+kSwyC8DRUD9XXEHCAFjK+0nuArFJM0lva+StQAcskM=
+github.com/shirou/gopsutil/v4 v4.25.9 h1:JImNpf6gCVhKgZhtaAHJ0serfFGtlfIlSC08eaKdTrU=
+github.com/shirou/gopsutil/v4 v4.25.9/go.mod h1:gxIxoC+7nQRwUl/xNhutXlD8lq+jxTgpIkEf3rADHL8=
 github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
 github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
 github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
@@ -118,77 +112,75 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
-github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
-github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw=
-github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=
+github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
+github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
+github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
+github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
+go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 h1:DHNhtq3sNNzrvduZZIiFyXWOL9IWaDPHqTnLJp+rCBY=
-golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39/go.mod h1:46edojNIoXTNOhySWIWdix628clX9ODXwPsQuG6hsK0=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.33.0 h1:LXRZRnv1+zGd5XBUVRFmYEphyyKJjQjCRiOuAP3sZfQ=
-golang.org/x/image v0.33.0/go.mod h1:DD3OsTYT9chzuzTQt+zMcOlBHgfoKQb1gry8p76Y1sc=
-golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
-golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ=
+golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
-golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
+golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
+golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
 google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM=
 howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
-modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
-modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.30.1 h1:4r4U1J6Fhj98NKfSjnPUN7Ze2c6MnAdL0hWw6+LrJpc=
-modernc.org/ccgo/v4 v4.30.1/go.mod h1:bIOeI1JL54Utlxn+LwrFyjCx2n2RDiYEaJVSrgdrRfM=
+modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
+modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=
+modernc.org/ccgo/v4 v4.28.1/go.mod h1:uD+4RnfrVgE6ec9NGguUNdhqzNIeeomeXf6CL0GTE5Q=
 modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA=
 modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
-modernc.org/gc/v3 v3.1.1 h1:k8T3gkXWY9sEiytKhcgyiZ2L0DTyCQ/nvX+LoCljoRE=
-modernc.org/gc/v3 v3.1.1/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
 modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
 modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
 modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
 modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
-modernc.org/libc v1.67.1 h1:bFaqOaa5/zbWYJo8aW0tXPX21hXsngG2M7mckCnFSVk=
-modernc.org/libc v1.67.1/go.mod h1:QvvnnJ5P7aitu0ReNpVIEyesuhmDLQ8kaEoyMjIFZJA=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
@@ -197,8 +189,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
 modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.40.1 h1:VfuXcxcUWWKRBuP8+BR9L7VnmusMgBNNnBYGEe9w/iY=
-modernc.org/sqlite v1.40.1/go.mod h1:9fjQZ0mB1LLP0GYrp39oOJXx/I2sxEnZtzCmEQIKvGE=
+modernc.org/sqlite v1.39.1 h1:H+/wGFzuSCIEVCvXYVHX5RQglwhMOvtHSv+VtidL2r4=
+modernc.org/sqlite v1.39.1/go.mod h1:9fjQZ0mB1LLP0GYrp39oOJXx/I2sxEnZtzCmEQIKvGE=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

internal/alerts/alerts.go

@@ -28,7 +28,6 @@ type AlertManager struct {
 
 type AlertMessageData struct {
 	UserID   string
-	SystemID string
 	Title    string
 	Message  string
 	Link     string
@@ -41,19 +40,13 @@ type UserNotificationSettings struct {
 }
 
 type SystemAlertStats struct {
-	Cpu          float64                       `json:"cpu"`
-	Mem          float64                       `json:"mp"`
-	Disk         float64                       `json:"dp"`
-	NetSent      float64                       `json:"ns"`
-	NetRecv      float64                       `json:"nr"`
-	GPU          map[string]SystemAlertGPUData `json:"g"`
-	Temperatures map[string]float32            `json:"t"`
-	LoadAvg      [3]float64                    `json:"la"`
-	Battery      [2]uint8                      `json:"bat"`
-}
-
-type SystemAlertGPUData struct {
-	Usage float64 `json:"u"`
+	Cpu          float64            `json:"cpu"`
+	Mem          float64            `json:"mp"`
+	Disk         float64            `json:"dp"`
+	NetSent      float64            `json:"ns"`
+	NetRecv      float64            `json:"nr"`
+	Temperatures map[string]float32 `json:"t"`
+	LoadAvg      [3]float64         `json:"la"`
 }
 
 type SystemAlertData struct {
@@ -79,6 +72,7 @@ var supportsTitle = map[string]struct{}{
 	"ifttt":      {},
 	"join":       {},
 	"lark":       {},
+	"matrix":     {},
 	"ntfy":       {},
 	"opsgenie":   {},
 	"pushbullet": {},
@@ -105,84 +99,10 @@ func NewAlertManager(app hubLike) *AlertManager {
 func (am *AlertManager) bindEvents() {
 	am.hub.OnRecordAfterUpdateSuccess("alerts").BindFunc(updateHistoryOnAlertUpdate)
 	am.hub.OnRecordAfterDeleteSuccess("alerts").BindFunc(resolveHistoryOnAlertDelete)
-	am.hub.OnRecordAfterUpdateSuccess("smart_devices").BindFunc(am.handleSmartDeviceAlert)
-}
-
-// IsNotificationSilenced checks if a notification should be silenced based on configured quiet hours
-func (am *AlertManager) IsNotificationSilenced(userID, systemID string) bool {
-	// Query for quiet hours windows that match this user and system
-	// Include both global windows (system is null/empty) and system-specific windows
-	var filter string
-	var params dbx.Params
-
-	if systemID == "" {
-		// If no systemID provided, only check global windows
-		filter = "user={:user} AND system=''"
-		params = dbx.Params{"user": userID}
-	} else {
-		// Check both global and system-specific windows
-		filter = "user={:user} AND (system='' OR system={:system})"
-		params = dbx.Params{
-			"user":   userID,
-			"system": systemID,
-		}
-	}
-
-	quietHourWindows, err := am.hub.FindAllRecords("quiet_hours", dbx.NewExp(filter, params))
-	if err != nil || len(quietHourWindows) == 0 {
-		return false
-	}
-
-	now := time.Now().UTC()
-
-	for _, window := range quietHourWindows {
-		windowType := window.GetString("type")
-		start := window.GetDateTime("start").Time()
-		end := window.GetDateTime("end").Time()
-
-		if windowType == "daily" {
-			// For daily recurring windows, extract just the time portion and compare
-			// The start/end are stored as full datetime but we only care about HH:MM
-			startHour, startMin, _ := start.Clock()
-			endHour, endMin, _ := end.Clock()
-			nowHour, nowMin, _ := now.Clock()
-
-			// Convert to minutes since midnight for easier comparison
-			startMinutes := startHour*60 + startMin
-			endMinutes := endHour*60 + endMin
-			nowMinutes := nowHour*60 + nowMin
-
-			// Handle case where window crosses midnight
-			if endMinutes < startMinutes {
-				// Window crosses midnight (e.g., 23:00 - 01:00)
-				if nowMinutes >= startMinutes || nowMinutes < endMinutes {
-					return true
-				}
-			} else {
-				// Normal case (e.g., 09:00 - 17:00)
-				if nowMinutes >= startMinutes && nowMinutes < endMinutes {
-					return true
-				}
-			}
-		} else {
-			// One-time window: check if current time is within the date range
-			if (now.After(start) || now.Equal(start)) && now.Before(end) {
-				return true
-			}
-		}
-	}
-
-	return false
 }
 
 // SendAlert sends an alert to the user
 func (am *AlertManager) SendAlert(data AlertMessageData) error {
-	// Check if alert is silenced
-	if am.IsNotificationSilenced(data.UserID, data.SystemID) {
-		am.hub.Logger().Info("Notification silenced", "user", data.UserID, "system", data.SystemID, "title", data.Title)
-		return nil
-	}
-
 	// get user settings
 	record, err := am.hub.FindFirstRecordByFilter(
 		"user_settings", "user={:user}",

internal/alerts/alerts_battery_test.go

@@ -1,387 +0,0 @@
-//go:build testing
-// +build testing
-
-package alerts_test
-
-import (
-	"encoding/json"
-	"testing"
-	"time"
-
-	"github.com/henrygd/beszel/internal/entities/system"
-	beszelTests "github.com/henrygd/beszel/internal/tests"
-
-	"github.com/pocketbase/dbx"
-	"github.com/pocketbase/pocketbase/tools/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestBatteryAlertLogic tests that battery alerts trigger when value drops BELOW threshold
-// (opposite of other alerts like CPU, Memory, etc. which trigger when exceeding threshold)
-func TestBatteryAlertLogic(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system
-	systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-	require.NoError(t, err)
-	systemRecord := systems[0]
-
-	// Create a battery alert with threshold of 20% and min of 1 minute (immediate trigger)
-	batteryAlert, err := beszelTests.CreateRecord(hub, "alerts", map[string]any{
-		"name":   "Battery",
-		"system": systemRecord.Id,
-		"user":   user.Id,
-		"value":  20, // threshold: 20%
-		"min":    1,  // 1 minute (immediate trigger for testing)
-	})
-	require.NoError(t, err)
-
-	// Verify alert is not triggered initially
-	assert.False(t, batteryAlert.GetBool("triggered"), "Alert should not be triggered initially")
-
-	// Create system stats with battery at 50% (above threshold - should NOT trigger)
-	statsHigh := system.Stats{
-		Cpu:     10,
-		MemPct:  30,
-		DiskPct: 40,
-		Battery: [2]uint8{50, 1}, // 50% battery, discharging
-	}
-	statsHighJSON, _ := json.Marshal(statsHigh)
-	_, err = beszelTests.CreateRecord(hub, "system_stats", map[string]any{
-		"system": systemRecord.Id,
-		"type":   "1m",
-		"stats":  string(statsHighJSON),
-	})
-	require.NoError(t, err)
-
-	// Create CombinedData for the alert handler
-	combinedDataHigh := &system.CombinedData{
-		Stats: statsHigh,
-		Info: system.Info{
-			AgentVersion: "0.12.0",
-			Cpu:          10,
-			MemPct:       30,
-			DiskPct:      40,
-		},
-	}
-
-	// Simulate system update time
-	systemRecord.Set("updated", time.Now().UTC())
-	err = hub.SaveNoValidate(systemRecord)
-	require.NoError(t, err)
-
-	// Handle system alerts with high battery
-	am := hub.GetAlertManager()
-	err = am.HandleSystemAlerts(systemRecord, combinedDataHigh)
-	require.NoError(t, err)
-
-	// Verify alert is still NOT triggered (battery 50% is above threshold 20%)
-	batteryAlert, err = hub.FindFirstRecordByFilter("alerts", "id={:id}", dbx.Params{"id": batteryAlert.Id})
-	require.NoError(t, err)
-	assert.False(t, batteryAlert.GetBool("triggered"), "Alert should NOT be triggered when battery (50%%) is above threshold (20%%)")
-
-	// Now create stats with battery at 15% (below threshold - should trigger)
-	statsLow := system.Stats{
-		Cpu:     10,
-		MemPct:  30,
-		DiskPct: 40,
-		Battery: [2]uint8{15, 1}, // 15% battery, discharging
-	}
-	statsLowJSON, _ := json.Marshal(statsLow)
-	_, err = beszelTests.CreateRecord(hub, "system_stats", map[string]any{
-		"system": systemRecord.Id,
-		"type":   "1m",
-		"stats":  string(statsLowJSON),
-	})
-	require.NoError(t, err)
-
-	combinedDataLow := &system.CombinedData{
-		Stats: statsLow,
-		Info: system.Info{
-			AgentVersion: "0.12.0",
-			Cpu:          10,
-			MemPct:       30,
-			DiskPct:      40,
-		},
-	}
-
-	// Update system timestamp
-	systemRecord.Set("updated", time.Now().UTC())
-	err = hub.SaveNoValidate(systemRecord)
-	require.NoError(t, err)
-
-	// Handle system alerts with low battery
-	err = am.HandleSystemAlerts(systemRecord, combinedDataLow)
-	require.NoError(t, err)
-
-	// Wait for the alert to be processed
-	time.Sleep(20 * time.Millisecond)
-
-	// Verify alert IS triggered (battery 15% is below threshold 20%)
-	batteryAlert, err = hub.FindFirstRecordByFilter("alerts", "id={:id}", dbx.Params{"id": batteryAlert.Id})
-	require.NoError(t, err)
-	assert.True(t, batteryAlert.GetBool("triggered"), "Alert SHOULD be triggered when battery (15%%) drops below threshold (20%%)")
-
-	// Now test resolution: battery goes back above threshold
-	statsRecovered := system.Stats{
-		Cpu:     10,
-		MemPct:  30,
-		DiskPct: 40,
-		Battery: [2]uint8{25, 1}, // 25% battery, discharging
-	}
-	statsRecoveredJSON, _ := json.Marshal(statsRecovered)
-	_, err = beszelTests.CreateRecord(hub, "system_stats", map[string]any{
-		"system": systemRecord.Id,
-		"type":   "1m",
-		"stats":  string(statsRecoveredJSON),
-	})
-	require.NoError(t, err)
-
-	combinedDataRecovered := &system.CombinedData{
-		Stats: statsRecovered,
-		Info: system.Info{
-			AgentVersion: "0.12.0",
-			Cpu:          10,
-			MemPct:       30,
-			DiskPct:      40,
-		},
-	}
-
-	// Update system timestamp
-	systemRecord.Set("updated", time.Now().UTC())
-	err = hub.SaveNoValidate(systemRecord)
-	require.NoError(t, err)
-
-	// Handle system alerts with recovered battery
-	err = am.HandleSystemAlerts(systemRecord, combinedDataRecovered)
-	require.NoError(t, err)
-
-	// Wait for the alert to be processed
-	time.Sleep(20 * time.Millisecond)
-
-	// Verify alert is now resolved (battery 25% is above threshold 20%)
-	batteryAlert, err = hub.FindFirstRecordByFilter("alerts", "id={:id}", dbx.Params{"id": batteryAlert.Id})
-	require.NoError(t, err)
-	assert.False(t, batteryAlert.GetBool("triggered"), "Alert should be resolved when battery (25%%) goes above threshold (20%%)")
-}
-
-// TestBatteryAlertNoBattery verifies that systems without battery data don't trigger alerts
-func TestBatteryAlertNoBattery(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system
-	systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-	require.NoError(t, err)
-	systemRecord := systems[0]
-
-	// Create a battery alert
-	batteryAlert, err := beszelTests.CreateRecord(hub, "alerts", map[string]any{
-		"name":   "Battery",
-		"system": systemRecord.Id,
-		"user":   user.Id,
-		"value":  20,
-		"min":    1,
-	})
-	require.NoError(t, err)
-
-	// Create stats with NO battery data (Battery[0] = 0)
-	statsNoBattery := system.Stats{
-		Cpu:     10,
-		MemPct:  30,
-		DiskPct: 40,
-		Battery: [2]uint8{0, 0}, // No battery
-	}
-
-	combinedData := &system.CombinedData{
-		Stats: statsNoBattery,
-		Info: system.Info{
-			AgentVersion: "0.12.0",
-			Cpu:          10,
-			MemPct:       30,
-			DiskPct:      40,
-		},
-	}
-
-	// Simulate system update time
-	systemRecord.Set("updated", time.Now().UTC())
-	err = hub.SaveNoValidate(systemRecord)
-	require.NoError(t, err)
-
-	// Handle system alerts
-	am := hub.GetAlertManager()
-	err = am.HandleSystemAlerts(systemRecord, combinedData)
-	require.NoError(t, err)
-
-	// Wait a moment for processing
-	time.Sleep(20 * time.Millisecond)
-
-	// Verify alert is NOT triggered (no battery data should skip the alert)
-	batteryAlert, err = hub.FindFirstRecordByFilter("alerts", "id={:id}", dbx.Params{"id": batteryAlert.Id})
-	require.NoError(t, err)
-	assert.False(t, batteryAlert.GetBool("triggered"), "Alert should NOT be triggered when system has no battery")
-}
-
-// TestBatteryAlertAveragedSamples tests battery alerts with min > 1 (averaging multiple samples)
-// This ensures the inverted threshold logic works correctly across averaged time windows
-func TestBatteryAlertAveragedSamples(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system
-	systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-	require.NoError(t, err)
-	systemRecord := systems[0]
-
-	// Create a battery alert with threshold of 25% and min of 2 minutes (requires averaging)
-	batteryAlert, err := beszelTests.CreateRecord(hub, "alerts", map[string]any{
-		"name":   "Battery",
-		"system": systemRecord.Id,
-		"user":   user.Id,
-		"value":  25, // threshold: 25%
-		"min":    2,  // 2 minutes - requires averaging
-	})
-	require.NoError(t, err)
-
-	// Verify alert is not triggered initially
-	assert.False(t, batteryAlert.GetBool("triggered"), "Alert should not be triggered initially")
-
-	am := hub.GetAlertManager()
-	now := time.Now().UTC()
-
-	// Create system_stats records with low battery (below threshold)
-	// The alert has min=2 minutes, so alert.time = now - 2 minutes
-	// For the alert to be valid, alert.time must be AFTER the oldest record's created time
-	// So we need records older than (now - 2 min), plus records within the window
-	// Records at: now-3min (oldest, before window), now-90s, now-60s, now-30s
-	recordTimes := []time.Duration{
-		-180 * time.Second, // 3 min ago - this makes the oldest record before alert.time
-		-90 * time.Second,
-		-60 * time.Second,
-		-30 * time.Second,
-	}
-
-	for _, offset := range recordTimes {
-		statsLow := system.Stats{
-			Cpu:     10,
-			MemPct:  30,
-			DiskPct: 40,
-			Battery: [2]uint8{15, 1}, // 15% battery (below 25% threshold)
-		}
-		statsLowJSON, _ := json.Marshal(statsLow)
-
-		recordTime := now.Add(offset)
-		record, err := beszelTests.CreateRecord(hub, "system_stats", map[string]any{
-			"system": systemRecord.Id,
-			"type":   "1m",
-			"stats":  string(statsLowJSON),
-		})
-		require.NoError(t, err)
-		// Update created time to simulate historical records - use SetRaw with formatted string
-		record.SetRaw("created", recordTime.Format(types.DefaultDateLayout))
-		err = hub.SaveNoValidate(record)
-		require.NoError(t, err)
-	}
-
-	// Create combined data with low battery
-	combinedDataLow := &system.CombinedData{
-		Stats: system.Stats{
-			Cpu:     10,
-			MemPct:  30,
-			DiskPct: 40,
-			Battery: [2]uint8{15, 1},
-		},
-		Info: system.Info{
-			AgentVersion: "0.12.0",
-			Cpu:          10,
-			MemPct:       30,
-			DiskPct:      40,
-		},
-	}
-
-	// Update system timestamp
-	systemRecord.Set("updated", now)
-	err = hub.SaveNoValidate(systemRecord)
-	require.NoError(t, err)
-
-	// Handle system alerts - should trigger because average battery is below threshold
-	err = am.HandleSystemAlerts(systemRecord, combinedDataLow)
-	require.NoError(t, err)
-
-	// Wait for alert processing
-	time.Sleep(20 * time.Millisecond)
-
-	// Verify alert IS triggered (average battery 15% is below threshold 25%)
-	batteryAlert, err = hub.FindFirstRecordByFilter("alerts", "id={:id}", dbx.Params{"id": batteryAlert.Id})
-	require.NoError(t, err)
-	assert.True(t, batteryAlert.GetBool("triggered"),
-		"Alert SHOULD be triggered when average battery (15%%) is below threshold (25%%) over min period")
-
-	// Now add records with high battery to test resolution
-	// Use a new time window 2 minutes later
-	newNow := now.Add(2 * time.Minute)
-	// Records need to span before the alert time window (newNow - 2 min)
-	recordTimesHigh := []time.Duration{
-		-180 * time.Second, // 3 min before newNow - makes oldest record before alert.time
-		-90 * time.Second,
-		-60 * time.Second,
-		-30 * time.Second,
-	}
-
-	for _, offset := range recordTimesHigh {
-		statsHigh := system.Stats{
-			Cpu:     10,
-			MemPct:  30,
-			DiskPct: 40,
-			Battery: [2]uint8{50, 1}, // 50% battery (above 25% threshold)
-		}
-		statsHighJSON, _ := json.Marshal(statsHigh)
-
-		recordTime := newNow.Add(offset)
-		record, err := beszelTests.CreateRecord(hub, "system_stats", map[string]any{
-			"system": systemRecord.Id,
-			"type":   "1m",
-			"stats":  string(statsHighJSON),
-		})
-		require.NoError(t, err)
-		record.SetRaw("created", recordTime.Format(types.DefaultDateLayout))
-		err = hub.SaveNoValidate(record)
-		require.NoError(t, err)
-	}
-
-	// Create combined data with high battery
-	combinedDataHigh := &system.CombinedData{
-		Stats: system.Stats{
-			Cpu:     10,
-			MemPct:  30,
-			DiskPct: 40,
-			Battery: [2]uint8{50, 1},
-		},
-		Info: system.Info{
-			AgentVersion: "0.12.0",
-			Cpu:          10,
-			MemPct:       30,
-			DiskPct:      40,
-		},
-	}
-
-	// Update system timestamp to the new time window
-	systemRecord.Set("updated", newNow)
-	err = hub.SaveNoValidate(systemRecord)
-	require.NoError(t, err)
-
-	// Handle system alerts - should resolve because average battery is now above threshold
-	err = am.HandleSystemAlerts(systemRecord, combinedDataHigh)
-	require.NoError(t, err)
-
-	// Wait for alert processing
-	time.Sleep(20 * time.Millisecond)
-
-	// Verify alert is resolved (average battery 50% is above threshold 25%)
-	batteryAlert, err = hub.FindFirstRecordByFilter("alerts", "id={:id}", dbx.Params{"id": batteryAlert.Id})
-	require.NoError(t, err)
-	assert.False(t, batteryAlert.GetBool("triggered"),
-		"Alert should be resolved when average battery (50%%) is above threshold (25%%) over min period")
-}

internal/alerts/alerts_quiet_hours_test.go

@@ -1,426 +0,0 @@
-//go:build testing
-// +build testing
-
-package alerts_test
-
-import (
-	"testing"
-	"testing/synctest"
-	"time"
-
-	"github.com/henrygd/beszel/internal/alerts"
-	beszelTests "github.com/henrygd/beszel/internal/tests"
-
-	"github.com/pocketbase/dbx"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAlertSilencedOneTime(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system
-	systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-	assert.NoError(t, err)
-	system := systems[0]
-
-	// Create an alert
-	alert, err := beszelTests.CreateRecord(hub, "alerts", map[string]any{
-		"name":   "CPU",
-		"system": system.Id,
-		"user":   user.Id,
-		"value":  80,
-		"min":    1,
-	})
-	assert.NoError(t, err)
-
-	// Create a one-time quiet hours window (current time - 1 hour to current time + 1 hour)
-	now := time.Now().UTC()
-	startTime := now.Add(-1 * time.Hour)
-	endTime := now.Add(1 * time.Hour)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user.Id,
-		"system": system.Id,
-		"type":   "one-time",
-		"start":  startTime,
-		"end":    endTime,
-	})
-	assert.NoError(t, err)
-
-	// Get alert manager
-	am := alerts.NewAlertManager(hub)
-	defer am.StopWorker()
-
-	// Test that alert is silenced
-	silenced := am.IsNotificationSilenced(user.Id, system.Id)
-	assert.True(t, silenced, "Alert should be silenced during active one-time window")
-
-	// Create a window that has already ended
-	pastStart := now.Add(-3 * time.Hour)
-	pastEnd := now.Add(-2 * time.Hour)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user.Id,
-		"system": system.Id,
-		"type":   "one-time",
-		"start":  pastStart,
-		"end":    pastEnd,
-	})
-	assert.NoError(t, err)
-
-	// Should still be silenced because of the first window
-	silenced = am.IsNotificationSilenced(user.Id, system.Id)
-	assert.True(t, silenced, "Alert should still be silenced (past window doesn't affect active window)")
-
-	// Clear all windows and create a future window
-	_, err = hub.DB().NewQuery("DELETE FROM quiet_hours").Execute()
-	assert.NoError(t, err)
-
-	futureStart := now.Add(2 * time.Hour)
-	futureEnd := now.Add(3 * time.Hour)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user.Id,
-		"system": system.Id,
-		"type":   "one-time",
-		"start":  futureStart,
-		"end":    futureEnd,
-	})
-	assert.NoError(t, err)
-
-	// Alert should NOT be silenced (window hasn't started yet)
-	silenced = am.IsNotificationSilenced(user.Id, system.Id)
-	assert.False(t, silenced, "Alert should not be silenced (window hasn't started)")
-
-	_ = alert
-}
-
-func TestAlertSilencedDaily(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system
-	systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-	assert.NoError(t, err)
-	system := systems[0]
-
-	// Get alert manager
-	am := alerts.NewAlertManager(hub)
-	defer am.StopWorker()
-
-	// Get current hour and create a window that includes current time
-	now := time.Now().UTC()
-	currentHour := now.Hour()
-	currentMin := now.Minute()
-
-	// Create a window from 1 hour ago to 1 hour from now
-	startHour := (currentHour - 1 + 24) % 24
-	endHour := (currentHour + 1) % 24
-
-	// Create times with just the hours/minutes we want (date doesn't matter for daily)
-	startTime := time.Date(2000, 1, 1, startHour, currentMin, 0, 0, time.UTC)
-	endTime := time.Date(2000, 1, 1, endHour, currentMin, 0, 0, time.UTC)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user.Id,
-		"system": system.Id,
-		"type":   "daily",
-		"start":  startTime,
-		"end":    endTime,
-	})
-	assert.NoError(t, err)
-
-	// Alert should be silenced (current time is within the daily window)
-	silenced := am.IsNotificationSilenced(user.Id, system.Id)
-	assert.True(t, silenced, "Alert should be silenced during active daily window")
-
-	// Clear windows and create one that doesn't include current time
-	_, err = hub.DB().NewQuery("DELETE FROM quiet_hours").Execute()
-	assert.NoError(t, err)
-
-	// Create a window from 6-12 hours from now
-	futureStartHour := (currentHour + 6) % 24
-	futureEndHour := (currentHour + 12) % 24
-
-	startTime = time.Date(2000, 1, 1, futureStartHour, 0, 0, 0, time.UTC)
-	endTime = time.Date(2000, 1, 1, futureEndHour, 0, 0, 0, time.UTC)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user.Id,
-		"system": system.Id,
-		"type":   "daily",
-		"start":  startTime,
-		"end":    endTime,
-	})
-	assert.NoError(t, err)
-
-	// Alert should NOT be silenced
-	silenced = am.IsNotificationSilenced(user.Id, system.Id)
-	assert.False(t, silenced, "Alert should not be silenced (outside daily window)")
-}
-
-func TestAlertSilencedDailyMidnightCrossing(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system
-	systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-	assert.NoError(t, err)
-	system := systems[0]
-
-	// Get alert manager
-	am := alerts.NewAlertManager(hub)
-	defer am.StopWorker()
-
-	// Create a window that crosses midnight: 22:00 - 02:00
-	startTime := time.Date(2000, 1, 1, 22, 0, 0, 0, time.UTC)
-	endTime := time.Date(2000, 1, 1, 2, 0, 0, 0, time.UTC)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user.Id,
-		"system": system.Id,
-		"type":   "daily",
-		"start":  startTime,
-		"end":    endTime,
-	})
-	assert.NoError(t, err)
-
-	// Test with a time at 23:00 (should be silenced)
-	// We can't control the actual current time, but we can verify the logic
-	// by checking if the window was created correctly
-	windows, err := hub.FindAllRecords("quiet_hours", dbx.HashExp{
-		"user":   user.Id,
-		"system": system.Id,
-	})
-	assert.NoError(t, err)
-	assert.Len(t, windows, 1, "Should have created 1 window")
-
-	window := windows[0]
-	assert.Equal(t, "daily", window.GetString("type"))
-	assert.Equal(t, 22, window.GetDateTime("start").Time().Hour())
-	assert.Equal(t, 2, window.GetDateTime("end").Time().Hour())
-}
-
-func TestAlertSilencedGlobal(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create multiple systems
-	systems, err := beszelTests.CreateSystems(hub, 3, user.Id, "up")
-	assert.NoError(t, err)
-
-	// Get alert manager
-	am := alerts.NewAlertManager(hub)
-	defer am.StopWorker()
-
-	// Create a global quiet hours window (no system specified)
-	now := time.Now().UTC()
-	startTime := now.Add(-1 * time.Hour)
-	endTime := now.Add(1 * time.Hour)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":  user.Id,
-		"type":  "one-time",
-		"start": startTime,
-		"end":   endTime,
-		// system field is empty/null for global windows
-	})
-	assert.NoError(t, err)
-
-	// All systems should be silenced
-	for _, system := range systems {
-		silenced := am.IsNotificationSilenced(user.Id, system.Id)
-		assert.True(t, silenced, "Alert should be silenced for system %s (global window)", system.Id)
-	}
-
-	// Even with a systemID that doesn't exist, should be silenced
-	silenced := am.IsNotificationSilenced(user.Id, "nonexistent-system")
-	assert.True(t, silenced, "Alert should be silenced for any system (global window)")
-}
-
-func TestAlertSilencedSystemSpecific(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create multiple systems
-	systems, err := beszelTests.CreateSystems(hub, 2, user.Id, "up")
-	assert.NoError(t, err)
-	system1 := systems[0]
-	system2 := systems[1]
-
-	// Get alert manager
-	am := alerts.NewAlertManager(hub)
-	defer am.StopWorker()
-
-	// Create a system-specific quiet hours window for system1 only
-	now := time.Now().UTC()
-	startTime := now.Add(-1 * time.Hour)
-	endTime := now.Add(1 * time.Hour)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user.Id,
-		"system": system1.Id,
-		"type":   "one-time",
-		"start":  startTime,
-		"end":    endTime,
-	})
-	assert.NoError(t, err)
-
-	// System1 should be silenced
-	silenced := am.IsNotificationSilenced(user.Id, system1.Id)
-	assert.True(t, silenced, "Alert should be silenced for system1")
-
-	// System2 should NOT be silenced
-	silenced = am.IsNotificationSilenced(user.Id, system2.Id)
-	assert.False(t, silenced, "Alert should not be silenced for system2")
-}
-
-func TestAlertSilencedMultiUser(t *testing.T) {
-	hub, _ := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create two users
-	user1, err := beszelTests.CreateUser(hub, "user1@example.com", "password")
-	assert.NoError(t, err)
-
-	user2, err := beszelTests.CreateUser(hub, "user2@example.com", "password")
-	assert.NoError(t, err)
-
-	// Create a system accessible to both users
-	system, err := beszelTests.CreateRecord(hub, "systems", map[string]any{
-		"name":  "shared-system",
-		"users": []string{user1.Id, user2.Id},
-		"host":  "127.0.0.1",
-	})
-	assert.NoError(t, err)
-
-	// Get alert manager
-	am := alerts.NewAlertManager(hub)
-	defer am.StopWorker()
-
-	// Create a quiet hours window for user1 only
-	now := time.Now().UTC()
-	startTime := now.Add(-1 * time.Hour)
-	endTime := now.Add(1 * time.Hour)
-
-	_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-		"user":   user1.Id,
-		"system": system.Id,
-		"type":   "one-time",
-		"start":  startTime,
-		"end":    endTime,
-	})
-	assert.NoError(t, err)
-
-	// User1 should be silenced
-	silenced := am.IsNotificationSilenced(user1.Id, system.Id)
-	assert.True(t, silenced, "Alert should be silenced for user1")
-
-	// User2 should NOT be silenced
-	silenced = am.IsNotificationSilenced(user2.Id, system.Id)
-	assert.False(t, silenced, "Alert should not be silenced for user2")
-}
-
-func TestAlertSilencedWithActualAlert(t *testing.T) {
-	synctest.Test(t, func(t *testing.T) {
-		hub, user := beszelTests.GetHubWithUser(t)
-		defer hub.Cleanup()
-
-		// Create a system
-		systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-		assert.NoError(t, err)
-		system := systems[0]
-
-		// Create a status alert
-		_, err = beszelTests.CreateRecord(hub, "alerts", map[string]any{
-			"name":   "Status",
-			"system": system.Id,
-			"user":   user.Id,
-			"min":    1,
-		})
-		assert.NoError(t, err)
-
-		// Create user settings with email
-		userSettings, err := hub.FindFirstRecordByFilter("user_settings", "user={:user}", dbx.Params{"user": user.Id})
-		if err != nil || userSettings == nil {
-			userSettings, err = beszelTests.CreateRecord(hub, "user_settings", map[string]any{
-				"user": user.Id,
-				"settings": map[string]any{
-					"emails": []string{"test@example.com"},
-				},
-			})
-			assert.NoError(t, err)
-		}
-
-		// Create a quiet hours window
-		now := time.Now().UTC()
-		startTime := now.Add(-1 * time.Hour)
-		endTime := now.Add(1 * time.Hour)
-
-		_, err = beszelTests.CreateRecord(hub, "quiet_hours", map[string]any{
-			"user":   user.Id,
-			"system": system.Id,
-			"type":   "one-time",
-			"start":  startTime,
-			"end":    endTime,
-		})
-		assert.NoError(t, err)
-
-		// Get initial email count
-		initialEmailCount := hub.TestMailer.TotalSend()
-
-		// Trigger an alert by setting system to down
-		system.Set("status", "down")
-		err = hub.SaveNoValidate(system)
-		assert.NoError(t, err)
-
-		// Wait for the alert to be processed (1 minute + buffer)
-		time.Sleep(time.Second * 75)
-		synctest.Wait()
-
-		// Check that no email was sent (because alert is silenced)
-		finalEmailCount := hub.TestMailer.TotalSend()
-		assert.Equal(t, initialEmailCount, finalEmailCount, "No emails should be sent when alert is silenced")
-
-		// Clear quiet hours windows
-		_, err = hub.DB().NewQuery("DELETE FROM quiet_hours").Execute()
-		assert.NoError(t, err)
-
-		// Reset system to up, then down again
-		system.Set("status", "up")
-		err = hub.SaveNoValidate(system)
-		assert.NoError(t, err)
-		time.Sleep(100 * time.Millisecond)
-
-		system.Set("status", "down")
-		err = hub.SaveNoValidate(system)
-		assert.NoError(t, err)
-
-		// Wait for the alert to be processed
-		time.Sleep(time.Second * 75)
-		synctest.Wait()
-
-		// Now an email should be sent
-		newEmailCount := hub.TestMailer.TotalSend()
-		assert.Greater(t, newEmailCount, finalEmailCount, "Email should be sent when not silenced")
-	})
-}
-
-func TestAlertSilencedNoWindows(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system
-	systems, err := beszelTests.CreateSystems(hub, 1, user.Id, "up")
-	assert.NoError(t, err)
-	system := systems[0]
-
-	// Get alert manager
-	am := alerts.NewAlertManager(hub)
-	defer am.StopWorker()
-
-	// Without any quiet hours windows, alert should NOT be silenced
-	silenced := am.IsNotificationSilenced(user.Id, system.Id)
-	assert.False(t, silenced, "Alert should not be silenced when no windows exist")
-}

internal/alerts/alerts_smart.go

@@ -1,67 +0,0 @@
-package alerts
-
-import (
-	"fmt"
-
-	"github.com/pocketbase/pocketbase/core"
-)
-
-// handleSmartDeviceAlert sends alerts when a SMART device state changes from PASSED to FAILED.
-// This is automatic and does not require user opt-in.
-func (am *AlertManager) handleSmartDeviceAlert(e *core.RecordEvent) error {
-	oldState := e.Record.Original().GetString("state")
-	newState := e.Record.GetString("state")
-
-	// Only alert when transitioning from PASSED to FAILED
-	if oldState != "PASSED" || newState != "FAILED" {
-		return e.Next()
-	}
-
-	systemID := e.Record.GetString("system")
-	if systemID == "" {
-		return e.Next()
-	}
-
-	// Fetch the system record to get the name and users
-	systemRecord, err := e.App.FindRecordById("systems", systemID)
-	if err != nil {
-		e.App.Logger().Error("Failed to find system for SMART alert", "err", err, "systemID", systemID)
-		return e.Next()
-	}
-
-	systemName := systemRecord.GetString("name")
-	deviceName := e.Record.GetString("name")
-	model := e.Record.GetString("model")
-
-	// Build alert message
-	title := fmt.Sprintf("SMART failure on %s: %s \U0001F534", systemName, deviceName)
-	var message string
-	if model != "" {
-		message = fmt.Sprintf("Disk %s (%s) SMART status changed to FAILED", deviceName, model)
-	} else {
-		message = fmt.Sprintf("Disk %s SMART status changed to FAILED", deviceName)
-	}
-
-	// Get users associated with the system
-	userIDs := systemRecord.GetStringSlice("users")
-	if len(userIDs) == 0 {
-		return e.Next()
-	}
-
-	// Send alert to each user
-	for _, userID := range userIDs {
-		if err := am.SendAlert(AlertMessageData{
-			UserID:   userID,
-			SystemID: systemID,
-			Title:    title,
-			Message:  message,
-			Link:     am.hub.MakeLink("system", systemID),
-			LinkText: "View " + systemName,
-		}); err != nil {
-			e.App.Logger().Error("Failed to send SMART alert", "err", err, "userID", userID)
-		}
-	}
-
-	return e.Next()
-}
-

internal/alerts/alerts_smart_test.go

@@ -1,196 +0,0 @@
-//go:build testing
-// +build testing
-
-package alerts_test
-
-import (
-	"testing"
-	"time"
-
-	beszelTests "github.com/henrygd/beszel/internal/tests"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSmartDeviceAlert(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system for the user
-	system, err := beszelTests.CreateRecord(hub, "systems", map[string]any{
-		"name":  "test-system",
-		"users": []string{user.Id},
-		"host":  "127.0.0.1",
-	})
-	assert.NoError(t, err)
-
-	// Create a smart_device with state PASSED
-	smartDevice, err := beszelTests.CreateRecord(hub, "smart_devices", map[string]any{
-		"system": system.Id,
-		"name":   "/dev/sda",
-		"model":  "Samsung SSD 970 EVO",
-		"state":  "PASSED",
-	})
-	assert.NoError(t, err)
-
-	// Verify no emails sent initially
-	assert.Zero(t, hub.TestMailer.TotalSend(), "should have 0 emails sent initially")
-
-	// Re-fetch the record so PocketBase can properly track original values
-	smartDevice, err = hub.FindRecordById("smart_devices", smartDevice.Id)
-	assert.NoError(t, err)
-
-	// Update the smart device state to FAILED
-	smartDevice.Set("state", "FAILED")
-	err = hub.Save(smartDevice)
-	assert.NoError(t, err)
-
-	// Wait for the alert to be processed
-	time.Sleep(50 * time.Millisecond)
-
-	// Verify that an email was sent
-	assert.EqualValues(t, 1, hub.TestMailer.TotalSend(), "should have 1 email sent after state changed to FAILED")
-
-	// Check the email content
-	lastMessage := hub.TestMailer.LastMessage()
-	assert.Contains(t, lastMessage.Subject, "SMART failure on test-system")
-	assert.Contains(t, lastMessage.Subject, "/dev/sda")
-	assert.Contains(t, lastMessage.Text, "Samsung SSD 970 EVO")
-	assert.Contains(t, lastMessage.Text, "FAILED")
-}
-
-func TestSmartDeviceAlertNoAlertOnNonPassedToFailed(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system for the user
-	system, err := beszelTests.CreateRecord(hub, "systems", map[string]any{
-		"name":  "test-system",
-		"users": []string{user.Id},
-		"host":  "127.0.0.1",
-	})
-	assert.NoError(t, err)
-
-	// Create a smart_device with state UNKNOWN
-	smartDevice, err := beszelTests.CreateRecord(hub, "smart_devices", map[string]any{
-		"system": system.Id,
-		"name":   "/dev/sda",
-		"model":  "Samsung SSD 970 EVO",
-		"state":  "UNKNOWN",
-	})
-	assert.NoError(t, err)
-
-	// Re-fetch the record so PocketBase can properly track original values
-	smartDevice, err = hub.FindRecordById("smart_devices", smartDevice.Id)
-	assert.NoError(t, err)
-
-	// Update the state from UNKNOWN to FAILED - should NOT trigger alert
-	smartDevice.Set("state", "FAILED")
-	err = hub.Save(smartDevice)
-	assert.NoError(t, err)
-
-	time.Sleep(50 * time.Millisecond)
-
-	// Verify no email was sent (only PASSED -> FAILED triggers alert)
-	assert.Zero(t, hub.TestMailer.TotalSend(), "should have 0 emails when changing from UNKNOWN to FAILED")
-
-	// Re-fetch the record again
-	smartDevice, err = hub.FindRecordById("smart_devices", smartDevice.Id)
-	assert.NoError(t, err)
-
-	// Update state from FAILED to PASSED - should NOT trigger alert
-	smartDevice.Set("state", "PASSED")
-	err = hub.Save(smartDevice)
-	assert.NoError(t, err)
-
-	time.Sleep(50 * time.Millisecond)
-
-	// Verify no email was sent
-	assert.Zero(t, hub.TestMailer.TotalSend(), "should have 0 emails when changing from FAILED to PASSED")
-}
-
-func TestSmartDeviceAlertMultipleUsers(t *testing.T) {
-	hub, user1 := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a second user
-	user2, err := beszelTests.CreateUser(hub, "test2@example.com", "password")
-	assert.NoError(t, err)
-
-	// Create user settings for the second user
-	_, err = beszelTests.CreateRecord(hub, "user_settings", map[string]any{
-		"user":     user2.Id,
-		"settings": `{"emails":["test2@example.com"],"webhooks":[]}`,
-	})
-	assert.NoError(t, err)
-
-	// Create a system with both users
-	system, err := beszelTests.CreateRecord(hub, "systems", map[string]any{
-		"name":  "shared-system",
-		"users": []string{user1.Id, user2.Id},
-		"host":  "127.0.0.1",
-	})
-	assert.NoError(t, err)
-
-	// Create a smart_device with state PASSED
-	smartDevice, err := beszelTests.CreateRecord(hub, "smart_devices", map[string]any{
-		"system": system.Id,
-		"name":   "/dev/nvme0n1",
-		"model":  "WD Black SN850",
-		"state":  "PASSED",
-	})
-	assert.NoError(t, err)
-
-	// Re-fetch the record so PocketBase can properly track original values
-	smartDevice, err = hub.FindRecordById("smart_devices", smartDevice.Id)
-	assert.NoError(t, err)
-
-	// Update the smart device state to FAILED
-	smartDevice.Set("state", "FAILED")
-	err = hub.Save(smartDevice)
-	assert.NoError(t, err)
-
-	time.Sleep(50 * time.Millisecond)
-
-	// Verify that two emails were sent (one for each user)
-	assert.EqualValues(t, 2, hub.TestMailer.TotalSend(), "should have 2 emails sent for 2 users")
-}
-
-func TestSmartDeviceAlertWithoutModel(t *testing.T) {
-	hub, user := beszelTests.GetHubWithUser(t)
-	defer hub.Cleanup()
-
-	// Create a system for the user
-	system, err := beszelTests.CreateRecord(hub, "systems", map[string]any{
-		"name":  "test-system",
-		"users": []string{user.Id},
-		"host":  "127.0.0.1",
-	})
-	assert.NoError(t, err)
-
-	// Create a smart_device with state PASSED but no model
-	smartDevice, err := beszelTests.CreateRecord(hub, "smart_devices", map[string]any{
-		"system": system.Id,
-		"name":   "/dev/sdb",
-		"state":  "PASSED",
-	})
-	assert.NoError(t, err)
-
-	// Re-fetch the record so PocketBase can properly track original values
-	smartDevice, err = hub.FindRecordById("smart_devices", smartDevice.Id)
-	assert.NoError(t, err)
-
-	// Update the smart device state to FAILED
-	smartDevice.Set("state", "FAILED")
-	err = hub.Save(smartDevice)
-	assert.NoError(t, err)
-
-	time.Sleep(50 * time.Millisecond)
-
-	// Verify that an email was sent
-	assert.EqualValues(t, 1, hub.TestMailer.TotalSend(), "should have 1 email sent")
-
-	// Check that the email doesn't have empty parentheses for missing model
-	lastMessage := hub.TestMailer.LastMessage()
-	assert.NotContains(t, lastMessage.Text, "()", "should not have empty parentheses for missing model")
-	assert.Contains(t, lastMessage.Text, "/dev/sdb")
-}

internal/alerts/alerts_status.go

@@ -161,15 +161,19 @@ func (am *AlertManager) sendStatusAlert(alertStatus string, systemName string, a
 	title := fmt.Sprintf("Connection to %s is %s %v", systemName, alertStatus, emoji)
 	message := strings.TrimSuffix(title, emoji)
 
-	// Get system ID for the link
-	systemID := alertRecord.GetString("system")
+	// if errs := am.hub.ExpandRecord(alertRecord, []string{"user"}, nil); len(errs) > 0 {
+	// 	return errs["user"]
+	// }
+	// user := alertRecord.ExpandedOne("user")
+	// if user == nil {
+	// 	return nil
+	// }
 
 	return am.SendAlert(AlertMessageData{
 		UserID:   alertRecord.GetString("user"),
-		SystemID: systemID,
 		Title:    title,
 		Message:  message,
-		Link:     am.hub.MakeLink("system", systemID),
+		Link:     am.hub.MakeLink("system", systemName),
 		LinkText: "View " + systemName,
 	})
 }

internal/alerts/alerts_system.go

@@ -64,32 +64,17 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 		case "LoadAvg15":
 			val = data.Info.LoadAvg[2]
 			unit = ""
-		case "GPU":
-			val = data.Info.GpuPct
-		case "Battery":
-			if data.Stats.Battery[0] == 0 {
-				continue
-			}
-			val = float64(data.Stats.Battery[0])
 		}
 
 		triggered := alertRecord.GetBool("triggered")
 		threshold := alertRecord.GetFloat("value")
 
-		// Battery alert has inverted logic: trigger when value is BELOW threshold
-		lowAlert := isLowAlert(name)
-
 		// CONTINUE
-		// For normal alerts: IF not triggered and curValue <= threshold, OR triggered and curValue > threshold
-		// For low alerts (Battery): IF not triggered and curValue >= threshold, OR triggered and curValue < threshold
-		if lowAlert {
-			if (!triggered && val >= threshold) || (triggered && val < threshold) {
-				continue
-			}
-		} else {
-			if (!triggered && val <= threshold) || (triggered && val > threshold) {
-				continue
-			}
+		// IF alert is not triggered and curValue is less than threshold
+		// OR alert is triggered and curValue is greater than threshold
+		if (!triggered && val <= threshold) || (triggered && val > threshold) {
+			// log.Printf("Skipping alert %s: val %f | threshold %f | triggered %v\n", name, val, threshold, triggered)
+			continue
 		}
 
 		min := max(1, cast.ToUint8(alertRecord.Get("min")))
@@ -107,11 +92,7 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 
 		// send alert immediately if min is 1 - no need to sum up values.
 		if min == 1 {
-			if lowAlert {
-				alert.triggered = val < threshold
-			} else {
-				alert.triggered = val > threshold
-			}
+			alert.triggered = val > threshold
 			go am.sendSystemAlert(alert)
 			continue
 		}
@@ -225,19 +206,6 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 				alert.val += stats.LoadAvg[1]
 			case "LoadAvg15":
 				alert.val += stats.LoadAvg[2]
-			case "GPU":
-				if len(stats.GPU) == 0 {
-					continue
-				}
-				maxUsage := 0.0
-				for _, gpu := range stats.GPU {
-					if gpu.Usage > maxUsage {
-						maxUsage = gpu.Usage
-					}
-				}
-				alert.val += maxUsage
-			case "Battery":
-				alert.val += float64(stats.Battery[0])
 			default:
 				continue
 			}
@@ -275,24 +243,12 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 		// log.Printf("%s: val %f | count %d | min-count %f | threshold %f\n", alert.name, alert.val, alert.count, minCount, alert.threshold)
 		// pass through alert if count is greater than or equal to minCount
 		if float32(alert.count) >= minCount {
-			// Battery alert has inverted logic: trigger when value is BELOW threshold
-			lowAlert := isLowAlert(alert.name)
-			if lowAlert {
-				if !alert.triggered && alert.val < alert.threshold {
-					alert.triggered = true
-					go am.sendSystemAlert(alert)
-				} else if alert.triggered && alert.val >= alert.threshold {
-					alert.triggered = false
-					go am.sendSystemAlert(alert)
-				}
-			} else {
-				if !alert.triggered && alert.val > alert.threshold {
-					alert.triggered = true
-					go am.sendSystemAlert(alert)
-				} else if alert.triggered && alert.val <= alert.threshold {
-					alert.triggered = false
-					go am.sendSystemAlert(alert)
-				}
+			if !alert.triggered && alert.val > alert.threshold {
+				alert.triggered = true
+				go am.sendSystemAlert(alert)
+			} else if alert.triggered && alert.val <= alert.threshold {
+				alert.triggered = false
+				go am.sendSystemAlert(alert)
 			}
 		}
 	}
@@ -312,26 +268,17 @@ func (am *AlertManager) sendSystemAlert(alert SystemAlertData) {
 		alert.name = after + "m Load"
 	}
 
-	// make title alert name lowercase if not CPU or GPU
+	// make title alert name lowercase if not CPU
 	titleAlertName := alert.name
-	if titleAlertName != "CPU" && titleAlertName != "GPU" {
+	if titleAlertName != "CPU" {
 		titleAlertName = strings.ToLower(titleAlertName)
 	}
 
 	var subject string
-	lowAlert := isLowAlert(alert.name)
 	if alert.triggered {
-		if lowAlert {
-			subject = fmt.Sprintf("%s %s below threshold", systemName, titleAlertName)
-		} else {
-			subject = fmt.Sprintf("%s %s above threshold", systemName, titleAlertName)
-		}
+		subject = fmt.Sprintf("%s %s above threshold", systemName, titleAlertName)
 	} else {
-		if lowAlert {
-			subject = fmt.Sprintf("%s %s above threshold", systemName, titleAlertName)
-		} else {
-			subject = fmt.Sprintf("%s %s below threshold", systemName, titleAlertName)
-		}
+		subject = fmt.Sprintf("%s %s below threshold", systemName, titleAlertName)
 	}
 	minutesLabel := "minute"
 	if alert.min > 1 {
@@ -349,14 +296,9 @@ func (am *AlertManager) sendSystemAlert(alert SystemAlertData) {
 	}
 	am.SendAlert(AlertMessageData{
 		UserID:   alert.alertRecord.GetString("user"),
-		SystemID: alert.systemRecord.Id,
 		Title:    subject,
 		Message:  body,
-		Link:     am.hub.MakeLink("system", alert.systemRecord.Id),
+		Link:     am.hub.MakeLink("system", systemName),
 		LinkText: "View " + systemName,
 	})
 }
-
-func isLowAlert(name string) bool {
-	return name == "Battery"
-}

internal/cmd/agent/agent.go

@@ -17,8 +17,9 @@ import (
 type cmdOptions struct {
 	key    string // key is the public key(s) for SSH authentication.
 	listen string // listen is the address or port to listen on.
-	hubURL string // hubURL is the URL of the Beszel hub.
-	token  string // token is the token to use for authentication.
+	// TODO: add hubURL and token
+	// hubURL string // hubURL is the URL of the hub to use.
+	// token  string // token is the token to use for authentication.
 }
 
 // parse parses the command line flags and populates the config struct.
@@ -46,13 +47,13 @@ func (opts *cmdOptions) parse() bool {
 	// pflag.CommandLine.ParseErrorsWhitelist.UnknownFlags = true
 	pflag.StringVarP(&opts.key, "key", "k", "", "Public key(s) for SSH authentication")
 	pflag.StringVarP(&opts.listen, "listen", "l", "", "Address or port to listen on")
-	pflag.StringVarP(&opts.hubURL, "url", "u", "", "URL of the Beszel hub")
-	pflag.StringVarP(&opts.token, "token", "t", "", "Token to use for authentication")
+	// pflag.StringVarP(&opts.hubURL, "hub-url", "u", "", "URL of the hub to use")
+	// pflag.StringVarP(&opts.token, "token", "t", "", "Token to use for authentication")
 	chinaMirrors := pflag.BoolP("china-mirrors", "c", false, "Use mirror for update (gh.beszel.dev) instead of GitHub")
 	help := pflag.BoolP("help", "h", false, "Show this help message")
 
 	// Convert old single-dash long flags to double-dash for backward compatibility
-	flagsToConvert := []string{"key", "listen", "url", "token"}
+	flagsToConvert := []string{"key", "listen"}
 	for i, arg := range os.Args {
 		for _, flag := range flagsToConvert {
 			singleDash := "-" + flag
@@ -94,13 +95,6 @@ func (opts *cmdOptions) parse() bool {
 		return true
 	}
 
-	// Set environment variables from CLI flags (if provided)
-	if opts.hubURL != "" {
-		os.Setenv("HUB_URL", opts.hubURL)
-	}
-	if opts.token != "" {
-		os.Setenv("TOKEN", opts.token)
-	}
 	return false
 }
 

internal/common/common-ws.go

@@ -3,7 +3,6 @@ package common
 import (
 	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/henrygd/beszel/internal/entities/system"
-	"github.com/henrygd/beszel/internal/entities/systemd"
 )
 
 type WebSocketAction = uint8
@@ -19,8 +18,6 @@ const (
 	GetContainerInfo
 	// Request SMART data from agent
 	GetSmartData
-	// Request detailed systemd service info from agent
-	GetSystemdInfo
 	// Add new actions here...
 )
 
@@ -39,7 +36,6 @@ type AgentResponse struct {
 	Error       string                     `cbor:"3,keyasint,omitempty,omitzero"`
 	String      *string                    `cbor:"4,keyasint,omitempty,omitzero"`
 	SmartData   map[string]smart.SmartData `cbor:"5,keyasint,omitempty,omitzero"`
-	ServiceInfo systemd.ServiceDetails     `cbor:"6,keyasint,omitempty,omitzero"`
 	// Logs        *LogsPayload         `cbor:"4,keyasint,omitempty,omitzero"`
 	// RawBytes    []byte               `cbor:"4,keyasint,omitempty,omitzero"`
 }
@@ -58,8 +54,8 @@ type FingerprintResponse struct {
 }
 
 type DataRequestOptions struct {
-	CacheTimeMs    uint16 `cbor:"0,keyasint"`
-	IncludeDetails bool   `cbor:"1,keyasint"`
+	CacheTimeMs uint16 `cbor:"0,keyasint"`
+	// ResourceType uint8  `cbor:"1,keyasint,omitempty,omitzero"`
 }
 
 type ContainerLogsRequest struct {
@@ -69,7 +65,3 @@ type ContainerLogsRequest struct {
 type ContainerInfoRequest struct {
 	ContainerID string `cbor:"0,keyasint"`
 }
-
-type SystemdInfoRequest struct {
-	ServiceName string `cbor:"0,keyasint"`
-}

internal/dockerfile_agent_alpine

@@ -17,7 +17,7 @@ RUN rm -rf /tmp/*
 # --------------------------
 # Final image: default scratch-based agent
 # --------------------------
-FROM alpine:3.22
+FROM alpine:latest
 COPY --from=builder /agent /agent
 
 RUN apk add --no-cache smartmontools

internal/dockerfile_agent_intel

@@ -16,7 +16,7 @@ RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-
 # Final image
 # Note: must cap_add: [CAP_PERFMON] and mount /dev/dri/ as volume
 # --------------------------
-FROM alpine:3.22
+FROM alpine:edge
 
 COPY --from=builder /agent /agent
 

internal/dockerfile_agent_nvidia

@@ -2,6 +2,7 @@ FROM --platform=$BUILDPLATFORM golang:alpine AS builder
 
 WORKDIR /app
 
+
 COPY ../go.mod ../go.sum ./
 RUN go mod download
 
@@ -12,24 +13,7 @@ COPY . ./
 ARG TARGETOS TARGETARCH
 RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./internal/cmd/agent
 
-# --------------------------
-# Smartmontools builder stage
-# --------------------------
-FROM nvidia/cuda:12.2.2-base-ubuntu22.04 AS smartmontools-builder
-
-RUN apt-get update && apt-get install -y \
-  wget \
-  build-essential \
-  && wget https://downloads.sourceforge.net/project/smartmontools/smartmontools/7.5/smartmontools-7.5.tar.gz \
-  && tar zxvf smartmontools-7.5.tar.gz \
-  && cd smartmontools-7.5 \
-  && ./configure --prefix=/usr --sysconfdir=/etc \
-  && make \
-  && make install \
-  && rm -rf /smartmontools-7.5* \
-  && apt-get remove -y wget build-essential \
-  && apt-get autoremove -y \
-  && rm -rf /var/lib/apt/lists/*
+RUN rm -rf /tmp/*
 
 # --------------------------
 # Final image: GPU-enabled agent with nvidia-smi
@@ -37,8 +21,10 @@ RUN apt-get update && apt-get install -y \
 FROM nvidia/cuda:12.2.2-base-ubuntu22.04
 COPY --from=builder /agent /agent
 
-# Copy smartmontools binaries and config files
-COPY --from=smartmontools-builder /usr/sbin/smartctl /usr/sbin/smartctl
+# this is so we don't need to create the /tmp directory in the scratch container
+COPY --from=builder /tmp /tmp
+
+RUN apt-get update && apt-get install -y smartmontools && rm -rf /var/lib/apt/lists/*
 
 # Ensure data persistence across container recreations
 VOLUME ["/var/lib/beszel-agent"]

internal/entities/container/container.go

@@ -34,17 +34,6 @@ type ApiStats struct {
 	MemoryStats MemoryStats `json:"memory_stats"`
 }
 
-// Docker system info from /info
-type HostInfo struct {
-	OperatingSystem string `json:"OperatingSystem"`
-	KernelVersion   string `json:"KernelVersion"`
-	NCPU            int    `json:"NCPU"`
-	MemTotal        uint64 `json:"MemTotal"`
-	// OSVersion       string `json:"OSVersion"`
-	// OSType          string `json:"OSType"`
-	// Architecture    string `json:"Architecture"`
-}
-
 func (s *ApiStats) CalculateCpuPercentLinux(prevCpuContainer uint64, prevCpuSystem uint64) float64 {
 	cpuDelta := s.CPUStats.CPUUsage.TotalUsage - prevCpuContainer
 	systemDelta := s.CPUStats.SystemUsage - prevCpuSystem

internal/entities/system/system.go

@@ -3,17 +3,20 @@ package system
 // TODO: this is confusing, make common package with common/types common/helpers etc
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/henrygd/beszel/internal/entities/container"
-	"github.com/henrygd/beszel/internal/entities/systemd"
 )
 
 type Stats struct {
 	Cpu            float64             `json:"cpu" cbor:"0,keyasint"`
 	MaxCpu         float64             `json:"cpum,omitempty" cbor:"1,keyasint,omitempty"`
-	Mem            float64             `json:"m" cbor:"2,keyasint"`
+	CpuUser        float64                `json:"cpuu,omitempty" cbor:"33,keyasint,omitempty"`
+	CpuSystem      float64                `json:"cpus,omitempty" cbor:"34,keyasint,omitempty"`
+	CpuIowait      float64                `json:"cpui,omitempty" cbor:"35,keyasint,omitempty"`
+	CpuSteal       float64                `json:"cpust,omitempty" cbor:"36,keyasint,omitempty"`
+	CpuCores       map[string][4]float64  `json:"cpuc,omitempty" cbor:"37,keyasint,omitempty"` // [user, system, iowait, steal] per core
+	Mem            float64                `json:"m" cbor:"2,keyasint"`
 	MemUsed        float64             `json:"mu" cbor:"3,keyasint"`
 	MemPct         float64             `json:"mp" cbor:"4,keyasint"`
 	MemBuffCache   float64             `json:"mb" cbor:"5,keyasint"`
@@ -43,28 +46,9 @@ type Stats struct {
 	LoadAvg           [3]float64           `json:"la,omitempty" cbor:"28,keyasint"`
 	Battery           [2]uint8             `json:"bat,omitzero" cbor:"29,keyasint,omitzero"` // [percent, charge state, current]
 	MaxMem            float64              `json:"mm,omitempty" cbor:"30,keyasint,omitempty"`
-	NetworkInterfaces map[string][4]uint64 `json:"ni,omitempty" cbor:"31,keyasint,omitempty"`   // [upload bytes, download bytes, total upload, total download]
-	DiskIO            [2]uint64            `json:"dio,omitzero" cbor:"32,keyasint,omitzero"`    // [read bytes, write bytes]
-	MaxDiskIO         [2]uint64            `json:"diom,omitzero" cbor:"-"`                      // [max read bytes, max write bytes]
-	CpuBreakdown      []float64            `json:"cpub,omitempty" cbor:"33,keyasint,omitempty"` // [user, system, iowait, steal, idle]
-	CpuCoresUsage     Uint8Slice           `json:"cpus,omitempty" cbor:"34,keyasint,omitempty"` // per-core busy usage [CPU0..]
-}
-
-// Uint8Slice wraps []uint8 to customize JSON encoding while keeping CBOR efficient.
-// JSON: encodes as array of numbers (avoids base64 string).
-// CBOR: falls back to default handling for []uint8 (byte string), keeping payload small.
-type Uint8Slice []uint8
-
-func (s Uint8Slice) MarshalJSON() ([]byte, error) {
-	if s == nil {
-		return []byte("null"), nil
-	}
-	// Convert to wider ints to force array-of-numbers encoding.
-	arr := make([]uint16, len(s))
-	for i, v := range s {
-		arr[i] = uint16(v)
-	}
-	return json.Marshal(arr)
+	NetworkInterfaces map[string][4]uint64 `json:"ni,omitempty" cbor:"31,keyasint,omitempty"` // [upload bytes, download bytes, total upload, total download]
+	DiskIO            [2]uint64            `json:"dio,omitzero" cbor:"32,keyasint,omitzero"`  // [read bytes, write bytes]
+	MaxDiskIO         [2]uint64            `json:"diom,omitzero" cbor:"-"`                    // [max read bytes, max write bytes]
 }
 
 type GPUData struct {
@@ -123,55 +107,34 @@ const (
 	ConnectionTypeWebSocket
 )
 
-// Core system data that is needed in All Systems table
 type Info struct {
-	Hostname      string `json:"h,omitempty" cbor:"0,keyasint,omitempty"`   // deprecated - moved to Details struct
-	KernelVersion string `json:"k,omitempty" cbor:"1,keyasint,omitempty"`   // deprecated - moved to Details struct
-	Cores         int    `json:"c,omitzero" cbor:"2,keyasint,omitzero"`     // deprecated - moved to Details struct
-	CpuModel      string `json:"m,omitempty" cbor:"4,keyasint,omitempty"`   // deprecated - moved to Details struct
-	Podman        bool   `json:"p,omitempty" cbor:"11,keyasint,omitempty"`  // deprecated - moved to Details struct
-	Os            Os     `json:"os,omitempty" cbor:"14,keyasint,omitempty"` // deprecated - moved to Details struct
-	// Threads is needed in Info struct to calculate load average thresholds
+	Hostname       string  `json:"h" cbor:"0,keyasint"`
+	KernelVersion  string  `json:"k,omitempty" cbor:"1,keyasint,omitempty"`
+	Cores          int     `json:"c" cbor:"2,keyasint"`
 	Threads        int     `json:"t,omitempty" cbor:"3,keyasint,omitempty"`
+	CpuModel       string  `json:"m" cbor:"4,keyasint"`
 	Uptime         uint64  `json:"u" cbor:"5,keyasint"`
 	Cpu            float64 `json:"cpu" cbor:"6,keyasint"`
 	MemPct         float64 `json:"mp" cbor:"7,keyasint"`
 	DiskPct        float64 `json:"dp" cbor:"8,keyasint"`
 	Bandwidth      float64 `json:"b" cbor:"9,keyasint"`
 	AgentVersion   string  `json:"v" cbor:"10,keyasint"`
+	Podman         bool    `json:"p,omitempty" cbor:"11,keyasint,omitempty"`
 	GpuPct         float64 `json:"g,omitempty" cbor:"12,keyasint,omitempty"`
 	DashboardTemp  float64 `json:"dt,omitempty" cbor:"13,keyasint,omitempty"`
-	LoadAvg1       float64 `json:"l1,omitempty" cbor:"15,keyasint,omitempty"`  // deprecated - use `la` array instead
-	LoadAvg5       float64 `json:"l5,omitempty" cbor:"16,keyasint,omitempty"`  // deprecated - use `la` array instead
-	LoadAvg15      float64 `json:"l15,omitempty" cbor:"17,keyasint,omitempty"` // deprecated - use `la` array instead
+	Os             Os      `json:"os" cbor:"14,keyasint"`
+	LoadAvg1       float64 `json:"l1,omitempty" cbor:"15,keyasint,omitempty"`
+	LoadAvg5       float64 `json:"l5,omitempty" cbor:"16,keyasint,omitempty"`
+	LoadAvg15      float64 `json:"l15,omitempty" cbor:"17,keyasint,omitempty"`
 	BandwidthBytes uint64  `json:"bb" cbor:"18,keyasint"`
-
-	LoadAvg        [3]float64         `json:"la,omitempty" cbor:"19,keyasint"`
-	ConnectionType ConnectionType     `json:"ct,omitempty" cbor:"20,keyasint,omitempty,omitzero"`
-	ExtraFsPct     map[string]float64 `json:"efs,omitempty" cbor:"21,keyasint,omitempty"`
-	Services       []uint16           `json:"sv,omitempty" cbor:"22,keyasint,omitempty"` // [totalServices, numFailedServices]
-	Battery        [2]uint8           `json:"bat,omitzero" cbor:"23,keyasint,omitzero"`  // [percent, charge state]
-}
-
-// Data that does not change during process lifetime and is not needed in All Systems table
-type Details struct {
-	Hostname    string `cbor:"0,keyasint"`
-	Kernel      string `cbor:"1,keyasint,omitempty"`
-	Cores       int    `cbor:"2,keyasint"`
-	Threads     int    `cbor:"3,keyasint"`
-	CpuModel    string `cbor:"4,keyasint"`
-	Os          Os     `cbor:"5,keyasint"`
-	OsName      string `cbor:"6,keyasint"`
-	Arch        string `cbor:"7,keyasint"`
-	Podman      bool   `cbor:"8,keyasint,omitempty"`
-	MemoryTotal uint64 `cbor:"9,keyasint"`
+	// TODO: remove load fields in future release in favor of load avg array
+	LoadAvg        [3]float64     `json:"la,omitempty" cbor:"19,keyasint"`
+	ConnectionType ConnectionType `json:"ct,omitempty" cbor:"20,keyasint,omitempty,omitzero"`
 }
 
 // Final data structure to return to the hub
 type CombinedData struct {
-	Stats           Stats              `json:"stats" cbor:"0,keyasint"`
-	Info            Info               `json:"info" cbor:"1,keyasint"`
-	Containers      []*container.Stats `json:"container" cbor:"2,keyasint"`
-	SystemdServices []*systemd.Service `json:"systemd,omitempty" cbor:"3,keyasint,omitempty"`
-	Details         *Details           `cbor:"4,keyasint,omitempty"`
+	Stats      Stats              `json:"stats" cbor:"0,keyasint"`
+	Info       Info               `json:"info" cbor:"1,keyasint"`
+	Containers []*container.Stats `json:"container" cbor:"2,keyasint"`
 }

internal/entities/systemd/systemd.go

@@ -1,127 +0,0 @@
-package systemd
-
-import (
-	"math"
-	"runtime"
-	"time"
-)
-
-// ServiceState represents the status of a systemd service
-type ServiceState uint8
-
-const (
-	StatusActive ServiceState = iota
-	StatusInactive
-	StatusFailed
-	StatusActivating
-	StatusDeactivating
-	StatusReloading
-)
-
-// ServiceSubState represents the sub status of a systemd service
-type ServiceSubState uint8
-
-const (
-	SubStateDead ServiceSubState = iota
-	SubStateRunning
-	SubStateExited
-	SubStateFailed
-	SubStateUnknown
-)
-
-// ParseServiceStatus converts a string status to a ServiceStatus enum value
-func ParseServiceStatus(status string) ServiceState {
-	switch status {
-	case "active":
-		return StatusActive
-	case "inactive":
-		return StatusInactive
-	case "failed":
-		return StatusFailed
-	case "activating":
-		return StatusActivating
-	case "deactivating":
-		return StatusDeactivating
-	case "reloading":
-		return StatusReloading
-	default:
-		return StatusInactive
-	}
-}
-
-// ParseServiceSubState converts a string sub status to a ServiceSubState enum value
-func ParseServiceSubState(subState string) ServiceSubState {
-	switch subState {
-	case "dead":
-		return SubStateDead
-	case "running":
-		return SubStateRunning
-	case "exited":
-		return SubStateExited
-	case "failed":
-		return SubStateFailed
-	default:
-		return SubStateUnknown
-	}
-}
-
-// Service represents a single systemd service with its stats.
-type Service struct {
-	Name         string          `json:"n" cbor:"0,keyasint"`
-	State        ServiceState    `json:"s" cbor:"1,keyasint"`
-	Cpu          float64         `json:"c" cbor:"2,keyasint"`
-	Mem          uint64          `json:"m" cbor:"3,keyasint"`
-	MemPeak      uint64          `json:"mp" cbor:"4,keyasint"`
-	Sub          ServiceSubState `json:"ss" cbor:"5,keyasint"`
-	CpuPeak      float64         `json:"cp" cbor:"6,keyasint"`
-	PrevCpuUsage uint64          `json:"-"`
-	PrevReadTime time.Time       `json:"-"`
-}
-
-// UpdateCPUPercent calculates the CPU usage percentage for the service.
-func (s *Service) UpdateCPUPercent(cpuUsage uint64) {
-	now := time.Now()
-
-	if s.PrevReadTime.IsZero() || cpuUsage < s.PrevCpuUsage {
-		s.Cpu = 0
-		s.PrevCpuUsage = cpuUsage
-		s.PrevReadTime = now
-		return
-	}
-
-	duration := now.Sub(s.PrevReadTime).Nanoseconds()
-	if duration <= 0 {
-		s.PrevCpuUsage = cpuUsage
-		s.PrevReadTime = now
-		return
-	}
-
-	coreCount := int64(runtime.NumCPU())
-	duration *= coreCount
-
-	usageDelta := cpuUsage - s.PrevCpuUsage
-	cpuPercent := float64(usageDelta) / float64(duration)
-	s.Cpu = twoDecimals(cpuPercent * 100)
-
-	if s.Cpu > s.CpuPeak {
-		s.CpuPeak = s.Cpu
-	}
-
-	s.PrevCpuUsage = cpuUsage
-	s.PrevReadTime = now
-}
-
-func twoDecimals(value float64) float64 {
-	return math.Round(value*100) / 100
-}
-
-// ServiceDependency represents a unit that the service depends on.
-type ServiceDependency struct {
-	Name        string `json:"name"`
-	Description string `json:"description,omitempty"`
-	ActiveState string `json:"activeState,omitempty"`
-	SubState    string `json:"subState,omitempty"`
-}
-
-// ServiceDetails contains extended information about a systemd service.
-type ServiceDetails map[string]any

internal/entities/systemd/systemd_test.go

@@ -1,113 +0,0 @@
-//go:build testing
-
-package systemd_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/henrygd/beszel/internal/entities/systemd"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestParseServiceStatus(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected systemd.ServiceState
-	}{
-		{"active", systemd.StatusActive},
-		{"inactive", systemd.StatusInactive},
-		{"failed", systemd.StatusFailed},
-		{"activating", systemd.StatusActivating},
-		{"deactivating", systemd.StatusDeactivating},
-		{"reloading", systemd.StatusReloading},
-		{"unknown", systemd.StatusInactive}, // default case
-		{"", systemd.StatusInactive},        // default case
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			result := systemd.ParseServiceStatus(test.input)
-			assert.Equal(t, test.expected, result)
-		})
-	}
-}
-
-func TestParseServiceSubState(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected systemd.ServiceSubState
-	}{
-		{"dead", systemd.SubStateDead},
-		{"running", systemd.SubStateRunning},
-		{"exited", systemd.SubStateExited},
-		{"failed", systemd.SubStateFailed},
-		{"unknown", systemd.SubStateUnknown},
-		{"other", systemd.SubStateUnknown}, // default case
-		{"", systemd.SubStateUnknown},      // default case
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			result := systemd.ParseServiceSubState(test.input)
-			assert.Equal(t, test.expected, result)
-		})
-	}
-}
-
-func TestServiceUpdateCPUPercent(t *testing.T) {
-	t.Run("initial call sets CPU to 0", func(t *testing.T) {
-		service := &systemd.Service{}
-		service.UpdateCPUPercent(1000)
-		assert.Equal(t, 0.0, service.Cpu)
-		assert.Equal(t, uint64(1000), service.PrevCpuUsage)
-		assert.False(t, service.PrevReadTime.IsZero())
-	})
-
-	t.Run("subsequent call calculates CPU percentage", func(t *testing.T) {
-		service := &systemd.Service{}
-		service.PrevCpuUsage = 1000
-		service.PrevReadTime = time.Now().Add(-time.Second)
-
-		service.UpdateCPUPercent(8000000000) // 8 seconds of CPU time
-
-		// CPU usage should be positive and reasonable
-		assert.Greater(t, service.Cpu, 0.0, "CPU usage should be positive")
-		assert.LessOrEqual(t, service.Cpu, 100.0, "CPU usage should not exceed 100%")
-		assert.Equal(t, uint64(8000000000), service.PrevCpuUsage)
-		assert.Greater(t, service.CpuPeak, 0.0, "CPU peak should be set")
-	})
-
-	t.Run("CPU peak updates only when higher", func(t *testing.T) {
-		service := &systemd.Service{}
-		service.PrevCpuUsage = 1000
-		service.PrevReadTime = time.Now().Add(-time.Second)
-		service.UpdateCPUPercent(8000000000) // Set initial peak to ~50%
-		initialPeak := service.CpuPeak
-
-		// Now try with much lower CPU usage - should not update peak
-		service.PrevReadTime = time.Now().Add(-time.Second)
-		service.UpdateCPUPercent(1000000) // Much lower usage
-		assert.Equal(t, initialPeak, service.CpuPeak, "Peak should not update for lower CPU usage")
-	})
-
-	t.Run("handles zero duration", func(t *testing.T) {
-		service := &systemd.Service{}
-		service.PrevCpuUsage = 1000
-		now := time.Now()
-		service.PrevReadTime = now
-		// Mock time.Now() to return the same time to ensure zero duration
-		// Since we can't mock time in Go easily, we'll check the logic manually
-		// The zero duration case happens when duration <= 0
-		assert.Equal(t, 0.0, service.Cpu, "CPU should start at 0")
-	})
-
-	t.Run("handles CPU usage wraparound", func(t *testing.T) {
-		service := &systemd.Service{}
-		// Simulate wraparound where new usage is less than previous
-		service.PrevCpuUsage = 1000
-		service.PrevReadTime = time.Now().Add(-time.Second)
-		service.UpdateCPUPercent(500) // Less than previous, should reset
-		assert.Equal(t, 0.0, service.Cpu)
-	})
-}

internal/hub/hub.go

@@ -268,10 +268,8 @@ func (h *Hub) registerApiRoutes(se *core.ServeEvent) error {
 	// update / delete user alerts
 	apiAuth.POST("/user-alerts", alerts.UpsertUserAlerts)
 	apiAuth.DELETE("/user-alerts", alerts.DeleteUserAlerts)
-	// refresh SMART devices for a system
-	apiAuth.POST("/smart/refresh", h.refreshSmartData)
-	// get systemd service details
-	apiAuth.GET("/systemd/info", h.getSystemdInfo)
+	// get SMART data
+	apiAuth.GET("/smart", h.getSmartData)
 	// /containers routes
 	if enabled, _ := GetEnv("CONTAINER_DETAILS"); enabled != "false" {
 		// get container logs
@@ -344,46 +342,22 @@ func (h *Hub) getContainerInfo(e *core.RequestEvent) error {
 	}, "info")
 }
 
-// getSystemdInfo handles GET /api/beszel/systemd/info requests
-func (h *Hub) getSystemdInfo(e *core.RequestEvent) error {
-	query := e.Request.URL.Query()
-	systemID := query.Get("system")
-	serviceName := query.Get("service")
-
-	if systemID == "" || serviceName == "" {
-		return e.JSON(http.StatusBadRequest, map[string]string{"error": "system and service parameters are required"})
-	}
-	system, err := h.sm.GetSystem(systemID)
-	if err != nil {
-		return e.JSON(http.StatusNotFound, map[string]string{"error": "system not found"})
-	}
-	details, err := system.FetchSystemdInfoFromAgent(serviceName)
-	if err != nil {
-		return e.JSON(http.StatusNotFound, map[string]string{"error": err.Error()})
-	}
-	e.Response.Header().Set("Cache-Control", "public, max-age=60")
-	return e.JSON(http.StatusOK, map[string]any{"details": details})
-}
-
-// refreshSmartData handles POST /api/beszel/smart/refresh requests
-// Fetches fresh SMART data from the agent and updates the collection
-func (h *Hub) refreshSmartData(e *core.RequestEvent) error {
+// getSmartData handles GET /api/beszel/smart requests
+func (h *Hub) getSmartData(e *core.RequestEvent) error {
 	systemID := e.Request.URL.Query().Get("system")
 	if systemID == "" {
 		return e.JSON(http.StatusBadRequest, map[string]string{"error": "system parameter is required"})
 	}
-
 	system, err := h.sm.GetSystem(systemID)
 	if err != nil {
 		return e.JSON(http.StatusNotFound, map[string]string{"error": "system not found"})
 	}
-
-	// Fetch and save SMART devices
-	if err := system.FetchAndSaveSmartDevices(); err != nil {
-		return e.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()})
+	data, err := system.FetchSmartDataFromAgent()
+	if err != nil {
+		return e.JSON(http.StatusNotFound, map[string]string{"error": err.Error()})
 	}
-
-	return e.JSON(http.StatusOK, map[string]string{"status": "ok"})
+	e.Response.Header().Set("Cache-Control", "public, max-age=60")
+	return e.JSON(http.StatusOK, data)
 }
 
 // generates key pair if it doesn't exist and returns signer

internal/hub/systems/system.go

@@ -5,11 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"hash/fnv"
 	"math/rand"
 	"net"
 	"strings"
-	"sync/atomic"
 	"time"
 
 	"github.com/henrygd/beszel/internal/common"
@@ -17,7 +15,6 @@ import (
 
 	"github.com/henrygd/beszel/internal/entities/container"
 	"github.com/henrygd/beszel/internal/entities/system"
-	"github.com/henrygd/beszel/internal/entities/systemd"
 
 	"github.com/henrygd/beszel"
 
@@ -29,21 +26,18 @@ import (
 )
 
 type System struct {
-	Id             string               `db:"id"`
-	Host           string               `db:"host"`
-	Port           string               `db:"port"`
-	Status         string               `db:"status"`
-	manager        *SystemManager       // Manager that this system belongs to
-	client         *ssh.Client          // SSH client for fetching data
-	data           *system.CombinedData // system data from agent
-	ctx            context.Context      // Context for stopping the updater
-	cancel         context.CancelFunc   // Stops and removes system from updater
-	WsConn         *ws.WsConn           // Handler for agent WebSocket connection
-	agentVersion   semver.Version       // Agent version
-	updateTicker   *time.Ticker         // Ticker for updating the system
-	detailsFetched atomic.Bool          // True if static system details have been fetched and saved
-	smartFetched   atomic.Bool          // True if SMART devices have been fetched and saved
-	smartFetching  atomic.Bool          // True if SMART devices are currently being fetched
+	Id           string               `db:"id"`
+	Host         string               `db:"host"`
+	Port         string               `db:"port"`
+	Status       string               `db:"status"`
+	manager      *SystemManager       // Manager that this system belongs to
+	client       *ssh.Client          // SSH client for fetching data
+	data         *system.CombinedData // system data from agent
+	ctx          context.Context      // Context for stopping the updater
+	cancel       context.CancelFunc   // Stops and removes system from updater
+	WsConn       *ws.WsConn           // Handler for agent WebSocket connection
+	agentVersion semver.Version       // Agent version
+	updateTicker *time.Ticker         // Ticker for updating the system
 }
 
 func (sm *SystemManager) NewSystem(systemId string) *System {
@@ -116,14 +110,7 @@ func (sys *System) update() error {
 		sys.handlePaused()
 		return nil
 	}
-	options := common.DataRequestOptions{
-		CacheTimeMs: uint16(interval),
-	}
-	// fetch system details if not already fetched
-	if !sys.detailsFetched.Load() {
-		options.IncludeDetails = true
-	}
-	data, err := sys.fetchDataFromAgent(options)
+	data, err := sys.fetchDataFromAgent(common.DataRequestOptions{CacheTimeMs: uint16(interval)})
 	if err == nil {
 		_, err = sys.createRecords(data)
 	}
@@ -151,11 +138,12 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 	}
 	hub := sys.manager.hub
 	err = hub.RunInTransaction(func(txApp core.App) error {
-		// add system_stats record
+		// add system_stats and container_stats records
 		systemStatsCollection, err := txApp.FindCachedCollectionByNameOrId("system_stats")
 		if err != nil {
 			return err
 		}
+
 		systemStatsRecord := core.NewRecord(systemStatsCollection)
 		systemStatsRecord.Set("system", systemRecord.Id)
 		systemStatsRecord.Set("stats", data.Stats)
@@ -163,14 +151,14 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 		if err := txApp.SaveNoValidate(systemStatsRecord); err != nil {
 			return err
 		}
-
-		// add containers and container_stats records
 		if len(data.Containers) > 0 {
+			// add / update containers records
 			if data.Containers[0].Id != "" {
 				if err := createContainerRecords(txApp, data.Containers, sys.Id); err != nil {
 					return err
 				}
 			}
+			// add new container_stats record
 			containerStatsCollection, err := txApp.FindCachedCollectionByNameOrId("container_stats")
 			if err != nil {
 				return err
@@ -183,24 +171,9 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 				return err
 			}
 		}
-
-		// add new systemd_stats record
-		if len(data.SystemdServices) > 0 {
-			if err := createSystemdStatsRecords(txApp, data.SystemdServices, sys.Id); err != nil {
-				return err
-			}
-		}
-
-		// add system details record
-		if data.Details != nil {
-			if err := createSystemDetailsRecord(txApp, data.Details, sys.Id); err != nil {
-				return err
-			}
-			sys.detailsFetched.Store(true)
-		}
-
 		// update system record (do this last because it triggers alerts and we need above records to be inserted first)
 		systemRecord.Set("status", up)
+
 		systemRecord.Set("info", data.Info)
 		if err := txApp.SaveNoValidate(systemRecord); err != nil {
 			return err
@@ -208,83 +181,14 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 		return nil
 	})
 
-	// Fetch and save SMART devices when system first comes online
-	if err == nil {
-		if !sys.smartFetched.Load() && sys.smartFetching.CompareAndSwap(false, true) {
-			go func() {
-				defer sys.smartFetching.Store(false)
-				if err := sys.FetchAndSaveSmartDevices(); err == nil {
-					sys.smartFetched.Store(true)
-				}
-			}()
-		}
-	}
-
 	return systemRecord, err
 }
 
-func createSystemDetailsRecord(app core.App, data *system.Details, systemId string) error {
-	collectionName := "system_details"
-	params := dbx.Params{
-		"id":       systemId,
-		"system":   systemId,
-		"hostname": data.Hostname,
-		"kernel":   data.Kernel,
-		"cores":    data.Cores,
-		"threads":  data.Threads,
-		"cpu":      data.CpuModel,
-		"os":       data.Os,
-		"os_name":  data.OsName,
-		"arch":     data.Arch,
-		"memory":   data.MemoryTotal,
-		"podman":   data.Podman,
-		"updated":  time.Now().UTC(),
-	}
-	result, err := app.DB().Update(collectionName, params, dbx.HashExp{"id": systemId}).Execute()
-	rowsAffected, _ := result.RowsAffected()
-	if err != nil || rowsAffected == 0 {
-		_, err = app.DB().Insert(collectionName, params).Execute()
-	}
-	return err
-}
-
-func createSystemdStatsRecords(app core.App, data []*systemd.Service, systemId string) error {
-	if len(data) == 0 {
-		return nil
-	}
-	// shared params for all records
-	params := dbx.Params{
-		"system":  systemId,
-		"updated": time.Now().UTC().UnixMilli(),
-	}
-
-	valueStrings := make([]string, 0, len(data))
-	for i, service := range data {
-		suffix := fmt.Sprintf("%d", i)
-		valueStrings = append(valueStrings, fmt.Sprintf("({:id%[1]s}, {:system}, {:name%[1]s}, {:state%[1]s}, {:sub%[1]s}, {:cpu%[1]s}, {:cpuPeak%[1]s}, {:memory%[1]s}, {:memPeak%[1]s}, {:updated})", suffix))
-		params["id"+suffix] = makeStableHashId(systemId, service.Name)
-		params["name"+suffix] = service.Name
-		params["state"+suffix] = service.State
-		params["sub"+suffix] = service.Sub
-		params["cpu"+suffix] = service.Cpu
-		params["cpuPeak"+suffix] = service.CpuPeak
-		params["memory"+suffix] = service.Mem
-		params["memPeak"+suffix] = service.MemPeak
-	}
-	queryString := fmt.Sprintf(
-		"INSERT INTO systemd_services (id, system, name, state, sub, cpu, cpuPeak, memory, memPeak, updated) VALUES %s ON CONFLICT(id) DO UPDATE SET system = excluded.system, name = excluded.name, state = excluded.state, sub = excluded.sub, cpu = excluded.cpu, cpuPeak = excluded.cpuPeak, memory = excluded.memory, memPeak = excluded.memPeak, updated = excluded.updated",
-		strings.Join(valueStrings, ","),
-	)
-	_, err := app.DB().NewQuery(queryString).Bind(params).Execute()
-	return err
-}
-
 // createContainerRecords creates container records
 func createContainerRecords(app core.App, data []*container.Stats, systemId string) error {
 	if len(data) == 0 {
 		return nil
 	}
-	// shared params for all records
 	params := dbx.Params{
 		"system":  systemId,
 		"updated": time.Now().UTC().UnixMilli(),
@@ -395,8 +299,7 @@ func (sys *System) fetchStringFromAgentViaSSH(action common.WebSocketAction, req
 		if err := session.Shell(); err != nil {
 			return false, err
 		}
-		reqDataBytes, _ := cbor.Marshal(requestData)
-		req := common.HubRequest[cbor.RawMessage]{Action: action, Data: reqDataBytes}
+		req := common.HubRequest[any]{Action: action, Data: requestData}
 		_ = cbor.NewEncoder(stdin).Encode(req)
 		_ = stdin.Close()
 		var resp common.AgentResponse
@@ -437,16 +340,16 @@ func (sys *System) FetchContainerLogsFromAgent(containerID string) (string, erro
 	return sys.fetchStringFromAgentViaSSH(common.GetContainerLogs, common.ContainerLogsRequest{ContainerID: containerID}, "no logs in response")
 }
 
-// FetchSystemdInfoFromAgent fetches detailed systemd service information from the agent
-func (sys *System) FetchSystemdInfoFromAgent(serviceName string) (systemd.ServiceDetails, error) {
+// FetchSmartDataFromAgent fetches SMART data from the agent
+func (sys *System) FetchSmartDataFromAgent() (map[string]any, error) {
 	// fetch via websocket
 	if sys.WsConn != nil && sys.WsConn.IsConnected() {
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		defer cancel()
-		return sys.WsConn.RequestSystemdInfo(ctx, serviceName)
+		return sys.WsConn.RequestSmartData(ctx)
 	}
-
-	var result systemd.ServiceDetails
+	// fetch via SSH
+	var result map[string]any
 	err := sys.runSSHOperation(5*time.Second, 1, func(session *ssh.Session) (bool, error) {
 		stdout, err := session.StdoutPipe()
 		if err != nil {
@@ -459,39 +362,23 @@ func (sys *System) FetchSystemdInfoFromAgent(serviceName string) (systemd.Servic
 		if err := session.Shell(); err != nil {
 			return false, err
 		}
-
-		reqDataBytes, _ := cbor.Marshal(common.SystemdInfoRequest{ServiceName: serviceName})
-		req := common.HubRequest[cbor.RawMessage]{Action: common.GetSystemdInfo, Data: reqDataBytes}
-		if err := cbor.NewEncoder(stdin).Encode(req); err != nil {
-			return false, err
-		}
+		req := common.HubRequest[any]{Action: common.GetSmartData}
+		_ = cbor.NewEncoder(stdin).Encode(req)
 		_ = stdin.Close()
-
 		var resp common.AgentResponse
 		if err := cbor.NewDecoder(stdout).Decode(&resp); err != nil {
 			return false, err
 		}
-		if resp.ServiceInfo == nil {
-			if resp.Error != "" {
-				return false, errors.New(resp.Error)
-			}
-			return false, errors.New("no systemd info in response")
+		// Convert to generic map for JSON response
+		result = make(map[string]any, len(resp.SmartData))
+		for k, v := range resp.SmartData {
+			result[k] = v
 		}
-		result = resp.ServiceInfo
 		return false, nil
 	})
-
 	return result, err
 }
 
-func makeStableHashId(strings ...string) string {
-	hash := fnv.New32a()
-	for _, str := range strings {
-		hash.Write([]byte(str))
-	}
-	return fmt.Sprintf("%x", hash.Sum32())
-}
-
 // fetchDataViaSSH handles fetching data using SSH.
 // This function encapsulates the original SSH logic.
 // It updates sys.data directly upon successful fetch.
@@ -509,8 +396,7 @@ func (sys *System) fetchDataViaSSH(options common.DataRequestOptions) (*system.C
 		*sys.data = system.CombinedData{}
 
 		if sys.agentVersion.GTE(beszel.MinVersionAgentResponse) && stdinErr == nil {
-			reqDataBytes, _ := cbor.Marshal(options)
-			req := common.HubRequest[cbor.RawMessage]{Action: common.GetData, Data: reqDataBytes}
+			req := common.HubRequest[any]{Action: common.GetData, Data: options}
 			_ = cbor.NewEncoder(stdin).Encode(req)
 			_ = stdin.Close()
 

internal/hub/systems/system_smart.go

@@ -1,132 +0,0 @@
-package systems
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"strings"
-	"time"
-
-	"github.com/fxamacker/cbor/v2"
-	"github.com/henrygd/beszel/internal/common"
-	"github.com/henrygd/beszel/internal/entities/smart"
-	"github.com/pocketbase/pocketbase/core"
-	"golang.org/x/crypto/ssh"
-)
-
-// FetchSmartDataFromAgent fetches SMART data from the agent
-func (sys *System) FetchSmartDataFromAgent() (map[string]smart.SmartData, error) {
-	// fetch via websocket
-	if sys.WsConn != nil && sys.WsConn.IsConnected() {
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		defer cancel()
-		return sys.WsConn.RequestSmartData(ctx)
-	}
-	// fetch via SSH
-	var result map[string]smart.SmartData
-	err := sys.runSSHOperation(5*time.Second, 1, func(session *ssh.Session) (bool, error) {
-		stdout, err := session.StdoutPipe()
-		if err != nil {
-			return false, err
-		}
-		stdin, stdinErr := session.StdinPipe()
-		if stdinErr != nil {
-			return false, stdinErr
-		}
-		if err := session.Shell(); err != nil {
-			return false, err
-		}
-		req := common.HubRequest[any]{Action: common.GetSmartData}
-		_ = cbor.NewEncoder(stdin).Encode(req)
-		_ = stdin.Close()
-		var resp common.AgentResponse
-		if err := cbor.NewDecoder(stdout).Decode(&resp); err != nil {
-			return false, err
-		}
-		result = resp.SmartData
-		return false, nil
-	})
-	return result, err
-}
-
-// FetchAndSaveSmartDevices fetches SMART data from the agent and saves it to the database
-func (sys *System) FetchAndSaveSmartDevices() error {
-	smartData, err := sys.FetchSmartDataFromAgent()
-	if err != nil || len(smartData) == 0 {
-		return err
-	}
-	return sys.saveSmartDevices(smartData)
-}
-
-// saveSmartDevices saves SMART device data to the smart_devices collection
-func (sys *System) saveSmartDevices(smartData map[string]smart.SmartData) error {
-	if len(smartData) == 0 {
-		return nil
-	}
-
-	hub := sys.manager.hub
-	collection, err := hub.FindCachedCollectionByNameOrId("smart_devices")
-	if err != nil {
-		return err
-	}
-
-	for deviceKey, device := range smartData {
-		if err := sys.upsertSmartDeviceRecord(collection, deviceKey, device); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (sys *System) upsertSmartDeviceRecord(collection *core.Collection, deviceKey string, device smart.SmartData) error {
-	hub := sys.manager.hub
-	recordID := makeStableHashId(sys.Id, deviceKey)
-
-	record, err := hub.FindRecordById(collection, recordID)
-	if err != nil {
-		if !errors.Is(err, sql.ErrNoRows) {
-			return err
-		}
-		record = core.NewRecord(collection)
-		record.Set("id", recordID)
-	}
-
-	name := device.DiskName
-	if name == "" {
-		name = deviceKey
-	}
-
-	powerOnHours, powerCycles := extractPowerMetrics(device.Attributes)
-	record.Set("system", sys.Id)
-	record.Set("name", name)
-	record.Set("model", device.ModelName)
-	record.Set("state", device.SmartStatus)
-	record.Set("capacity", device.Capacity)
-	record.Set("temp", device.Temperature)
-	record.Set("firmware", device.FirmwareVersion)
-	record.Set("serial", device.SerialNumber)
-	record.Set("type", device.DiskType)
-	record.Set("hours", powerOnHours)
-	record.Set("cycles", powerCycles)
-	record.Set("attributes", device.Attributes)
-
-	return hub.SaveNoValidate(record)
-}
-
-// extractPowerMetrics extracts power on hours and power cycles from SMART attributes
-func extractPowerMetrics(attributes []*smart.SmartAttribute) (powerOnHours, powerCycles uint64) {
-	for _, attr := range attributes {
-		nameLower := strings.ToLower(attr.Name)
-		if powerOnHours == 0 && (strings.Contains(nameLower, "poweronhours") || strings.Contains(nameLower, "power_on_hours")) {
-			powerOnHours = attr.RawValue
-		}
-		if powerCycles == 0 && ((strings.Contains(nameLower, "power") && strings.Contains(nameLower, "cycle")) || strings.Contains(nameLower, "startstopcycles")) {
-			powerCycles = attr.RawValue
-		}
-		if powerOnHours > 0 && powerCycles > 0 {
-			break
-		}
-	}
-	return
-}

internal/hub/systems/system_systemd_test.go

@@ -1,75 +0,0 @@
-//go:build testing
-
-package systems
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetSystemdServiceId(t *testing.T) {
-	t.Run("deterministic output", func(t *testing.T) {
-		systemId := "sys-123"
-		serviceName := "nginx.service"
-
-		// Call multiple times and ensure same result
-		id1 := makeStableHashId(systemId, serviceName)
-		id2 := makeStableHashId(systemId, serviceName)
-		id3 := makeStableHashId(systemId, serviceName)
-
-		assert.Equal(t, id1, id2)
-		assert.Equal(t, id2, id3)
-		assert.NotEmpty(t, id1)
-	})
-
-	t.Run("different inputs produce different ids", func(t *testing.T) {
-		systemId1 := "sys-123"
-		systemId2 := "sys-456"
-		serviceName1 := "nginx.service"
-		serviceName2 := "apache.service"
-
-		id1 := makeStableHashId(systemId1, serviceName1)
-		id2 := makeStableHashId(systemId2, serviceName1)
-		id3 := makeStableHashId(systemId1, serviceName2)
-		id4 := makeStableHashId(systemId2, serviceName2)
-
-		// All IDs should be different
-		assert.NotEqual(t, id1, id2)
-		assert.NotEqual(t, id1, id3)
-		assert.NotEqual(t, id1, id4)
-		assert.NotEqual(t, id2, id3)
-		assert.NotEqual(t, id2, id4)
-		assert.NotEqual(t, id3, id4)
-	})
-
-	t.Run("consistent length", func(t *testing.T) {
-		testCases := []struct {
-			systemId    string
-			serviceName string
-		}{
-			{"short", "short.service"},
-			{"very-long-system-id-that-might-be-used-in-practice", "very-long-service-name.service"},
-			{"", "empty-system.service"},
-			{"empty-service", ""},
-			{"", ""},
-		}
-
-		for _, tc := range testCases {
-			id := makeStableHashId(tc.systemId, tc.serviceName)
-			// FNV-32 produces 8 hex characters
-			assert.Len(t, id, 8, "ID should be 8 characters for systemId='%s', serviceName='%s'", tc.systemId, tc.serviceName)
-		}
-	})
-
-	t.Run("hexadecimal output", func(t *testing.T) {
-		id := makeStableHashId("test-system", "test-service")
-		assert.NotEmpty(t, id)
-
-		// Should only contain hexadecimal characters
-		for _, char := range id {
-			assert.True(t, (char >= '0' && char <= '9') || (char >= 'a' && char <= 'f'),
-				"ID should only contain hexadecimal characters, got: %s", id)
-		}
-	})
-}

internal/hub/systems/systems_test.go

@@ -266,20 +266,18 @@ func testOld(t *testing.T, hub *tests.TestHub) {
 
 		// Create test system data
 		testData := &system.CombinedData{
-			Details: &system.Details{
-				Hostname: "data-test.example.com",
-				Kernel:   "5.15.0-generic",
-				Cores:    4,
-				Threads:  8,
-				CpuModel: "Test CPU",
-			},
 			Info: system.Info{
-				Uptime:       3600,
-				Cpu:          25.5,
-				MemPct:       40.2,
-				DiskPct:      60.0,
-				Bandwidth:    100.0,
-				AgentVersion: "1.0.0",
+				Hostname:      "data-test.example.com",
+				KernelVersion: "5.15.0-generic",
+				Cores:         4,
+				Threads:       8,
+				CpuModel:      "Test CPU",
+				Uptime:        3600,
+				Cpu:           25.5,
+				MemPct:        40.2,
+				DiskPct:       60.0,
+				Bandwidth:     100.0,
+				AgentVersion:  "1.0.0",
 			},
 			Stats: system.Stats{
 				Cpu:         25.5,

internal/hub/ws/handlers.go

@@ -6,9 +6,7 @@ import (
 
 	"github.com/fxamacker/cbor/v2"
 	"github.com/henrygd/beszel/internal/common"
-	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/henrygd/beszel/internal/entities/system"
-	"github.com/henrygd/beszel/internal/entities/systemd"
 	"github.com/lxzan/gws"
 	"golang.org/x/crypto/ssh"
 )
@@ -117,46 +115,8 @@ func (ws *WsConn) RequestContainerInfo(ctx context.Context, containerID string)
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////
 
-// RequestSystemdInfo requests detailed information about a systemd service via WebSocket.
-func (ws *WsConn) RequestSystemdInfo(ctx context.Context, serviceName string) (systemd.ServiceDetails, error) {
-	if !ws.IsConnected() {
-		return nil, gws.ErrConnClosed
-	}
-
-	req, err := ws.requestManager.SendRequest(ctx, common.GetSystemdInfo, common.SystemdInfoRequest{ServiceName: serviceName})
-	if err != nil {
-		return nil, err
-	}
-
-	var result systemd.ServiceDetails
-	handler := &systemdInfoHandler{result: &result}
-	if err := ws.handleAgentRequest(req, handler); err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-// systemdInfoHandler parses ServiceDetails from AgentResponse
-type systemdInfoHandler struct {
-	BaseHandler
-	result *systemd.ServiceDetails
-}
-
-func (h *systemdInfoHandler) Handle(agentResponse common.AgentResponse) error {
-	if agentResponse.ServiceInfo == nil {
-		return errors.New("no systemd info in response")
-	}
-	*h.result = agentResponse.ServiceInfo
-	return nil
-}
-
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-
 // RequestSmartData requests SMART data via WebSocket.
-func (ws *WsConn) RequestSmartData(ctx context.Context) (map[string]smart.SmartData, error) {
+func (ws *WsConn) RequestSmartData(ctx context.Context) (map[string]any, error) {
 	if !ws.IsConnected() {
 		return nil, gws.ErrConnClosed
 	}
@@ -164,7 +124,7 @@ func (ws *WsConn) RequestSmartData(ctx context.Context) (map[string]smart.SmartD
 	if err != nil {
 		return nil, err
 	}
-	var result map[string]smart.SmartData
+	var result map[string]any
 	handler := ResponseHandler(&smartDataHandler{result: &result})
 	if err := ws.handleAgentRequest(req, handler); err != nil {
 		return nil, err
@@ -175,14 +135,19 @@ func (ws *WsConn) RequestSmartData(ctx context.Context) (map[string]smart.SmartD
 // smartDataHandler parses SMART data map from AgentResponse
 type smartDataHandler struct {
 	BaseHandler
-	result *map[string]smart.SmartData
+	result *map[string]any
 }
 
 func (h *smartDataHandler) Handle(agentResponse common.AgentResponse) error {
 	if agentResponse.SmartData == nil {
 		return errors.New("no SMART data in response")
 	}
-	*h.result = agentResponse.SmartData
+	// convert to map[string]any for transport convenience in hub layer
+	out := make(map[string]any, len(agentResponse.SmartData))
+	for k, v := range agentResponse.SmartData {
+		out[k] = v
+	}
+	*h.result = out
 	return nil
 }
 

internal/hub/ws/handlers_test.go

@@ -1,75 +0,0 @@
-//go:build testing
-
-package ws
-
-import (
-	"testing"
-
-	"github.com/henrygd/beszel/internal/common"
-	"github.com/henrygd/beszel/internal/entities/systemd"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSystemdInfoHandlerSuccess(t *testing.T) {
-	handler := &systemdInfoHandler{
-		result: &systemd.ServiceDetails{},
-	}
-
-	// Test successful handling with valid ServiceInfo
-	testDetails := systemd.ServiceDetails{
-		"Id":             "nginx.service",
-		"ActiveState":    "active",
-		"SubState":       "running",
-		"Description":    "A high performance web server",
-		"ExecMainPID":    1234,
-		"MemoryCurrent":  1024000,
-	}
-
-	response := common.AgentResponse{
-		ServiceInfo: testDetails,
-	}
-
-	err := handler.Handle(response)
-	assert.NoError(t, err)
-	assert.Equal(t, testDetails, *handler.result)
-}
-
-func TestSystemdInfoHandlerError(t *testing.T) {
-	handler := &systemdInfoHandler{
-		result: &systemd.ServiceDetails{},
-	}
-
-	// Test error handling when ServiceInfo is nil
-	response := common.AgentResponse{
-		ServiceInfo: nil,
-		Error:       "service not found",
-	}
-
-	err := handler.Handle(response)
-	assert.Error(t, err)
-	assert.Equal(t, "no systemd info in response", err.Error())
-}
-
-func TestSystemdInfoHandlerEmptyResponse(t *testing.T) {
-	handler := &systemdInfoHandler{
-		result: &systemd.ServiceDetails{},
-	}
-
-	// Test with completely empty response
-	response := common.AgentResponse{}
-
-	err := handler.Handle(response)
-	assert.Error(t, err)
-	assert.Equal(t, "no systemd info in response", err.Error())
-}
-
-func TestSystemdInfoHandlerLegacyNotSupported(t *testing.T) {
-	handler := &systemdInfoHandler{
-		result: &systemd.ServiceDetails{},
-	}
-
-	// Test that legacy format is not supported
-	err := handler.HandleLegacy([]byte("some data"))
-	assert.Error(t, err)
-	assert.Equal(t, "legacy format not supported", err.Error())
-}

internal/migrations/0_collections_snapshot_0_14_1.go

@@ -75,11 +75,9 @@ func init() {
 					"Disk",
 					"Temperature",
 					"Bandwidth",
-					"GPU",
 					"LoadAvg1",
 					"LoadAvg5",
-					"LoadAvg15",
-					"Battery"
+					"LoadAvg15"
 				]
 			},
 			{
@@ -720,9 +718,7 @@ func init() {
 				"type": "autodate"
 			}
 		],
-		"indexes": [
-			"CREATE INDEX ` + "`" + `idx_systems_status` + "`" + ` ON ` + "`" + `systems` + "`" + ` (` + "`" + `status` + "`" + `)"
-		],
+		"indexes": [],
 		"system": false
 	},
 	{
@@ -1009,614 +1005,6 @@ func init() {
 			"CREATE INDEX ` + "`" + `idx_r3Ja0rs102` + "`" + ` ON ` + "`" + `containers` + "`" + ` (` + "`" + `system` + "`" + `)"
 		],
 		"system": false
-	},
-	{
-		"createRule": null,
-		"deleteRule": null,
-		"fields": [
-			{
-				"autogeneratePattern": "[a-z0-9]{10}",
-				"hidden": false,
-				"id": "text3208210256",
-				"max": 10,
-				"min": 6,
-				"name": "id",
-				"pattern": "^[a-z0-9]+$",
-				"presentable": false,
-				"primaryKey": true,
-				"required": true,
-				"system": true,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text1579384326",
-				"max": 0,
-				"min": 0,
-				"name": "name",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "2hz5ncl8tizk5nx",
-				"hidden": false,
-				"id": "relation3377271179",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"hidden": false,
-				"id": "number2063623452",
-				"max": null,
-				"min": null,
-				"name": "state",
-				"onlyInt": true,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number1476559580",
-				"max": null,
-				"min": null,
-				"name": "sub",
-				"onlyInt": true,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number3128971310",
-				"max": null,
-				"min": null,
-				"name": "cpu",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number1052053287",
-				"max": null,
-				"min": null,
-				"name": "cpuPeak",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number3933025333",
-				"max": null,
-				"min": null,
-				"name": "memory",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number1828797201",
-				"max": null,
-				"min": null,
-				"name": "memPeak",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number3332085495",
-				"max": null,
-				"min": null,
-				"name": "updated",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			}
-		],
-		"id": "pbc_3494996990",
-		"indexes": [
-			"CREATE INDEX ` + "`" + `idx_4Z7LuLNdQb` + "`" + ` ON ` + "`" + `systemd_services` + "`" + ` (` + "`" + `system` + "`" + `)",
-			"CREATE INDEX ` + "`" + `idx_pBp1fF837e` + "`" + ` ON ` + "`" + `systemd_services` + "`" + ` (` + "`" + `updated` + "`" + `)"
-		],
-		"listRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id",
-		"name": "systemd_services",
-		"system": false,
-		"type": "base",
-		"updateRule": null,
-		"viewRule": null
-	},
-	{
-		"createRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"deleteRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"fields": [
-			{
-				"autogeneratePattern": "[a-z0-9]{10}",
-				"hidden": false,
-				"id": "text3208210256",
-				"max": 10,
-				"min": 10,
-				"name": "id",
-				"pattern": "^[a-z0-9]+$",
-				"presentable": false,
-				"primaryKey": true,
-				"required": true,
-				"system": true,
-				"type": "text"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "_pb_users_auth_",
-				"hidden": false,
-				"id": "relation2375276105",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "user",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "2hz5ncl8tizk5nx",
-				"hidden": false,
-				"id": "relation3377271179",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"hidden": false,
-				"id": "select2844932856",
-				"maxSelect": 1,
-				"name": "type",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "select",
-				"values": [
-					"one-time",
-					"daily"
-				]
-			},
-			{
-				"hidden": false,
-				"id": "date2675529103",
-				"max": "",
-				"min": "",
-				"name": "start",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "date"
-			},
-			{
-				"hidden": false,
-				"id": "date16528305",
-				"max": "",
-				"min": "",
-				"name": "end",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "date"
-			}
-		],
-		"id": "pbc_451525641",
-		"indexes": [
-			"CREATE INDEX ` + "`" + `idx_q0iKnRP9v8` + "`" + ` ON ` + "`" + `quiet_hours` + "`" + ` (\n  ` + "`" + `user` + "`" + `,\n  ` + "`" + `system` + "`" + `\n)",
-			"CREATE INDEX ` + "`" + `idx_6T7ljT7FJd` + "`" + ` ON ` + "`" + `quiet_hours` + "`" + ` (\n  ` + "`" + `type` + "`" + `,\n  ` + "`" + `end` + "`" + `\n)"
-		],
-		"listRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"name": "quiet_hours",
-		"system": false,
-		"type": "base",
-		"updateRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"viewRule": "@request.auth.id != \"\" && user.id = @request.auth.id"
-	},
-	{
-		"createRule": null,
-		"deleteRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id",
-		"fields": [
-			{
-				"autogeneratePattern": "[a-z0-9]{10}",
-				"hidden": false,
-				"id": "text3208210256",
-				"max": 10,
-				"min": 10,
-				"name": "id",
-				"pattern": "^[a-z0-9]+$",
-				"presentable": false,
-				"primaryKey": true,
-				"required": true,
-				"system": true,
-				"type": "text"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "2hz5ncl8tizk5nx",
-				"hidden": false,
-				"id": "relation3377271179",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text1579384326",
-				"max": 0,
-				"min": 0,
-				"name": "name",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text3616895705",
-				"max": 0,
-				"min": 0,
-				"name": "model",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text2744374011",
-				"max": 0,
-				"min": 0,
-				"name": "state",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "number3051925876",
-				"max": null,
-				"min": null,
-				"name": "capacity",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number190023114",
-				"max": null,
-				"min": null,
-				"name": "temp",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text3589068740",
-				"max": 0,
-				"min": 0,
-				"name": "firmware",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text3547646428",
-				"max": 0,
-				"min": 0,
-				"name": "serial",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text2363381545",
-				"max": 0,
-				"min": 0,
-				"name": "type",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "number1234567890",
-				"max": null,
-				"min": null,
-				"name": "hours",
-				"onlyInt": true,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number0987654321",
-				"max": null,
-				"min": null,
-				"name": "cycles",
-				"onlyInt": true,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "json832282224",
-				"maxSize": 0,
-				"name": "attributes",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "json"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"id": "pbc_2571630677",
-		"indexes": [
-			"CREATE INDEX ` + "`" + `idx_DZ9yhvgl44` + "`" + ` ON ` + "`" + `smart_devices` + "`" + ` (` + "`" + `system` + "`" + `)"
-		],
-		"listRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id",
-		"name": "smart_devices",
-		"system": false,
-		"type": "base",
-		"updateRule": null,
-		"viewRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id"
-	},
-	{
-		"createRule": "",
-		"deleteRule": "",
-		"fields": [
-			{
-				"autogeneratePattern": "[a-z0-9]{15}",
-				"hidden": false,
-				"id": "text3208210256",
-				"max": 15,
-				"min": 15,
-				"name": "id",
-				"pattern": "^[a-z0-9]+$",
-				"presentable": false,
-				"primaryKey": true,
-				"required": true,
-				"system": true,
-				"type": "text"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "2hz5ncl8tizk5nx",
-				"hidden": false,
-				"id": "relation3377271179",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text3847340049",
-				"max": 0,
-				"min": 0,
-				"name": "hostname",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "number1789936913",
-				"max": null,
-				"min": null,
-				"name": "os",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text2818598173",
-				"max": 0,
-				"min": 0,
-				"name": "os_name",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text1574083243",
-				"max": 0,
-				"min": 0,
-				"name": "kernel",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text3128971310",
-				"max": 0,
-				"min": 0,
-				"name": "cpu",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "text4161937994",
-				"max": 0,
-				"min": 0,
-				"name": "arch",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "number4245036687",
-				"max": null,
-				"min": null,
-				"name": "cores",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number1871592925",
-				"max": null,
-				"min": null,
-				"name": "threads",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "number3933025333",
-				"max": null,
-				"min": null,
-				"name": "memory",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "bool2200265312",
-				"name": "podman",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "bool"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"id": "pbc_3116237454",
-		"indexes": [],
-		"listRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id",
-		"name": "system_details",
-		"system": false,
-		"type": "base",
-		"updateRule": "",
-		"viewRule": "@request.auth.id != \"\" && system.users.id ?= @request.auth.id"
 	}
 ]`
 

internal/migrations/1758738789_fix_cached_mem.go

@@ -0,0 +1,50 @@
+package migrations
+
+import (
+	"github.com/henrygd/beszel/internal/entities/system"
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+// This can be deleted after Nov 2025 or so
+
+func init() {
+	m.Register(func(app core.App) error {
+		app.RunInTransaction(func(txApp core.App) error {
+			var systemIds []string
+			txApp.DB().NewQuery("SELECT id FROM systems").Column(&systemIds)
+
+			for _, systemId := range systemIds {
+				var statRecordIds []string
+				txApp.DB().NewQuery("SELECT id FROM system_stats WHERE system = {:system} AND created > {:created}").Bind(map[string]any{"system": systemId, "created": "2025-09-21"}).Column(&statRecordIds)
+
+				for _, statRecordId := range statRecordIds {
+					statRecord, err := txApp.FindRecordById("system_stats", statRecordId)
+					if err != nil {
+						return err
+					}
+					var systemStats system.Stats
+					err = statRecord.UnmarshalJSONField("stats", &systemStats)
+					if err != nil {
+						return err
+					}
+					// if mem buff cache is less than total mem, we don't need to fix it
+					if systemStats.MemBuffCache < systemStats.Mem {
+						continue
+					}
+					systemStats.MemBuffCache = 0
+					statRecord.Set("stats", systemStats)
+					err = txApp.SaveNoValidate(statRecord)
+					if err != nil {
+						return err
+					}
+				}
+			}
+
+			return nil
+		})
+		return nil
+	}, func(app core.App) error {
+		return nil
+	})
+}

internal/records/records.go

@@ -177,10 +177,6 @@ func (rm *RecordManager) AverageSystemStats(db dbx.Builder, records RecordIds) *
 	stats := &tempStats
 	// necessary because uint8 is not big enough for the sum
 	batterySum := 0
-	// accumulate per-core usage across records
-	var cpuCoresSums []uint64
-	// accumulate cpu breakdown [user, system, iowait, steal, idle]
-	var cpuBreakdownSums []float64
 
 	count := float64(len(records))
 	tempCount := float64(0)
@@ -198,15 +194,6 @@ func (rm *RecordManager) AverageSystemStats(db dbx.Builder, records RecordIds) *
 		}
 
 		sum.Cpu += stats.Cpu
-		// accumulate cpu time breakdowns if present
-		if stats.CpuBreakdown != nil {
-			if len(cpuBreakdownSums) < len(stats.CpuBreakdown) {
-				cpuBreakdownSums = append(cpuBreakdownSums, make([]float64, len(stats.CpuBreakdown)-len(cpuBreakdownSums))...)
-			}
-			for i, v := range stats.CpuBreakdown {
-				cpuBreakdownSums[i] += v
-			}
-		}
 		sum.Mem += stats.Mem
 		sum.MemUsed += stats.MemUsed
 		sum.MemPct += stats.MemPct
@@ -230,17 +217,6 @@ func (rm *RecordManager) AverageSystemStats(db dbx.Builder, records RecordIds) *
 		sum.DiskIO[1] += stats.DiskIO[1]
 		batterySum += int(stats.Battery[0])
 		sum.Battery[1] = stats.Battery[1]
-
-		// accumulate per-core usage if present
-		if stats.CpuCoresUsage != nil {
-			if len(cpuCoresSums) < len(stats.CpuCoresUsage) {
-				// extend slices to accommodate core count
-				cpuCoresSums = append(cpuCoresSums, make([]uint64, len(stats.CpuCoresUsage)-len(cpuCoresSums))...)
-			}
-			for i, v := range stats.CpuCoresUsage {
-				cpuCoresSums[i] += uint64(v)
-			}
-		}
 		// Set peak values
 		sum.MaxCpu = max(sum.MaxCpu, stats.MaxCpu, stats.Cpu)
 		sum.MaxMem = max(sum.MaxMem, stats.MaxMem, stats.MemUsed)
@@ -409,25 +385,6 @@ func (rm *RecordManager) AverageSystemStats(db dbx.Builder, records RecordIds) *
 				sum.GPUData[id] = gpu
 			}
 		}
-
-		// Average per-core usage
-		if len(cpuCoresSums) > 0 {
-			avg := make(system.Uint8Slice, len(cpuCoresSums))
-			for i := range cpuCoresSums {
-				v := math.Round(float64(cpuCoresSums[i]) / count)
-				avg[i] = uint8(v)
-			}
-			sum.CpuCoresUsage = avg
-		}
-
-		// Average CPU breakdown
-		if len(cpuBreakdownSums) > 0 {
-			avg := make([]float64, len(cpuBreakdownSums))
-			for i := range cpuBreakdownSums {
-				avg[i] = twoDecimals(cpuBreakdownSums[i] / count)
-			}
-			sum.CpuBreakdown = avg
-		}
 	}
 
 	return sum
@@ -490,18 +447,10 @@ func (rm *RecordManager) DeleteOldRecords() {
 		if err != nil {
 			return err
 		}
-		err = deleteOldSystemdServiceRecords(txApp)
-		if err != nil {
-			return err
-		}
 		err = deleteOldAlertsHistory(txApp, 200, 250)
 		if err != nil {
 			return err
 		}
-		err = deleteOldQuietHours(txApp)
-		if err != nil {
-			return err
-		}
 		return nil
 	})
 }
@@ -567,20 +516,6 @@ func deleteOldSystemStats(app core.App) error {
 	return nil
 }
 
-// Deletes systemd service records that haven't been updated in the last 20 minutes
-func deleteOldSystemdServiceRecords(app core.App) error {
-	now := time.Now().UTC()
-	twentyMinutesAgo := now.Add(-20 * time.Minute)
-
-	// Delete systemd service records where updated < twentyMinutesAgo
-	_, err := app.DB().NewQuery("DELETE FROM systemd_services WHERE updated < {:updated}").Bind(dbx.Params{"updated": twentyMinutesAgo.UnixMilli()}).Execute()
-	if err != nil {
-		return fmt.Errorf("failed to delete old systemd service records: %v", err)
-	}
-
-	return nil
-}
-
 // Deletes container records that haven't been updated in the last 10 minutes
 func deleteOldContainerRecords(app core.App) error {
 	now := time.Now().UTC()
@@ -595,17 +530,6 @@ func deleteOldContainerRecords(app core.App) error {
 	return nil
 }
 
-// Deletes old quiet hours records where end date has passed
-func deleteOldQuietHours(app core.App) error {
-	now := time.Now().UTC()
-	_, err := app.DB().NewQuery("DELETE FROM quiet_hours WHERE type = 'one-time' AND end < {:now}").Bind(dbx.Params{"now": now}).Execute()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 /* Round float to two decimals */
 func twoDecimals(value float64) float64 {
 	return math.Round(value*100) / 100

internal/records/records_test.go

@@ -351,83 +351,6 @@ func TestDeleteOldAlertsHistoryEdgeCases(t *testing.T) {
 	})
 }
 
-// TestDeleteOldSystemdServiceRecords tests systemd service cleanup via DeleteOldRecords
-func TestDeleteOldSystemdServiceRecords(t *testing.T) {
-	hub, err := tests.NewTestHub(t.TempDir())
-	require.NoError(t, err)
-	defer hub.Cleanup()
-
-	rm := records.NewRecordManager(hub)
-
-	// Create test user and system
-	user, err := tests.CreateUser(hub, "test@example.com", "testtesttest")
-	require.NoError(t, err)
-
-	system, err := tests.CreateRecord(hub, "systems", map[string]any{
-		"name":   "test-system",
-		"host":   "localhost",
-		"port":   "45876",
-		"status": "up",
-		"users":  []string{user.Id},
-	})
-	require.NoError(t, err)
-
-	now := time.Now().UTC()
-
-	// Create old systemd service records that should be deleted (older than 20 minutes)
-	oldRecord, err := tests.CreateRecord(hub, "systemd_services", map[string]any{
-		"system":  system.Id,
-		"name":    "nginx.service",
-		"state":   0, // Active
-		"sub":     1, // Running
-		"cpu":     5.0,
-		"cpuPeak": 10.0,
-		"memory":  1024000,
-		"memPeak": 2048000,
-	})
-	require.NoError(t, err)
-	// Set updated time to 25 minutes ago (should be deleted)
-	oldRecord.SetRaw("updated", now.Add(-25*time.Minute).UnixMilli())
-	err = hub.SaveNoValidate(oldRecord)
-	require.NoError(t, err)
-
-	// Create recent systemd service record that should be kept (within 20 minutes)
-	recentRecord, err := tests.CreateRecord(hub, "systemd_services", map[string]any{
-		"system":  system.Id,
-		"name":    "apache.service",
-		"state":   1, // Inactive
-		"sub":     0, // Dead
-		"cpu":     2.0,
-		"cpuPeak": 3.0,
-		"memory":  512000,
-		"memPeak": 1024000,
-	})
-	require.NoError(t, err)
-	// Set updated time to 10 minutes ago (should be kept)
-	recentRecord.SetRaw("updated", now.Add(-10*time.Minute).UnixMilli())
-	err = hub.SaveNoValidate(recentRecord)
-	require.NoError(t, err)
-
-	// Count records before deletion
-	countBefore, err := hub.CountRecords("systemd_services")
-	require.NoError(t, err)
-	assert.Equal(t, int64(2), countBefore, "Should have 2 systemd service records initially")
-
-	// Run deletion via RecordManager
-	rm.DeleteOldRecords()
-
-	// Count records after deletion
-	countAfter, err := hub.CountRecords("systemd_services")
-	require.NoError(t, err)
-	assert.Equal(t, int64(1), countAfter, "Should have 1 systemd service record after deletion")
-
-	// Verify the correct record was kept
-	remainingRecords, err := hub.FindRecordsByFilter("systemd_services", "", "", 10, 0, nil)
-	require.NoError(t, err)
-	assert.Len(t, remainingRecords, 1, "Should have exactly 1 record remaining")
-	assert.Equal(t, "apache.service", remainingRecords[0].Get("name"), "The recent record should be kept")
-}
-
 // TestRecordManagerCreation tests RecordManager creation
 func TestRecordManagerCreation(t *testing.T) {
 	hub, err := tests.NewTestHub(t.TempDir())

internal/site/biome.json

@@ -17,9 +17,6 @@
 		"enabled": true,
 		"rules": {
 			"recommended": true,
-			"a11y": {
-				"useButtonType": "off"
-			},
 			"complexity": {
 				"noUselessStringConcat": "error",
 				"noUselessUndefinedInitialization": "error",
@@ -33,14 +30,13 @@
 				"noUnusedFunctionParameters": "error",
 				"noUnusedPrivateClassMembers": "error",
 				"useExhaustiveDependencies": {
-					"level": "off"
+					"level": "error",
+					"options": {
+						"reportUnnecessaryDependencies": false
+					}
 				},
-				"useUniqueElementIds": "off",
 				"noUnusedVariables": "error"
 			},
-			"security": {
-				"noDangerouslySetInnerHtml": "warn"
-			},
 			"style": {
 				"noParameterProperties": "error",
 				"noYodaExpression": "error",
@@ -51,8 +47,7 @@
 			},
 			"suspicious": {
 				"useAwait": "error",
-				"noEvolvingTypes": "error",
-				"noArrayIndexKey": "off"
+				"noEvolvingTypes": "error"
 			}
 		}
 	},

internal/site/index.html

@@ -2,7 +2,7 @@
 <html lang="en" dir="ltr">
 	<head>
 		<meta charset="UTF-8" />
-		<link rel="manifest" href="./static/manifest.json" crossorigin="use-credentials" />
+		<link rel="manifest" href="./static/manifest.json" />
 		<link rel="icon" type="image/svg+xml" href="./static/icon.svg" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0,maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
 		<meta name="robots" content="noindex, nofollow" />

internal/site/lingui.config.ts

@@ -24,7 +24,6 @@ export default defineConfig({
 		"tr",
 		"ru",
 		"sl",
-		"sr",
 		"sv",
 		"uk",
 		"vi",

internal/site/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "beszel",
-	"version": "0.17.0",
+	"version": "0.15.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "beszel",
-			"version": "0.17.0",
+			"version": "0.15.2",
 			"dependencies": {
 				"@henrygd/queue": "^1.0.7",
 				"@henrygd/semaphore": "^0.0.2",
@@ -39,8 +39,8 @@
 				"lucide-react": "^0.452.0",
 				"nanostores": "^0.11.4",
 				"pocketbase": "^0.26.2",
-				"react": "^19.1.2",
-				"react-dom": "^19.1.2",
+				"react": "^19.1.1",
+				"react-dom": "^19.1.1",
 				"recharts": "^2.15.4",
 				"shiki": "^3.13.0",
 				"tailwind-merge": "^3.3.1",
@@ -111,7 +111,6 @@
 			"integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==",
 			"devOptional": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@ampproject/remapping": "^2.2.0",
 				"@babel/code-frame": "^7.27.1",
@@ -987,29 +986,6 @@
 			"integrity": "sha512-N3W7MKwTRmAxOjeG0NAT18oe2Xn3KdjkpMR6crbkF1UDamMGPjyigqEsefiv+qTaxibtc1a+zXCVzb9YXANVqw==",
 			"license": "MIT"
 		},
-		"node_modules/@isaacs/balanced-match": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
-			"integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "20 || >=22"
-			}
-		},
-		"node_modules/@isaacs/brace-expansion": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-			"integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@isaacs/balanced-match": "^4.0.1"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			}
-		},
 		"node_modules/@isaacs/cliui": {
 			"version": "8.0.2",
 			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1138,7 +1114,6 @@
 			"integrity": "sha512-9IO+PDvdneY8OCI8zvI1oDXpzryTMtyRv7uq9O0U1mFCvIPVd5dWQKQDu/CpgpYAc2+JG/izn5PNl9xzPc6ckw==",
 			"devOptional": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@babel/core": "^7.20.12",
 				"@babel/runtime": "^7.20.13",
@@ -1231,6 +1206,30 @@
 				"node": ">=14"
 			}
 		},
+		"node_modules/@lingui/cli/node_modules/glob": {
+			"version": "11.0.1",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz",
+			"integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"foreground-child": "^3.1.0",
+				"jackspeak": "^4.0.1",
+				"minimatch": "^10.0.0",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^2.0.0"
+			},
+			"bin": {
+				"glob": "dist/esm/bin.mjs"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/@lingui/cli/node_modules/glob-parent": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -1244,6 +1243,65 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/@lingui/cli/node_modules/jackspeak": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.0.tgz",
+			"integrity": "sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@lingui/cli/node_modules/lru-cache": {
+			"version": "11.0.2",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz",
+			"integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "20 || >=22"
+			}
+		},
+		"node_modules/@lingui/cli/node_modules/minimatch": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+			"integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@lingui/cli/node_modules/path-scurry": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
+			"integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"lru-cache": "^11.0.0",
+				"minipass": "^7.1.2"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/@lingui/cli/node_modules/picomatch": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -1292,7 +1350,6 @@
 			"resolved": "https://registry.npmjs.org/@lingui/core/-/core-5.4.1.tgz",
 			"integrity": "sha512-4FeIh56PH5vziPg2BYo4XYWWOHE4XaY/XR8Jakwn0/qwtLpydWMNVpZOpGWi7nfPZtcLaJLmZKup6UNxEl1Pfw==",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.20.13",
 				"@lingui/message-utils": "5.4.1"
@@ -3488,7 +3545,6 @@
 			"integrity": "sha512-lr3jdBw/BGj49Eps7EvqlUaoeA0xpj3pc0RoJkHpYaCHkVK7i28dKyImLQb3JVlqs3aYSXf7qYuWOW/fgZnTXQ==",
 			"devOptional": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"csstype": "^3.0.2"
 			}
@@ -3499,7 +3555,6 @@
 			"integrity": "sha512-i5ZzwYpqjmrKenzkoLM2Ibzt6mAsM7pxB6BCIouEVVmgiqaMj1TjaK7hnA36hbW5aZv20kx7Lw6hWzPWg0Rurw==",
 			"devOptional": true,
 			"license": "MIT",
-			"peer": true,
 			"peerDependencies": {
 				"@types/react": "^19.0.0"
 			}
@@ -3551,9 +3606,9 @@
 			}
 		},
 		"node_modules/ansi-regex": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-			"integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+			"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3625,6 +3680,13 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/base64-js": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -3671,6 +3733,16 @@
 				"readable-stream": "^3.4.0"
 			}
 		},
+		"node_modules/brace-expansion": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
 		"node_modules/braces": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
@@ -3704,7 +3776,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"caniuse-lite": "^1.0.30001726",
 				"electron-to-chromium": "^1.5.173",
@@ -4415,13 +4486,13 @@
 			}
 		},
 		"node_modules/foreground-child": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-			"integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+			"integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
-				"cross-spawn": "^7.0.6",
+				"cross-spawn": "^7.0.0",
 				"signal-exit": "^4.0.1"
 			},
 			"engines": {
@@ -4465,30 +4536,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/glob": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
-			"integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"foreground-child": "^3.3.1",
-				"jackspeak": "^4.1.1",
-				"minimatch": "^10.1.1",
-				"minipass": "^7.1.2",
-				"package-json-from-dist": "^1.0.0",
-				"path-scurry": "^2.0.0"
-			},
-			"bin": {
-				"glob": "dist/esm/bin.mjs"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/graceful-fs": {
 			"version": "4.2.11",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -4709,22 +4756,6 @@
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/jackspeak": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
-			"integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"@isaacs/cliui": "^8.0.2"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/jest-get-type": {
 			"version": "29.6.3",
 			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
@@ -4776,9 +4807,9 @@
 			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-			"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"devOptional": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5149,9 +5180,9 @@
 			}
 		},
 		"node_modules/mdast-util-to-hast": {
-			"version": "13.2.1",
-			"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
-			"integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
+			"version": "13.2.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz",
+			"integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==",
 			"license": "MIT",
 			"dependencies": {
 				"@types/hast": "^3.0.0",
@@ -5295,22 +5326,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/minimatch": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-			"integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"@isaacs/brace-expansion": "^5.0.0"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/minipass": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -5393,7 +5408,6 @@
 				}
 			],
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": "^18.0.0 || >=20.0.0"
 			}
@@ -5553,33 +5567,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/path-scurry": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
-			"integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"lru-cache": "^11.0.0",
-				"minipass": "^7.1.2"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/path-scurry/node_modules/lru-cache": {
-			"version": "11.2.4",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
-			"integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"engines": {
-				"node": "20 || >=22"
-			}
-		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -5603,7 +5590,6 @@
 			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=12"
 			},
@@ -5745,26 +5731,24 @@
 			}
 		},
 		"node_modules/react": {
-			"version": "19.1.2",
-			"resolved": "https://registry.npmjs.org/react/-/react-19.1.2.tgz",
-			"integrity": "sha512-MdWVitvLbQULD+4DP8GYjZUrepGW7d+GQkNVqJEzNxE+e9WIa4egVFE/RDfVb1u9u/Jw7dNMmPB4IqxzbFYJ0w==",
+			"version": "19.1.1",
+			"resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
+			"integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
 			"license": "MIT",
-			"peer": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
 		"node_modules/react-dom": {
-			"version": "19.1.2",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.2.tgz",
-			"integrity": "sha512-dEoydsCp50i7kS1xHOmPXq4zQYoGWedUsvqv9H6zdif2r7yLHygyfP9qou71TulRN0d6ng9EbRVsQhSqfUc19g==",
+			"version": "19.1.1",
+			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz",
+			"integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==",
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"scheduler": "^0.26.0"
 			},
 			"peerDependencies": {
-				"react": "^19.1.2"
+				"react": "^19.1.1"
 			}
 		},
 		"node_modules/react-is": {
@@ -6187,16 +6171,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/string-width-cjs/node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/string-width-cjs/node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -6217,6 +6191,16 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/string-width-cjs/node_modules/strip-ansi/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/stringify-entities": {
 			"version": "4.0.4",
 			"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
@@ -6232,9 +6216,9 @@
 			}
 		},
 		"node_modules/strip-ansi": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-			"integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6299,8 +6283,7 @@
 			"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.12.tgz",
 			"integrity": "sha512-DzFtxOi+7NsFf7DBtI3BJsynR+0Yp6etH+nRPTbpWnS2pZBaSksv/JGctNwSWzbFjp0vxSqknaUylseZqMDGrA==",
 			"dev": true,
-			"license": "MIT",
-			"peer": true
+			"license": "MIT"
 		},
 		"node_modules/tapable": {
 			"version": "2.2.3",
@@ -6422,7 +6405,6 @@
 			"integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
 			"devOptional": true,
 			"license": "Apache-2.0",
-			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -6657,7 +6639,6 @@
 			"integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==",
 			"dev": true,
 			"license": "MIT",
-			"peer": true,
 			"dependencies": {
 				"esbuild": "^0.25.0",
 				"fdir": "^6.5.0",
@@ -6809,23 +6790,6 @@
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
-		"node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/wrap-ansi-cjs/node_modules/string-width": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -6841,6 +6805,13 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/wrap-ansi-cjs/node_modules/string-width/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -6854,10 +6825,20 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/wrap-ansi-cjs/node_modules/strip-ansi/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/wrap-ansi/node_modules/ansi-styles": {
-			"version": "6.2.3",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-			"integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {

internal/site/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "beszel",
 	"private": true,
-	"version": "0.18.0-beta.1",
+	"version": "0.15.2",
 	"type": "module",
 	"scripts": {
 		"dev": "vite --host",
@@ -46,8 +46,8 @@
 		"lucide-react": "^0.452.0",
 		"nanostores": "^0.11.4",
 		"pocketbase": "^0.26.2",
-		"react": "^19.1.2",
-		"react-dom": "^19.1.2",
+		"react": "^19.1.1",
+		"react-dom": "^19.1.1",
 		"recharts": "^2.15.4",
 		"shiki": "^3.13.0",
 		"tailwind-merge": "^3.3.1",
@@ -77,4 +77,4 @@
 	"optionalDependencies": {
 		"@esbuild/linux-arm64": "^0.21.5"
 	}
-}
+}

internal/site/src/components/active-alerts.tsx

@@ -61,11 +61,6 @@ export const ActiveAlerts = () => {
 										<AlertDescription>
 											{alert.name === "Status" ? (
 												<Trans>Connection is down</Trans>
-											) : info.invert ? (
-												<Trans>
-													Below {alert.value}
-													{info.unit} in last <Plural value={alert.min} one="# minute" other="# minutes" />
-												</Trans>
 											) : (
 												<Trans>
 													Exceeds {alert.value}

internal/site/src/components/add-system.tsx

@@ -1,4 +1,4 @@
-import { msg, t } from "@lingui/core/macro"
+import { t } from "@lingui/core/macro"
 import { Trans } from "@lingui/react/macro"
 import { useStore } from "@nanostores/react"
 import { getPagePath } from "@nanostores/router"
@@ -36,9 +36,6 @@ import { AppleIcon, DockerIcon, FreeBsdIcon, TuxIcon, WindowsIcon } from "./ui/i
 import { InputCopy } from "./ui/input-copy"
 
 export function AddSystemButton({ className }: { className?: string }) {
-	if (isReadOnlyUser()) {
-		return null
-	}
 	const [open, setOpen] = useState(false)
 	const opened = useRef(false)
 	if (open) {
@@ -48,7 +45,10 @@ export function AddSystemButton({ className }: { className?: string }) {
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
 			<DialogTrigger asChild>
-				<Button variant="outline" className={cn("flex gap-1 max-xs:h-[2.4rem]", className)}>
+				<Button
+					variant="outline"
+					className={cn("flex gap-1 max-xs:h-[2.4rem]", className, isReadOnlyUser() && "hidden")}
+				>
 					<PlusIcon className="h-4 w-4 -ms-1" />
 					<Trans>
 						Add <span className="hidden sm:inline">System</span>
@@ -124,8 +124,6 @@ export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) =>
 		}
 	}
 
-	const systemTranslation = t`System`
-
 	return (
 		<DialogContent
 			className="w-[90%] sm:w-auto sm:ns-dialog max-w-full rounded-lg"
@@ -136,11 +134,7 @@ export const SystemDialog = ({ setOpen, system }: { setOpen: (open: boolean) =>
 			<Tabs defaultValue={tab} onValueChange={setTab}>
 				<DialogHeader>
 					<DialogTitle className="mb-1 pb-1 max-w-100 truncate pr-8">
-						{system ? (
-							<Trans>Edit {{ foo: systemTranslation }}</Trans>
-						) : (
-							<Trans>Add {{ foo: systemTranslation }}</Trans>
-						)}
+						{system ? `${t`Edit`} ${system?.name}` : <Trans>Add New System</Trans>}
 					</DialogTitle>
 					<TabsList className="grid w-full grid-cols-2">
 						<TabsTrigger value="docker">Docker</TabsTrigger>

internal/site/src/components/alerts/alerts-sheet.tsx

@@ -245,23 +245,13 @@ export function AlertContent({
 						{!singleDescription && (
 							<div>
 								<p id={`v${name}`} className="text-sm block h-8">
-									{alertData.invert ? (
-										<Trans>
-											Average drops below{" "}
-											<strong className="text-foreground">
-												{value}
-												{alertData.unit}
-											</strong>
-										</Trans>
-									) : (
-										<Trans>
-											Average exceeds{" "}
-											<strong className="text-foreground">
-												{value}
-												{alertData.unit}
-											</strong>
-										</Trans>
-									)}
+									<Trans>
+										Average exceeds{" "}
+										<strong className="text-foreground">
+											{value}
+											{alertData.unit}
+										</strong>
+									</Trans>
 								</p>
 								<div className="flex gap-3">
 									<Slider

internal/site/src/components/charts/area-chart.tsx

@@ -11,14 +11,12 @@ import {
 import { chartMargin, cn, formatShortDate } from "@/lib/utils"
 import type { ChartData, SystemStatsRecord } from "@/types"
 import { useYAxisWidth } from "./hooks"
-import { AxisDomain } from "recharts/types/util/types"
 
 export type DataPoint = {
 	label: string
 	dataKey: (data: SystemStatsRecord) => number | undefined
 	color: number | string
 	opacity: number
-	stackId?: string | number
 }
 
 export default function AreaChartDefault({
@@ -31,25 +29,19 @@ export default function AreaChartDefault({
 	domain,
 	legend,
 	itemSorter,
-	showTotal = false,
-	reverseStackOrder = false,
-	hideYAxis = false,
 }: // logRender = false,
-	{
-		chartData: ChartData
-		max?: number
-		maxToggled?: boolean
-		tickFormatter: (value: number, index: number) => string
-		contentFormatter: ({ value, payload }: { value: number; payload: SystemStatsRecord }) => string
-		dataPoints?: DataPoint[]
-		domain?: AxisDomain
-		legend?: boolean
-		showTotal?: boolean
-		itemSorter?: (a: any, b: any) => number
-		reverseStackOrder?: boolean
-		hideYAxis?: boolean
-		// logRender?: boolean
-	}) {
+{
+	chartData: ChartData
+	max?: number
+	maxToggled?: boolean
+	tickFormatter: (value: number, index: number) => string
+	contentFormatter: ({ value, payload }: { value: number; payload: SystemStatsRecord }) => string
+	dataPoints?: DataPoint[]
+	domain?: [number, number]
+	legend?: boolean
+	itemSorter?: (a: any, b: any) => number
+	// logRender?: boolean
+}) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
 
 	// biome-ignore lint/correctness/useExhaustiveDependencies: ignore
@@ -64,29 +56,21 @@ export default function AreaChartDefault({
 			<div>
 				<ChartContainer
 					className={cn("h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity", {
-						"opacity-100": yAxisWidth || hideYAxis,
-						"ps-4": hideYAxis,
+						"opacity-100": yAxisWidth,
 					})}
 				>
-					<AreaChart
-						reverseStackOrder={reverseStackOrder}
-						accessibilityLayer
-						data={chartData.systemStats}
-						margin={hideYAxis ? { ...chartMargin, left: 5 } : chartMargin}
-					>
+					<AreaChart accessibilityLayer data={chartData.systemStats} margin={chartMargin}>
 						<CartesianGrid vertical={false} />
-						{!hideYAxis && (
-							<YAxis
-								direction="ltr"
-								orientation={chartData.orientation}
-								className="tracking-tighter"
-								width={yAxisWidth}
-								domain={domain ?? [0, max ?? "auto"]}
-								tickFormatter={(value, index) => updateYAxisWidth(tickFormatter(value, index))}
-								tickLine={false}
-								axisLine={false}
-							/>
-						)}
+						<YAxis
+							direction="ltr"
+							orientation={chartData.orientation}
+							className="tracking-tighter"
+							width={yAxisWidth}
+							domain={domain ?? [0, max ?? "auto"]}
+							tickFormatter={(value, index) => updateYAxisWidth(tickFormatter(value, index))}
+							tickLine={false}
+							axisLine={false}
+						/>
 						{xAxis(chartData)}
 						<ChartTooltip
 							animationEasing="ease-out"
@@ -97,7 +81,6 @@ export default function AreaChartDefault({
 								<ChartTooltipContent
 									labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
 									contentFormatter={contentFormatter}
-									showTotal={showTotal}
 								/>
 							}
 						/>
@@ -116,14 +99,13 @@ export default function AreaChartDefault({
 									fillOpacity={dataPoint.opacity}
 									stroke={color}
 									isAnimationActive={false}
-									stackId={dataPoint.stackId}
 								/>
 							)
 						})}
-						{legend && <ChartLegend content={<ChartLegendContent reverse={reverseStackOrder} />} />}
+						{legend && <ChartLegend content={<ChartLegendContent />} />}
 					</AreaChart>
 				</ChartContainer>
 			</div>
 		)
-	}, [chartData.systemStats.at(-1), yAxisWidth, maxToggled, showTotal])
+	}, [chartData.systemStats.at(-1), yAxisWidth, maxToggled])
 }

internal/site/src/components/charts/container-chart.tsx

@@ -2,7 +2,7 @@
 import { useStore } from "@nanostores/react"
 import { memo, useMemo } from "react"
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
-import { type ChartConfig, ChartContainer, ChartTooltip, ChartTooltipContent, pinnedAxisDomain, xAxis } from "@/components/ui/chart"
+import { type ChartConfig, ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import { ChartType, Unit } from "@/lib/enums"
 import { $containerFilter, $userSettings } from "@/lib/stores"
 import { chartMargin, cn, decimalString, formatBytes, formatShortDate, toFixedFloat } from "@/lib/utils"
@@ -41,7 +41,7 @@ export default memo(function ContainerChart({
 		// tick formatter
 		if (chartType === ChartType.CPU) {
 			obj.tickFormatter = (value) => {
-				const val = `${toFixedFloat(value, 2)}%`
+				const val = toFixedFloat(value, 2) + unit
 				return updateYAxisWidth(val)
 			}
 		} else {
@@ -78,7 +78,7 @@ export default memo(function ContainerChart({
 				return `${decimalString(value)} ${unit}`
 			}
 		} else {
-			obj.toolTipFormatter = (item: any) => `${decimalString(item.value)}${unit}`
+			obj.toolTipFormatter = (item: any) => `${decimalString(item.value)} ${unit}`
 		}
 		// data function
 		if (isNetChart) {
@@ -124,7 +124,6 @@ export default memo(function ContainerChart({
 					<CartesianGrid vertical={false} />
 					<YAxis
 						direction="ltr"
-						domain={pinnedAxisDomain()}
 						orientation={chartData.orientation}
 						className="tracking-tighter"
 						width={yAxisWidth}
@@ -140,7 +139,7 @@ export default memo(function ContainerChart({
 						labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
 						// @ts-expect-error
 						itemSorter={(a, b) => b.value - a.value}
-						content={<ChartTooltipContent filter={filter} contentFormatter={toolTipFormatter} showTotal={true} />}
+						content={<ChartTooltipContent filter={filter} contentFormatter={toolTipFormatter} />}
 					/>
 					{Object.keys(chartConfig).map((key) => {
 						const filtered = filteredKeys.has(key)

internal/site/src/components/charts/hooks.ts

@@ -69,7 +69,7 @@ export function useContainerChartConfigs(containerData: ChartData["containerData
 				const hue = ((i * 360) / count) % 360
 				chartConfig[containerName] = {
 					label: containerName,
-					color: `hsl(${hue}, var(--chart-saturation), var(--chart-lightness))`,
+					color: `hsl(${hue}, 60%, 55%)`,
 				}
 			}
 
@@ -118,6 +118,28 @@ export function useNetworkInterfaces(interfaces: SystemStats["ni"]) {
 				dataKey: ({ stats }: SystemStatsRecord) => stats?.ni?.[key]?.[index],
 				color: `hsl(${220 + (((sortedKeys.indexOf(key) * 360) / sortedKeys.length) % 360)}, 70%, 50%)`,
 
+				opacity: 0.3,
+			}))
+		},
+	}
+}
+
+// Assures consistent colors for CPU cores
+export function useCpuCores(cores: SystemStats["cpuc"]) {
+	const keys = Object.keys(cores ?? {})
+	// Sort cores by name (cpu0, cpu1, cpu2, etc.)
+	const sortedKeys = keys.sort((a, b) => {
+		const numA = Number.parseInt(a.replace("cpu", ""))
+		const numB = Number.parseInt(b.replace("cpu", ""))
+		return numA - numB
+	})
+	return {
+		length: sortedKeys.length,
+		data: (index = 0) => {
+			return sortedKeys.map((key) => ({
+				label: key,
+				dataKey: ({ stats }: SystemStatsRecord) => stats?.cpuc?.[key]?.[index],
+				color: `hsl(${(((sortedKeys.indexOf(key) * 360) / sortedKeys.length) % 360)}, 70%, 50%)`,
 				opacity: 0.3,
 			}))
 		},

internal/site/src/components/charts/mem-chart.tsx

@@ -61,7 +61,6 @@ export default memo(function MemChart({ chartData, showMax }: { chartData: Chart
 									const { value: convertedValue, unit } = formatBytes(value * 1024, false, Unit.Bytes, true)
 									return decimalString(convertedValue, convertedValue >= 100 ? 1 : 2) + " " + unit
 								}}
-								showTotal={true}
 							/>
 						}
 					/>

internal/site/src/components/command-palette.tsx

@@ -8,11 +8,10 @@ import {
 	ContainerIcon,
 	DatabaseBackupIcon,
 	FingerprintIcon,
-	HardDriveIcon,
+	LayoutDashboard,
 	LogsIcon,
 	MailIcon,
 	Server,
-	ServerIcon,
 	SettingsIcon,
 	UsersIcon,
 } from "lucide-react"
@@ -82,15 +81,15 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 					)}
 					<CommandGroup heading={t`Pages / Settings`}>
 						<CommandItem
-							keywords={["home"]}
+							keywords={["home", t`All Systems`]}
 							onSelect={() => {
 								navigate(basePath)
 								setOpen(false)
 							}}
 						>
-							<ServerIcon className="me-2 size-4" />
+							<LayoutDashboard className="me-2 size-4" />
 							<span>
-								<Trans>All Systems</Trans>
+								<Trans>Dashboard</Trans>
 							</span>
 							<CommandShortcut>
 								<Trans>Page</Trans>
@@ -110,18 +109,6 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 								<Trans>Page</Trans>
 							</CommandShortcut>
 						</CommandItem>
-						<CommandItem
-							onSelect={() => {
-								navigate(getPagePath($router, "smart"))
-								setOpen(false)
-							}}
-						>
-							<HardDriveIcon className="me-2 size-4" />
-							<span>S.M.A.R.T.</span>
-							<CommandShortcut>
-								<Trans>Page</Trans>
-							</CommandShortcut>
-						</CommandItem>
 						<CommandItem
 							onSelect={() => {
 								navigate(getPagePath($router, "settings", { name: "general" }))

internal/site/src/components/containers-table/containers-table.tsx

@@ -26,7 +26,7 @@ import { Sheet, SheetTitle, SheetHeader, SheetContent, SheetDescription } from "
 import { Dialog, DialogContent, DialogTitle } from "../ui/dialog"
 import { Button } from "@/components/ui/button"
 import { $allSystemsById } from "@/lib/stores"
-import { LoaderCircleIcon, MaximizeIcon, RefreshCwIcon, XIcon } from "lucide-react"
+import { MaximizeIcon, RefreshCwIcon } from "lucide-react"
 import { Separator } from "../ui/separator"
 import { $router, Link } from "../router"
 import { listenKeys } from "nanostores"
@@ -35,8 +35,7 @@ import { getPagePath } from "@nanostores/router"
 const syntaxTheme = "github-dark-dimmed"
 
 export default function ContainersTable({ systemId }: { systemId?: string }) {
-	const loadTime = Date.now()
-	const [data, setData] = useState<ContainerRecord[] | undefined>(undefined)
+	const [data, setData] = useState<ContainerRecord[]>([])
 	const [sorting, setSorting] = useBrowserStorage<SortingState>(
 		`sort-c-${systemId ? 1 : 0}`,
 		[{ id: systemId ? "name" : "system", desc: false }],
@@ -48,61 +47,56 @@ export default function ContainersTable({ systemId }: { systemId?: string }) {
 	const [globalFilter, setGlobalFilter] = useState("")
 
 	useEffect(() => {
-		function fetchData(systemId?: string) {
+		const pbOptions = {
+			fields: "id,name,image,cpu,memory,net,health,status,system,updated",
+		}
+
+		const fetchData = (lastXMs: number) => {
+			const updated = Date.now() - lastXMs
+			let filter: string
+			if (systemId) {
+				filter = pb.filter("system={:system} && updated > {:updated}", { system: systemId, updated })
+			} else {
+				filter = pb.filter("updated > {:updated}", { updated })
+			}
 			pb.collection<ContainerRecord>("containers")
 				.getList(0, 2000, {
-					fields: "id,name,image,cpu,memory,net,health,status,system,updated",
-					filter: systemId ? pb.filter("system={:system}", { system: systemId }) : undefined,
+					...pbOptions,
+					filter,
 				})
-				.then(
-					({ items }) => {
-						if (items.length === 0) {
-							setData([]);
-							return;
+				.then(({ items }) => setData((curItems) => {
+					const containerIds = new Set(items.map(item => item.id))
+					const now = Date.now()
+					for (const item of curItems) {
+						if (!containerIds.has(item.id) && now - item.updated < 70_000) {
+							items.push(item)
 						}
-						setData((curItems) => {
-							const lastUpdated = Math.max(items[0].updated, items.at(-1)?.updated ?? 0)
-							const containerIds = new Set()
-							const newItems = []
-							for (const item of items) {
-								if (Math.abs(lastUpdated - item.updated) < 70_000) {
-									containerIds.add(item.id)
-									newItems.push(item)
-								}
-							}
-							for (const item of curItems ?? []) {
-								if (!containerIds.has(item.id) && lastUpdated - item.updated < 70_000) {
-									newItems.push(item)
-								}
-							}
-							return newItems
-						})
 					}
-				)
+					return items
+				}))
 		}
 
 		// initial load
-		fetchData(systemId)
+		fetchData(70_000)
 
-		// if no systemId, pull system containers after every system update
+		// if no systemId, poll every 10 seconds
 		if (!systemId) {
-			return $allSystemsById.listen((_value, _oldValue, systemId) => {
-				// exclude initial load of systems
-				if (Date.now() - loadTime > 500) {
-					fetchData(systemId)
-				}
-			})
+			// poll every 10 seconds
+			const intervalId = setInterval(() => fetchData(10_500), 10_000)
+			// clear interval on unmount
+			return () => clearInterval(intervalId)
 		}
 
 		// if systemId, fetch containers after the system is updated
 		return listenKeys($allSystemsById, [systemId], (_newSystems) => {
-			fetchData(systemId)
+			const changeTime = Date.now()
+			setTimeout(() => fetchData(Date.now() - changeTime + 1000), 100)
 		})
 	}, [])
 
 	const table = useReactTable({
-		data: data ?? [],
-		columns: containerChartCols.filter((col) => (systemId ? col.id !== "system" : true)),
+		data,
+		columns: containerChartCols.filter(col => systemId ? col.id !== "system" : true),
 		getCoreRowModel: getCoreRowModel(),
 		getSortedRowModel: getSortedRowModel(),
 		getFilteredRowModel: getFilteredRowModel(),
@@ -155,113 +149,92 @@ export default function ContainersTable({ systemId }: { systemId?: string }) {
 							<Trans>Click on a container to view more information.</Trans>
 						</CardDescription>
 					</div>
-					<div className="relative ms-auto w-full max-w-full md:w-64">
-						<Input
-							placeholder={t`Filter...`}
-							value={globalFilter}
-							onChange={(e) => setGlobalFilter(e.target.value)}
-							className="ps-4 pe-10 w-full"
-						/>
-						{globalFilter && (
-							<Button
-								type="button"
-								variant="ghost"
-								size="icon"
-								aria-label={t`Clear`}
-								className="absolute right-1 top-1/2 -translate-y-1/2 h-7 w-7 text-muted-foreground"
-								onClick={() => setGlobalFilter("")}
-							>
-								<XIcon className="h-4 w-4" />
-							</Button>
-						)}
-					</div>
+					<Input
+						placeholder={t`Filter...`}
+						value={globalFilter}
+						onChange={(e) => setGlobalFilter(e.target.value)}
+						className="ms-auto px-4 w-full max-w-full md:w-64"
+					/>
 				</div>
 			</CardHeader>
 			<div className="rounded-md">
-				<AllContainersTable table={table} rows={rows} colLength={visibleColumns.length} data={data} />
+				<AllContainersTable table={table} rows={rows} colLength={visibleColumns.length} />
 			</div>
 		</Card>
 	)
 }
 
-const AllContainersTable = memo(function AllContainersTable({
-	table,
-	rows,
-	colLength,
-	data,
-}: {
-	table: TableType<ContainerRecord>
-	rows: Row<ContainerRecord>[]
-	colLength: number
-	data: ContainerRecord[] | undefined
-}) {
-	// The virtualizer will need a reference to the scrollable container element
-	const scrollRef = useRef<HTMLDivElement>(null)
-	const activeContainer = useRef<ContainerRecord | null>(null)
-	const [sheetOpen, setSheetOpen] = useState(false)
-	const openSheet = (container: ContainerRecord) => {
-		activeContainer.current = container
-		setSheetOpen(true)
-	}
+const AllContainersTable = memo(
+	function AllContainersTable({ table, rows, colLength }: { table: TableType<ContainerRecord>; rows: Row<ContainerRecord>[]; colLength: number }) {
+		// The virtualizer will need a reference to the scrollable container element
+		const scrollRef = useRef<HTMLDivElement>(null)
+		const activeContainer = useRef<ContainerRecord | null>(null)
+		const [sheetOpen, setSheetOpen] = useState(false)
+		const openSheet = (container: ContainerRecord) => {
+			activeContainer.current = container
+			setSheetOpen(true)
+		}
 
-	const virtualizer = useVirtualizer<HTMLDivElement, HTMLTableRowElement>({
-		count: rows.length,
-		estimateSize: () => 54,
-		getScrollElement: () => scrollRef.current,
-		overscan: 5,
-	})
-	const virtualRows = virtualizer.getVirtualItems()
+		const virtualizer = useVirtualizer<HTMLDivElement, HTMLTableRowElement>({
+			count: rows.length,
+			estimateSize: () => 54,
+			getScrollElement: () => scrollRef.current,
+			overscan: 5,
+		})
+		const virtualRows = virtualizer.getVirtualItems()
 
-	const paddingTop = Math.max(0, virtualRows[0]?.start ?? 0 - virtualizer.options.scrollMargin)
-	const paddingBottom = Math.max(0, virtualizer.getTotalSize() - (virtualRows[virtualRows.length - 1]?.end ?? 0))
+		const paddingTop = Math.max(0, virtualRows[0]?.start ?? 0 - virtualizer.options.scrollMargin)
+		const paddingBottom = Math.max(0, virtualizer.getTotalSize() - (virtualRows[virtualRows.length - 1]?.end ?? 0))
 
-	return (
-		<div
-			className={cn(
-				"h-min max-h-[calc(100dvh-17rem)] max-w-full relative overflow-auto border rounded-md",
-				// don't set min height if there are less than 2 rows, do set if we need to display the empty state
-				(!rows.length || rows.length > 2) && "min-h-50"
-			)}
-			ref={scrollRef}
-		>
-			{/* add header height to table size */}
-			<div style={{ height: `${virtualizer.getTotalSize() + 48}px`, paddingTop, paddingBottom }}>
-				<table className="text-sm w-full h-full text-nowrap">
-					<ContainersTableHead table={table} />
-					<TableBody>
-						{rows.length ? (
-							virtualRows.map((virtualRow) => {
-								const row = rows[virtualRow.index]
-								return <ContainerTableRow key={row.id} row={row} virtualRow={virtualRow} openSheet={openSheet} />
-							})
-						) : (
-							<TableRow>
-								<TableCell colSpan={colLength} className="h-37 text-center pointer-events-none">
-									{data ? (
+		return (
+			<div
+				className={cn(
+					"h-min max-h-[calc(100dvh-17rem)] max-w-full relative overflow-auto border rounded-md",
+					// don't set min height if there are less than 2 rows, do set if we need to display the empty state
+					(!rows.length || rows.length > 2) && "min-h-50"
+				)}
+				ref={scrollRef}
+			>
+				{/* add header height to table size */}
+				<div style={{ height: `${virtualizer.getTotalSize() + 48}px`, paddingTop, paddingBottom }}>
+					<table className="text-sm w-full h-full text-nowrap">
+						<ContainersTableHead table={table} />
+						<TableBody>
+							{rows.length ? (
+								virtualRows.map((virtualRow) => {
+									const row = rows[virtualRow.index]
+									return (
+										<ContainerTableRow
+											key={row.id}
+											row={row}
+											virtualRow={virtualRow}
+											openSheet={openSheet}
+										/>
+									)
+								})
+							) : (
+								<TableRow>
+									<TableCell colSpan={colLength} className="h-37 text-center pointer-events-none">
 										<Trans>No results.</Trans>
-									) : (
-										<LoaderCircleIcon className="animate-spin size-10 opacity-60 mx-auto" />
-									)}
-								</TableCell>
-							</TableRow>
-						)}
-					</TableBody>
-				</table>
+									</TableCell>
+								</TableRow>
+							)}
+						</TableBody>
+					</table>
+				</div>
+				<ContainerSheet sheetOpen={sheetOpen} setSheetOpen={setSheetOpen} activeContainer={activeContainer} />
 			</div>
-			<ContainerSheet sheetOpen={sheetOpen} setSheetOpen={setSheetOpen} activeContainer={activeContainer} />
-		</div>
-	)
-})
+		)
+	}
+)
+
 
 async function getLogsHtml(container: ContainerRecord): Promise<string> {
 	try {
-		const [{ highlighter }, logsHtml] = await Promise.all([
-			import("@/lib/shiki"),
-			pb.send<{ logs: string }>("/api/beszel/containers/logs", {
-				system: container.system,
-				container: container.id,
-			}),
-		])
+		const [{ highlighter }, logsHtml] = await Promise.all([import('@/lib/shiki'), pb.send<{ logs: string }>("/api/beszel/containers/logs", {
+			system: container.system,
+			container: container.id,
+		})])
 		return logsHtml.logs ? highlighter.codeToHtml(logsHtml.logs, { lang: "log", theme: syntaxTheme }) : t`No results.`
 	} catch (error) {
 		console.error(error)
@@ -271,16 +244,13 @@ async function getLogsHtml(container: ContainerRecord): Promise<string> {
 
 async function getInfoHtml(container: ContainerRecord): Promise<string> {
 	try {
-		let [{ highlighter }, { info }] = await Promise.all([
-			import("@/lib/shiki"),
-			pb.send<{ info: string }>("/api/beszel/containers/info", {
-				system: container.system,
-				container: container.id,
-			}),
-		])
+		let [{ highlighter }, { info }] = await Promise.all([import('@/lib/shiki'), pb.send<{ info: string }>("/api/beszel/containers/info", {
+			system: container.system,
+			container: container.id,
+		})])
 		try {
 			info = JSON.stringify(JSON.parse(info), null, 2)
-		} catch (_) {}
+		} catch (_) { }
 		return info ? highlighter.codeToHtml(info, { lang: "json", theme: syntaxTheme }) : t`No results.`
 	} catch (error) {
 		console.error(error)
@@ -288,15 +258,7 @@ async function getInfoHtml(container: ContainerRecord): Promise<string> {
 	}
 }
 
-function ContainerSheet({
-	sheetOpen,
-	setSheetOpen,
-	activeContainer,
-}: {
-	sheetOpen: boolean
-	setSheetOpen: (open: boolean) => void
-	activeContainer: RefObject<ContainerRecord | null>
-}) {
+function ContainerSheet({ sheetOpen, setSheetOpen, activeContainer }: { sheetOpen: boolean, setSheetOpen: (open: boolean) => void, activeContainer: RefObject<ContainerRecord | null> }) {
 	const container = activeContainer.current
 	if (!container) return null
 
@@ -335,14 +297,14 @@ function ContainerSheet({
 
 	useEffect(() => {
 		setLogsDisplay("")
-		setInfoDisplay("")
+		setInfoDisplay("");
 		if (!container) return
-			;(async () => {
-				const [logsHtml, infoHtml] = await Promise.all([getLogsHtml(container), getInfoHtml(container)])
-				setLogsDisplay(logsHtml)
-				setInfoDisplay(infoHtml)
-				setTimeout(scrollLogsToBottom, 20)
-			})()
+		(async () => {
+			const [logsHtml, infoHtml] = await Promise.all([getLogsHtml(container), getInfoHtml(container)])
+			setLogsDisplay(logsHtml)
+			setInfoDisplay(infoHtml)
+			setTimeout(scrollLogsToBottom, 20)
+		})()
 	}, [container])
 
 	return (
@@ -366,9 +328,7 @@ function ContainerSheet({
 					<SheetHeader>
 						<SheetTitle>{container.name}</SheetTitle>
 						<SheetDescription className="flex flex-wrap items-center gap-x-2 gap-y-1">
-							<Link className="hover:underline" href={getPagePath($router, "system", { id: container.system })}>
-								{$allSystemsById.get()[container.system]?.name ?? ""}
-							</Link>
+							<Link className="hover:underline" href={getPagePath($router, "system", { id: container.system })}>{$allSystemsById.get()[container.system]?.name ?? ""}</Link>
 							<Separator orientation="vertical" className="h-2.5 bg-muted-foreground opacity-70" />
 							{container.status}
 							<Separator orientation="vertical" className="h-2.5 bg-muted-foreground opacity-70" />
@@ -390,20 +350,19 @@ function ContainerSheet({
 								disabled={isRefreshingLogs}
 							>
 								<RefreshCwIcon
-									className={`size-4 transition-transform duration-300 ${isRefreshingLogs ? "animate-spin" : ""}`}
+									className={`size-4 transition-transform duration-300 ${isRefreshingLogs ? 'animate-spin' : ''}`}
 								/>
 							</Button>
-							<Button variant="ghost" size="sm" onClick={() => setLogsFullscreenOpen(true)} className="h-8 w-8 p-0">
+							<Button
+								variant="ghost"
+								size="sm"
+								onClick={() => setLogsFullscreenOpen(true)}
+								className="h-8 w-8 p-0"
+							>
 								<MaximizeIcon className="size-4" />
 							</Button>
 						</div>
-						<div
-							ref={logsContainerRef}
-							className={cn(
-								"max-h-[calc(50dvh-10rem)] w-full overflow-auto p-3 rounded-md bg-gh-dark text-white text-sm",
-								!logsDisplay && ["animate-pulse", "h-full"]
-							)}
-						>
+						<div ref={logsContainerRef} className={cn("max-h-[calc(50dvh-10rem)] w-full overflow-auto p-3 rounded-md bg-gh-dark text-white text-sm", !logsDisplay && ["animate-pulse", "h-full"])}>
 							<div dangerouslySetInnerHTML={{ __html: logsDisplay }} />
 						</div>
 						<div className="flex items-center w-full">
@@ -417,18 +376,15 @@ function ContainerSheet({
 								<MaximizeIcon className="size-4" />
 							</Button>
 						</div>
-						<div
-							className={cn(
-								"grow h-[calc(50dvh-4rem)] w-full overflow-auto p-3 rounded-md bg-gh-dark text-white text-sm",
-								!infoDisplay && "animate-pulse"
-							)}
-						>
+						<div className={cn("grow h-[calc(50dvh-4rem)] w-full overflow-auto p-3 rounded-md bg-gh-dark text-white text-sm", !infoDisplay && "animate-pulse")}>
 							<div dangerouslySetInnerHTML={{ __html: infoDisplay }} />
 						</div>
+
 					</div>
 				</SheetContent>
 			</Sheet>
 		</>
+
 	)
 }
 
@@ -450,51 +406,39 @@ function ContainersTableHead({ table }: { table: TableType<ContainerRecord> }) {
 	)
 }
 
-const ContainerTableRow = memo(function ContainerTableRow({
-	row,
-	virtualRow,
-	openSheet,
-}: {
-	row: Row<ContainerRecord>
-	virtualRow: VirtualItem
-	openSheet: (container: ContainerRecord) => void
-}) {
-	return (
-		<TableRow
-			data-state={row.getIsSelected() && "selected"}
-			className="cursor-pointer transition-opacity"
-			onClick={() => openSheet(row.original)}
-		>
-			{row.getVisibleCells().map((cell) => (
-				<TableCell
-					key={cell.id}
-					className="py-0"
-					style={{
-						height: virtualRow.size,
-					}}
-				>
-					{flexRender(cell.column.columnDef.cell, cell.getContext())}
-				</TableCell>
-			))}
-		</TableRow>
-	)
-})
+const ContainerTableRow = memo(
+	function ContainerTableRow({
+		row,
+		virtualRow,
+		openSheet,
+	}: {
+		row: Row<ContainerRecord>
+		virtualRow: VirtualItem
+		openSheet: (container: ContainerRecord) => void
+	}) {
+		return (
+			<TableRow
+				data-state={row.getIsSelected() && "selected"}
+				className="cursor-pointer transition-opacity"
+				onClick={() => openSheet(row.original)}
+			>
+				{row.getVisibleCells().map((cell) => (
+					<TableCell
+						key={cell.id}
+						className="py-0"
+						style={{
+							height: virtualRow.size,
+						}}
+					>
+						{flexRender(cell.column.columnDef.cell, cell.getContext())}
+					</TableCell>
+				))}
+			</TableRow>
+		)
+	}
+)
 
-function LogsFullscreenDialog({
-	open,
-	onOpenChange,
-	logsDisplay,
-	containerName,
-	onRefresh,
-	isRefreshing,
-}: {
-	open: boolean
-	onOpenChange: (open: boolean) => void
-	logsDisplay: string
-	containerName: string
-	onRefresh: () => void | Promise<void>
-	isRefreshing: boolean
-}) {
+function LogsFullscreenDialog({ open, onOpenChange, logsDisplay, containerName, onRefresh, isRefreshing }: { open: boolean, onOpenChange: (open: boolean) => void, logsDisplay: string, containerName: string, onRefresh: () => void | Promise<void>, isRefreshing: boolean }) {
 	const outerContainerRef = useRef<HTMLDivElement>(null)
 
 	useEffect(() => {
@@ -519,30 +463,24 @@ function LogsFullscreenDialog({
 					</div>
 				</div>
 				<button
-					onClick={onRefresh}
+					onClick={() => {
+						void onRefresh()
+					}}
 					className="absolute top-3 right-11 opacity-60 hover:opacity-100 p-1"
 					disabled={isRefreshing}
 					title={t`Refresh`}
 					aria-label={t`Refresh`}
 				>
-					<RefreshCwIcon className={`size-4 transition-transform duration-300 ${isRefreshing ? "animate-spin" : ""}`} />
+					<RefreshCwIcon
+						className={`size-4 transition-transform duration-300 ${isRefreshing ? 'animate-spin' : ''}`}
+					/>
 				</button>
 			</DialogContent>
 		</Dialog>
 	)
 }
 
-function InfoFullscreenDialog({
-	open,
-	onOpenChange,
-	infoDisplay,
-	containerName,
-}: {
-	open: boolean
-	onOpenChange: (open: boolean) => void
-	infoDisplay: string
-	containerName: string
-}) {
+function InfoFullscreenDialog({ open, onOpenChange, infoDisplay, containerName }: { open: boolean, onOpenChange: (open: boolean) => void, infoDisplay: string, containerName: string }) {
 	return (
 		<Dialog open={open} onOpenChange={onOpenChange}>
 			<DialogContent className="w-[calc(100vw-20px)] h-[calc(100dvh-20px)] max-w-none p-0 bg-gh-dark border-0 text-white">

internal/site/src/components/navbar.tsx

@@ -3,7 +3,6 @@ import { getPagePath } from "@nanostores/router"
 import {
 	ContainerIcon,
 	DatabaseBackupIcon,
-	HardDriveIcon,
 	LogOutIcon,
 	LogsIcon,
 	SearchIcon,
@@ -30,7 +29,6 @@ import { LangToggle } from "./lang-toggle"
 import { Logo } from "./logo"
 import { ModeToggle } from "./mode-toggle"
 import { $router, basePath, Link, prependBasePath } from "./router"
-import { t } from "@lingui/core/macro"
 
 const CommandPalette = lazy(() => import("./command-palette"))
 
@@ -57,13 +55,6 @@ export default function Navbar() {
 				>
 					<ContainerIcon className="h-[1.2rem] w-[1.2rem]" strokeWidth={1.5} />
 				</Link>
-				<Link
-					href={getPagePath($router, "smart")}
-					className={cn("hidden md:grid", buttonVariants({ variant: "ghost", size: "icon" }))}
-					aria-label="S.M.A.R.T."
-				>
-					<HardDriveIcon className="h-[1.2rem] w-[1.2rem]" strokeWidth={1.5} />
-				</Link>
 				<LangToggle />
 				<ModeToggle />
 				<Link

internal/site/src/components/router.tsx

@@ -3,7 +3,6 @@ import { createRouter } from "@nanostores/router"
 const routes = {
 	home: "/",
 	containers: "/containers",
-	smart: "/smart",
 	system: `/system/:id`,
 	settings: `/settings/:name?`,
 	forgot_password: `/forgot-password`,

internal/site/src/components/routes/settings/alerts-history-data-table.tsx

@@ -7,7 +7,6 @@ import {
 	getFilteredRowModel,
 	getPaginationRowModel,
 	getSortedRowModel,
-	type PaginationState,
 	type SortingState,
 	useReactTable,
 	type VisibilityState,
@@ -41,7 +40,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
 import { useToast } from "@/components/ui/use-toast"
 import { alertInfo } from "@/lib/alerts"
 import { pb } from "@/lib/api"
-import { cn, formatDuration, formatShortDate, useBrowserStorage } from "@/lib/utils"
+import { cn, formatDuration, formatShortDate } from "@/lib/utils"
 import type { AlertsHistoryRecord } from "@/types"
 import { alertsHistoryColumns } from "../../alerts-history-columns"
 
@@ -67,12 +66,6 @@ export default function AlertsHistoryDataTable() {
 	const [globalFilter, setGlobalFilter] = useState("")
 	const { toast } = useToast()
 	const [deleteOpen, setDeleteDialogOpen] = useState(false)
-	
-	// Store pagination preference in local storage
-	const [pagination, setPagination] = useBrowserStorage<PaginationState>("ah-pagination", {
-		pageIndex: 0,
-		pageSize: 10,
-	})
 
 	useEffect(() => {
 		let unsubscribe: (() => void) | undefined
@@ -143,14 +136,12 @@ export default function AlertsHistoryDataTable() {
 		onColumnFiltersChange: setColumnFilters,
 		onColumnVisibilityChange: setColumnVisibility,
 		onRowSelectionChange: setRowSelection,
-		onPaginationChange: setPagination,
 		state: {
 			sorting,
 			columnFilters,
 			columnVisibility,
 			rowSelection,
 			globalFilter,
-			pagination,
 		},
 		onGlobalFilterChange: setGlobalFilter,
 		globalFilterFn: (row, _columnId, filterValue) => {
@@ -327,10 +318,10 @@ export default function AlertsHistoryDataTable() {
 						<Select
 							value={`${table.getState().pagination.pageSize}`}
 							onValueChange={(value) => {
-								table.setPageSize(Number(value));
+								table.setPageSize(Number(value))
 							}}
 						>
-							<SelectTrigger className="w-18" id="rows-per-page">
+							<SelectTrigger className="w-[4.8em]" id="rows-per-page">
 								<SelectValue placeholder={table.getState().pagination.pageSize} />
 							</SelectTrigger>
 							<SelectContent side="top">

internal/site/src/components/routes/settings/general.tsx

@@ -2,17 +2,14 @@
 import { Trans, useLingui } from "@lingui/react/macro"
 import { LanguagesIcon, LoaderCircleIcon, SaveIcon } from "lucide-react"
 import { useState } from "react"
-import { useStore } from "@nanostores/react"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { Separator } from "@/components/ui/separator"
-import Slider from "@/components/ui/slider"
 import { HourFormat, Unit } from "@/lib/enums"
 import { dynamicActivate } from "@/lib/i18n"
 import languages from "@/lib/languages"
-import { $userSettings } from "@/lib/stores"
 import { chartTimeData, currentHour12 } from "@/lib/utils"
 import type { UserSettings } from "@/types"
 import { saveSettings } from "./layout"
@@ -20,8 +17,6 @@ import { saveSettings } from "./layout"
 export default function SettingsProfilePage({ userSettings }: { userSettings: UserSettings }) {
 	const [isLoading, setIsLoading] = useState(false)
 	const { i18n } = useLingui()
-	const currentUserSettings = useStore($userSettings)
-	const layoutWidth = currentUserSettings.layoutWidth ?? 1500
 
 	async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
 		e.preventDefault()
@@ -78,27 +73,6 @@ export default function SettingsProfilePage({ userSettings }: { userSettings: Us
 					</Select>
 				</div>
 				<Separator />
-				<div className="grid gap-2">
-					<div className="mb-2">
-						<h3 className="mb-1 text-lg font-medium">
-							<Trans>Layout width</Trans>
-						</h3>
-						<Label htmlFor="layoutWidth" className="text-sm text-muted-foreground leading-relaxed">
-							<Trans>Adjust the width of the main layout</Trans> ({layoutWidth}px)
-						</Label>
-					</div>
-					<Slider
-						id="layoutWidth"
-						name="layoutWidth"
-						value={[layoutWidth]}
-						onValueChange={(val) => $userSettings.setKey("layoutWidth", val[0])}
-						min={1000}
-						max={2000}
-						step={10}
-						className="w-full mb-1"
-					/>
-				</div>
-				<Separator />
 				<div className="grid gap-2">
 					<div className="mb-2">
 						<h3 className="mb-1 text-lg font-medium">

internal/site/src/components/routes/settings/notifications.tsx

@@ -14,7 +14,6 @@ import { toast } from "@/components/ui/use-toast"
 import { isAdmin, pb } from "@/lib/api"
 import type { UserSettings } from "@/types"
 import { saveSettings } from "./layout"
-import { QuietHours } from "./quiet-hours"
 
 interface ShoutrrrUrlCardProps {
 	url: string
@@ -121,32 +120,19 @@ const SettingsNotificationsPage = ({ userSettings }: { userSettings: UserSetting
 				</div>
 				<Separator />
 				<div className="space-y-3">
-					<div className="grid grid-cols-1 sm:flex items-center justify-between gap-4">
-						<div>
-							<h3 className="mb-1 text-lg font-medium">
-								<Trans>Webhook / Push notifications</Trans>
-							</h3>
-							<p className="text-sm text-muted-foreground leading-relaxed">
-								<Trans>
-									Beszel uses{" "}
-									<a href="https://beszel.dev/guide/notifications" target="_blank" className="link" rel="noopener">
-										Shoutrrr
-									</a>{" "}
-									to integrate with popular notification services.
-								</Trans>
-							</p>
-						</div>
-						<Button
-							type="button"
-							variant="outline"
-							className="h-10 shrink-0"
-							onClick={addWebhook}
-						>
-							<PlusIcon className="size-4" />
-							<span className="ms-1">
-								<Trans>Add URL</Trans>
-							</span>
-						</Button>
+					<div>
+						<h3 className="mb-1 text-lg font-medium">
+							<Trans>Webhook / Push notifications</Trans>
+						</h3>
+						<p className="text-sm text-muted-foreground leading-relaxed">
+							<Trans>
+								Beszel uses{" "}
+								<a href="https://beszel.dev/guide/notifications" target="_blank" className="link" rel="noopener">
+									Shoutrrr
+								</a>{" "}
+								to integrate with popular notification services.
+							</Trans>
+						</p>
 					</div>
 					{webhooks.length > 0 && (
 						<div className="grid gap-2.5" id="webhooks">
@@ -160,10 +146,16 @@ const SettingsNotificationsPage = ({ userSettings }: { userSettings: UserSetting
 							))}
 						</div>
 					)}
-				</div>
-				<Separator />
-				<div className="space-y-3">
-					<QuietHours />
+					<Button
+						type="button"
+						variant="outline"
+						size="sm"
+						className="mt-2 flex items-center gap-1"
+						onClick={addWebhook}
+					>
+						<PlusIcon className="h-4 w-4 -ms-0.5" />
+						<Trans>Add URL</Trans>
+					</Button>
 				</div>
 				<Separator />
 				<Button
@@ -202,7 +194,7 @@ const ShoutrrrUrlCard = ({ url, onUrlChange, onRemove }: ShoutrrrUrlCardProps) =
 	}
 
 	return (
-		<Card className="bg-table-header p-2 md:p-3">
+		<Card className="bg-muted/40 p-2 md:p-3">
 			<div className="flex items-center gap-1">
 				<Input
 					type="url"

internal/site/src/components/routes/settings/quiet-hours.tsx

@@ -1,534 +0,0 @@
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
-import { useStore } from "@nanostores/react"
-import {
-	MoreHorizontalIcon,
-	PlusIcon,
-	Trash2Icon,
-	ServerIcon,
-	ClockIcon,
-	CalendarIcon,
-	ActivityIcon,
-	PenSquareIcon,
-} from "lucide-react"
-import { useEffect, useState } from "react"
-
-import { Badge } from "@/components/ui/badge"
-import { Button } from "@/components/ui/button"
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogFooter,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "@/components/ui/dialog"
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
-import { useToast } from "@/components/ui/use-toast"
-import { pb } from "@/lib/api"
-import { $systems } from "@/lib/stores"
-import { formatShortDate } from "@/lib/utils"
-import type { QuietHoursRecord, SystemRecord } from "@/types"
-
-const quietHoursTranslation = t`Quiet Hours`
-
-export function QuietHours() {
-	const [data, setData] = useState<QuietHoursRecord[]>([])
-	const [dialogOpen, setDialogOpen] = useState(false)
-	const [editingRecord, setEditingRecord] = useState<QuietHoursRecord | null>(null)
-	const { toast } = useToast()
-	const systems = useStore($systems)
-	useEffect(() => {
-		let unsubscribe: (() => void) | undefined
-		const pbOptions = {
-			expand: "system",
-			fields: "id,user,system,type,start,end,expand.system.name",
-		}
-		// Initial load
-		pb.collection<QuietHoursRecord>("quiet_hours")
-			.getList(0, 200, {
-				...pbOptions,
-				sort: "system",
-			})
-			.then(({ items }) => setData(items))
-
-		// Subscribe to changes
-		;(async () => {
-			unsubscribe = await pb.collection("quiet_hours").subscribe(
-				"*",
-				(e) => {
-					if (e.action === "create") {
-						setData((current) => [e.record as QuietHoursRecord, ...current])
-					}
-					if (e.action === "update") {
-						setData((current) => current.map((r) => (r.id === e.record.id ? (e.record as QuietHoursRecord) : r)))
-					}
-					if (e.action === "delete") {
-						setData((current) => current.filter((r) => r.id !== e.record.id))
-					}
-				},
-				pbOptions
-			)
-		})()
-		// Unsubscribe on unmount
-		return () => unsubscribe?.()
-	}, [])
-
-	const handleDelete = async (id: string) => {
-		try {
-			await pb.collection("quiet_hours").delete(id)
-		} catch (e: unknown) {
-			toast({
-				variant: "destructive",
-				title: t`Error`,
-				description: (e as Error).message || "Failed to delete quiet hours.",
-			})
-		}
-	}
-
-	const openEditDialog = (record: QuietHoursRecord) => {
-		setEditingRecord(record)
-		setDialogOpen(true)
-	}
-
-	const closeDialog = () => {
-		setDialogOpen(false)
-		setEditingRecord(null)
-	}
-
-	const formatDateTime = (record: QuietHoursRecord) => {
-		if (record.type === "daily") {
-			// For daily windows, show only time
-			const startTime = new Date(record.start).toLocaleTimeString([], { hour: "numeric", minute: "2-digit" })
-			const endTime = new Date(record.end).toLocaleTimeString([], { hour: "numeric", minute: "2-digit" })
-			return `${startTime} - ${endTime}`
-		}
-		// For one-time windows, show full date and time
-		const start = formatShortDate(record.start)
-		const end = formatShortDate(record.end)
-		return `${start} - ${end}`
-	}
-
-	const getWindowState = (record: QuietHoursRecord): "active" | "past" | "inactive" => {
-		const now = new Date()
-
-		if (record.type === "daily") {
-			// For daily windows, check if current time is within the window
-			const startDate = new Date(record.start)
-			const endDate = new Date(record.end)
-
-			// Get current time in local timezone
-			const currentMinutes = now.getHours() * 60 + now.getMinutes()
-			const startMinutes = startDate.getUTCHours() * 60 + startDate.getUTCMinutes()
-			const endMinutes = endDate.getUTCHours() * 60 + endDate.getUTCMinutes()
-
-			// Convert UTC to local time offset
-			const offset = now.getTimezoneOffset()
-			const localStartMinutes = (startMinutes - offset + 1440) % 1440
-			const localEndMinutes = (endMinutes - offset + 1440) % 1440
-
-			// Handle cases where window spans midnight
-			if (localStartMinutes <= localEndMinutes) {
-				return currentMinutes >= localStartMinutes && currentMinutes < localEndMinutes ? "active" : "inactive"
-			} else {
-				return currentMinutes >= localStartMinutes || currentMinutes < localEndMinutes ? "active" : "inactive"
-			}
-		} else {
-			// For one-time windows
-			const startDate = new Date(record.start)
-			const endDate = new Date(record.end)
-
-			if (now >= startDate && now < endDate) {
-				return "active"
-			} else if (now >= endDate) {
-				return "past"
-			} else {
-				return "inactive"
-			}
-		}
-	}
-
-	return (
-		<>
-			<div className="grid grid-cols-1 sm:flex items-center justify-between gap-4 mb-3">
-				<div>
-					<h3 className="mb-1 text-lg font-medium">{quietHoursTranslation}</h3>
-					<p className="text-sm text-muted-foreground leading-relaxed">
-						<Trans>
-							Schedule quiet hours where notifications will not be sent, such as during maintenance periods.
-						</Trans>
-					</p>
-				</div>
-				<Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-					<DialogTrigger asChild>
-						<Button variant="outline" className="h-10 shrink-0" onClick={() => setEditingRecord(null)}>
-							<PlusIcon className="size-4" />
-							<span className="ms-1">
-								<Trans>Add {{ foo: quietHoursTranslation }}</Trans>
-							</span>
-						</Button>
-					</DialogTrigger>
-					<QuietHoursDialog editingRecord={editingRecord} systems={systems} onClose={closeDialog} toast={toast} />
-				</Dialog>
-			</div>
-			{data.length > 0 && (
-				<div className="rounded-md border overflow-x-auto whitespace-nowrap">
-					<Table>
-						<TableHeader>
-							<TableRow className="border-border/50">
-								<TableHead className="px-4">
-									<span className="flex items-center gap-2">
-										<ServerIcon className="size-4" />
-										<Trans>System</Trans>
-									</span>
-								</TableHead>
-								<TableHead className="px-4">
-									<span className="flex items-center gap-2">
-										<ClockIcon className="size-4" />
-										<Trans>Type</Trans>
-									</span>
-								</TableHead>
-								<TableHead className="px-4">
-									<span className="flex items-center gap-2">
-										<CalendarIcon className="size-4" />
-										<Trans>Schedule</Trans>
-									</span>
-								</TableHead>
-								<TableHead className="px-4">
-									<span className="flex items-center gap-2">
-										<ActivityIcon className="size-4" />
-										<Trans>State</Trans>
-									</span>
-								</TableHead>
-								<TableHead className="px-4 text-right sr-only">
-									<Trans>Actions</Trans>
-								</TableHead>
-							</TableRow>
-						</TableHeader>
-						<TableBody>
-							{data.map((record) => (
-								<TableRow key={record.id}>
-									<TableCell className="px-4 py-3">
-										{record.system ? record.expand?.system?.name || record.system : <Trans>All Systems</Trans>}
-									</TableCell>
-									<TableCell className="px-4 py-3">
-										{record.type === "daily" ? <Trans>Daily</Trans> : <Trans>One-time</Trans>}
-									</TableCell>
-									<TableCell className="px-4 py-3">{formatDateTime(record)}</TableCell>
-									<TableCell className="px-4 py-3">
-										{(() => {
-											const state = getWindowState(record)
-											const stateConfig = {
-												active: { label: <Trans>Active</Trans>, variant: "success" as const },
-												past: { label: <Trans>Past</Trans>, variant: "danger" as const },
-												inactive: { label: <Trans>Inactive</Trans>, variant: "default" as const },
-											}
-											const config = stateConfig[state]
-											return <Badge variant={config.variant}>{config.label}</Badge>
-										})()}
-									</TableCell>
-									<TableCell className="px-4 py-3 text-right">
-										<DropdownMenu>
-											<DropdownMenuTrigger asChild>
-												<Button variant="ghost" size="icon" className="size-8">
-													<span className="sr-only">
-														<Trans>Open menu</Trans>
-													</span>
-													<MoreHorizontalIcon className="size-4" />
-												</Button>
-											</DropdownMenuTrigger>
-											<DropdownMenuContent align="end">
-												<DropdownMenuItem onClick={() => openEditDialog(record)}>
-													<PenSquareIcon className="me-2.5 size-4" />
-													<Trans>Edit</Trans>
-												</DropdownMenuItem>
-												<DropdownMenuSeparator />
-												<DropdownMenuItem onClick={() => handleDelete(record.id)}>
-													<Trash2Icon className="me-2.5 size-4" />
-													<Trans>Delete</Trans>
-												</DropdownMenuItem>
-											</DropdownMenuContent>
-										</DropdownMenu>
-									</TableCell>
-								</TableRow>
-							))}
-						</TableBody>
-					</Table>
-				</div>
-			)}
-		</>
-	)
-}
-
-// Helper function to format Date as datetime-local string (YYYY-MM-DDTHH:mm) in local time
-function formatDateTimeLocal(date: Date): string {
-	const year = date.getFullYear()
-	const month = String(date.getMonth() + 1).padStart(2, "0")
-	const day = String(date.getDate()).padStart(2, "0")
-	const hours = String(date.getHours()).padStart(2, "0")
-	const minutes = String(date.getMinutes()).padStart(2, "0")
-	return `${year}-${month}-${day}T${hours}:${minutes}`
-}
-
-function QuietHoursDialog({
-	editingRecord,
-	systems,
-	onClose,
-	toast,
-}: {
-	editingRecord: QuietHoursRecord | null
-	systems: SystemRecord[]
-	onClose: () => void
-	toast: ReturnType<typeof useToast>["toast"]
-}) {
-	const [selectedSystem, setSelectedSystem] = useState(editingRecord?.system || "")
-	const [isGlobal, setIsGlobal] = useState(!editingRecord?.system)
-	const [windowType, setWindowType] = useState<"one-time" | "daily">(editingRecord?.type || "one-time")
-	const [startDateTime, setStartDateTime] = useState("")
-	const [endDateTime, setEndDateTime] = useState("")
-	const [startTime, setStartTime] = useState("")
-	const [endTime, setEndTime] = useState("")
-
-	useEffect(() => {
-		if (editingRecord) {
-			setSelectedSystem(editingRecord.system || "")
-			setIsGlobal(!editingRecord.system)
-			setWindowType(editingRecord.type)
-			if (editingRecord.type === "daily") {
-				// Extract time from datetime
-				const start = new Date(editingRecord.start)
-				const end = editingRecord.end ? new Date(editingRecord.end) : null
-				setStartTime(start.toTimeString().slice(0, 5))
-				setEndTime(end ? end.toTimeString().slice(0, 5) : "")
-			} else {
-				// For one-time, format as datetime-local (local time, not UTC)
-				const startDate = new Date(editingRecord.start)
-				const endDate = editingRecord.end ? new Date(editingRecord.end) : null
-
-				setStartDateTime(formatDateTimeLocal(startDate))
-				setEndDateTime(endDate ? formatDateTimeLocal(endDate) : "")
-			}
-		} else {
-			// Reset form with default dates: today at 12pm and 1pm
-			const today = new Date()
-			const noon = new Date(today)
-			noon.setHours(12, 0, 0, 0)
-			const onePm = new Date(today)
-			onePm.setHours(13, 0, 0, 0)
-
-			setSelectedSystem("")
-			setIsGlobal(true)
-			setWindowType("one-time")
-			setStartDateTime(formatDateTimeLocal(noon))
-			setEndDateTime(formatDateTimeLocal(onePm))
-			setStartTime("12:00")
-			setEndTime("13:00")
-		}
-	}, [editingRecord])
-
-	const handleSubmit = async (e: React.FormEvent) => {
-		e.preventDefault()
-
-		try {
-			let startValue: string
-			let endValue: string | undefined
-
-			if (windowType === "daily") {
-				// For daily windows, convert local time to UTC
-				// Create a date with the time in local timezone, then convert to UTC
-				const startDate = new Date(`2000-01-01T${startTime}:00`)
-				startValue = startDate.toISOString()
-
-				if (endTime) {
-					const endDate = new Date(`2000-01-01T${endTime}:00`)
-					endValue = endDate.toISOString()
-				}
-			} else {
-				// For one-time windows, use the datetime values
-				startValue = new Date(startDateTime).toISOString()
-				endValue = endDateTime ? new Date(endDateTime).toISOString() : undefined
-			}
-
-			const data = {
-				user: pb.authStore.record?.id,
-				system: isGlobal ? undefined : selectedSystem,
-				type: windowType,
-				start: startValue,
-				end: endValue,
-			}
-
-			if (editingRecord) {
-				await pb.collection("quiet_hours").update(editingRecord.id, data)
-			} else {
-				await pb.collection("quiet_hours").create(data)
-			}
-
-			onClose()
-		} catch (e) {
-			toast({
-				variant: "destructive",
-				title: t`Error`,
-				description: t`Failed to save settings`,
-			})
-		}
-	}
-
-	return (
-		<DialogContent>
-			<DialogHeader>
-				<DialogTitle>
-					{editingRecord ? (
-						<Trans>Edit {{ foo: quietHoursTranslation }}</Trans>
-					) : (
-						<Trans>Add {{ foo: quietHoursTranslation }}</Trans>
-					)}
-				</DialogTitle>
-				<DialogDescription>
-					<Trans>Schedule quiet hours where notifications will not be sent.</Trans>
-				</DialogDescription>
-			</DialogHeader>
-			<form onSubmit={handleSubmit} className="space-y-4">
-				<Tabs value={isGlobal ? "global" : "system"} onValueChange={(value) => setIsGlobal(value === "global")}>
-					<TabsList className="grid w-full grid-cols-2">
-						<TabsTrigger value="global">
-							<Trans>Global</Trans>
-						</TabsTrigger>
-						<TabsTrigger value="system">
-							<Trans>System</Trans>
-						</TabsTrigger>
-					</TabsList>
-
-					<TabsContent value="system" className="mt-4 space-y-4">
-						<div className="grid gap-2">
-							<Label htmlFor="system">
-								<Trans>System</Trans>
-							</Label>
-							<Select value={selectedSystem} onValueChange={setSelectedSystem}>
-								<SelectTrigger id="system">
-									<SelectValue placeholder={t`Select ${{ foo: t`System`.toLocaleLowerCase() }}`} />
-								</SelectTrigger>
-								<SelectContent>
-									{systems.map((system) => (
-										<SelectItem key={system.id} value={system.id}>
-											{system.name}
-										</SelectItem>
-									))}
-								</SelectContent>
-							</Select>
-							{/* Hidden input for native form validation */}
-							<input
-								className="sr-only"
-								type="text"
-								tabIndex={-1}
-								autoComplete="off"
-								value={selectedSystem}
-								onChange={() => {}}
-								required={!isGlobal}
-							/>
-						</div>
-					</TabsContent>
-				</Tabs>
-
-				<div className="grid gap-2">
-					<Label htmlFor="type">
-						<Trans>Type</Trans>
-					</Label>
-					<Select value={windowType} onValueChange={(value: "one-time" | "daily") => setWindowType(value)}>
-						<SelectTrigger id="type">
-							<SelectValue />
-						</SelectTrigger>
-						<SelectContent>
-							<SelectItem value="one-time">
-								<Trans>One-time</Trans>
-							</SelectItem>
-							<SelectItem value="daily">
-								<Trans>Daily</Trans>
-							</SelectItem>
-						</SelectContent>
-					</Select>
-				</div>
-
-				{windowType === "one-time" ? (
-					<>
-						<div className="grid gap-2">
-							<Label htmlFor="start-datetime">
-								<Trans>Start Time</Trans>
-							</Label>
-							<Input
-								id="start-datetime"
-								type="datetime-local"
-								value={startDateTime}
-								onChange={(e) => setStartDateTime(e.target.value)}
-								min={formatDateTimeLocal(new Date(new Date().setHours(0, 0, 0, 0)))}
-								required
-								className="tabular-nums tracking-tighter"
-							/>
-						</div>
-						<div className="grid gap-2">
-							<Label htmlFor="end-datetime">
-								<Trans>End Time</Trans>
-							</Label>
-							<Input
-								id="end-datetime"
-								type="datetime-local"
-								value={endDateTime}
-								onChange={(e) => setEndDateTime(e.target.value)}
-								min={startDateTime || formatDateTimeLocal(new Date())}
-								required
-								className="tabular-nums tracking-tighter"
-							/>
-						</div>
-					</>
-				) : (
-					<div className="grid gap-2 grid-cols-2">
-						<div>
-							<Label htmlFor="start-time">
-								<Trans>Start Time</Trans>
-							</Label>
-							<Input
-								className="tabular-nums tracking-tighter"
-								id="start-time"
-								type="time"
-								value={startTime}
-								onChange={(e) => setStartTime(e.target.value)}
-								required
-							/>
-						</div>
-						<div>
-							<Label htmlFor="end-time">
-								<Trans>End Time</Trans>
-							</Label>
-							<Input
-								className="tabular-nums tracking-tighter"
-								id="end-time"
-								type="time"
-								value={endTime}
-								onChange={(e) => setEndTime(e.target.value)}
-								required
-							/>
-						</div>
-					</div>
-				)}
-
-				<DialogFooter>
-					<Button type="button" variant="outline" onClick={onClose}>
-						<Trans>Cancel</Trans>
-					</Button>
-					<Button type="submit">{editingRecord ? <Trans>Update</Trans> : <Trans>Create</Trans>}</Button>
-				</DialogFooter>
-			</form>
-		</DialogContent>
-	)
-}

internal/site/src/components/routes/smart.tsx

@@ -1,20 +0,0 @@
-import { useEffect } from "react"
-import SmartTable from "@/components/routes/system/smart-table"
-import { ActiveAlerts } from "@/components/active-alerts"
-import { FooterRepoLink } from "@/components/footer-repo-link"
-
-export default function Smart() {
-	useEffect(() => {
-		document.title = `S.M.A.R.T. / Beszel`
-	}, [])
-
-	return (
-		<>
-			<div className="grid gap-4">
-				<ActiveAlerts />
-				<SmartTable />
-			</div>
-			<FooterRepoLink />
-		</>
-	)
-}

internal/site/src/components/routes/system.tsx

@@ -1,9 +1,17 @@
 import { t } from "@lingui/core/macro"
-import { Trans, useLingui } from "@lingui/react/macro"
+import { Plural, Trans, useLingui } from "@lingui/react/macro"
 import { useStore } from "@nanostores/react"
 import { getPagePath } from "@nanostores/router"
 import { timeTicks } from "d3-time"
-import { XIcon } from "lucide-react"
+import {
+	ChevronRightSquareIcon,
+	ClockArrowUp,
+	CpuIcon,
+	GlobeIcon,
+	LayoutGridIcon,
+	MonitorIcon,
+	XIcon,
+} from "lucide-react"
 import { subscribeKeys } from "nanostores"
 import React, { type JSX, lazy, memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import AreaChartDefault, { type DataPoint } from "@/components/charts/area-chart"
@@ -16,7 +24,7 @@ import MemChart from "@/components/charts/mem-chart"
 import SwapChart from "@/components/charts/swap-chart"
 import TemperatureChart from "@/components/charts/temperature-chart"
 import { getPbTimestamp, pb } from "@/lib/api"
-import { ChartType, Os, SystemStatus, Unit } from "@/lib/enums"
+import { ChartType, ConnectionType, connectionTypeLabels, Os, SystemStatus, Unit } from "@/lib/enums"
 import { batteryStateTranslations } from "@/lib/i18n"
 import {
 	$allSystemsById,
@@ -34,8 +42,11 @@ import {
 	chartTimeData,
 	cn,
 	compareSemVer,
+	debounce,
 	decimalString,
 	formatBytes,
+	secondsToString,
+	getHostDisplayValue,
 	listen,
 	parseSemVer,
 	toFixedFloat,
@@ -51,18 +62,21 @@ import type {
 	SystemStats,
 	SystemStatsRecord,
 } from "@/types"
+import ChartTimeSelect from "../charts/chart-time-select"
 import { $router, navigate } from "../router"
 import Spinner from "../spinner"
 import { Button } from "../ui/button"
 import { Card, CardDescription, CardHeader, CardTitle } from "../ui/card"
-import { ChartAverage, ChartMax } from "../ui/icons"
+import { AppleIcon, ChartAverage, ChartMax, FreeBsdIcon, Rows, TuxIcon, WebSocketIcon, WindowsIcon } from "../ui/icons"
 import { Input } from "../ui/input"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select"
+import { Separator } from "../ui/separator"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip"
 import NetworkSheet from "./system/network-sheet"
-import CpuCoresSheet from "./system/cpu-sheet"
+import CpuCoresSheet from "./system/cpu-cores-sheet"
 import LineChartDefault from "../charts/line-chart"
-import { pinnedAxisDomain } from "../ui/chart"
-import InfoBar from "./system/info-bar"
+
+
 
 type ChartTimeData = {
 	time: number
@@ -84,8 +98,8 @@ function getTimeData(chartTime: ChartTimes, lastCreated: number) {
 		}
 	}
 
-	// const buffer = chartTime === "1m" ? 400 : 20_000
-	const now = new Date(Date.now())
+	const buffer = chartTime === "1m" ? 400 : 20_000
+	const now = new Date(Date.now() + buffer)
 	const startTime = chartTimeData[chartTime].getOffset(now)
 	const ticks = timeTicks(startTime, now, chartTimeData[chartTime].ticks ?? 12).map((date) => date.getTime())
 	const data = {
@@ -142,8 +156,8 @@ async function getStats<T extends SystemStatsRecord | ContainerStatsRecord>(
 	})
 }
 
-function dockerOrPodman(str: string, isPodman: boolean): string {
-	if (isPodman) {
+function dockerOrPodman(str: string, system: SystemRecord): string {
+	if (system.info.p) {
 		return str.replace("docker", "podman").replace("Docker", "Podman")
 	}
 	return str
@@ -166,7 +180,6 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 	const isLongerChart = !["1m", "1h"].includes(chartTime) // true if chart time is not 1m or 1h
 	const userSettings = $userSettings.get()
 	const chartWrapRef = useRef<HTMLDivElement>(null)
-	const [isPodman, setIsPodman] = useState(system.info?.p ?? false)
 
 	useEffect(() => {
 		return () => {
@@ -206,7 +219,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 	// subscribe to realtime metrics if chart time is 1m
 	// biome-ignore lint/correctness/useExhaustiveDependencies: not necessary
 	useEffect(() => {
-		let unsub = () => {}
+		let unsub = () => { }
 		if (!system.id || chartTime !== "1m") {
 			return
 		}
@@ -322,9 +335,62 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 		})
 	}, [system, chartTime])
 
-	useEffect(() => {
-		setIsPodman(system.info?.p ?? false)
-	}, [system.info?.p])
+	// values for system info bar
+	const systemInfo = useMemo(() => {
+		if (!system.info) {
+			return []
+		}
+
+		const osInfo = {
+			[Os.Linux]: {
+				Icon: TuxIcon,
+				value: system.info.k,
+				label: t({ comment: "Linux kernel", message: "Kernel" }),
+			},
+			[Os.Darwin]: {
+				Icon: AppleIcon,
+				value: `macOS ${system.info.k}`,
+			},
+			[Os.Windows]: {
+				Icon: WindowsIcon,
+				value: system.info.k,
+			},
+			[Os.FreeBSD]: {
+				Icon: FreeBsdIcon,
+				value: system.info.k,
+			},
+		}
+		let uptime: string
+		if (system.info.u < 3600) {
+			uptime = secondsToString(system.info.u, "minute")
+		} else if (system.info.u < 360000) {
+			uptime = secondsToString(system.info.u, "hour")
+		} else {
+			uptime = secondsToString(system.info.u, "day")
+		}
+		return [
+			{ value: getHostDisplayValue(system), Icon: GlobeIcon },
+			{
+				value: system.info.h,
+				Icon: MonitorIcon,
+				label: "Hostname",
+				// hide if hostname is same as host or name
+				hide: system.info.h === system.host || system.info.h === system.name,
+			},
+			{ value: uptime, Icon: ClockArrowUp, label: t`Uptime`, hide: !system.info.u },
+			osInfo[system.info.os ?? Os.Linux],
+			{
+				value: `${system.info.m} (${system.info.c}c${system.info.t ? `/${system.info.t}t` : ""})`,
+				Icon: CpuIcon,
+				hide: !system.info.m,
+			},
+		] as {
+			value: string | number | undefined
+			label?: string
+			Icon: React.ElementType
+			hide?: boolean
+		}[]
+	}, [system, t])
 
 	/** Space for tooltip if more than 10 sensors and no containers table */
 	useEffect(() => {
@@ -394,11 +460,113 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 	const hasGpuPowerData = lastGpuVals.some((gpu) => gpu.p !== undefined || gpu.pp !== undefined)
 	const hasGpuEnginesData = lastGpuVals.some((gpu) => gpu.e !== undefined)
 
+	let translatedStatus: string = system.status
+	if (system.status === SystemStatus.Up) {
+		translatedStatus = t({ message: "Up", comment: "Context: System is up" })
+	} else if (system.status === SystemStatus.Down) {
+		translatedStatus = t({ message: "Down", comment: "Context: System is down" })
+	}
+
 	return (
 		<>
 			<div ref={chartWrapRef} className="grid gap-4 mb-14 overflow-x-clip">
 				{/* system info */}
-				<InfoBar system={system} chartData={chartData} grid={grid} setGrid={setGrid} setIsPodman={setIsPodman} />
+				<Card>
+					<div className="grid xl:flex gap-4 px-4 sm:px-6 pt-3 sm:pt-4 pb-5">
+						<div>
+							<h1 className="text-[1.6rem] font-semibold mb-1.5">{system.name}</h1>
+							<div className="flex flex-wrap items-center gap-3 gap-y-2 text-sm opacity-90">
+								<TooltipProvider>
+									<Tooltip>
+										<TooltipTrigger asChild>
+											<div className="capitalize flex gap-2 items-center">
+												<span className={cn("relative flex h-3 w-3")}>
+													{system.status === SystemStatus.Up && (
+														<span
+															className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"
+															style={{ animationDuration: "1.5s" }}
+														></span>
+													)}
+													<span
+														className={cn("relative inline-flex rounded-full h-3 w-3", {
+															"bg-green-500": system.status === SystemStatus.Up,
+															"bg-red-500": system.status === SystemStatus.Down,
+															"bg-primary/40": system.status === SystemStatus.Paused,
+															"bg-yellow-500": system.status === SystemStatus.Pending,
+														})}
+													></span>
+												</span>
+												{translatedStatus}
+											</div>
+										</TooltipTrigger>
+										{system.info.ct && (
+											<TooltipContent>
+												<div className="flex gap-1 items-center">
+													{system.info.ct === ConnectionType.WebSocket ? (
+														<WebSocketIcon className="size-4" />
+													) : (
+														<ChevronRightSquareIcon className="size-4" strokeWidth={2} />
+													)}
+													{connectionTypeLabels[system.info.ct as ConnectionType]}
+												</div>
+											</TooltipContent>
+										)}
+									</Tooltip>
+								</TooltipProvider>
+
+								{systemInfo.map(({ value, label, Icon, hide }) => {
+									if (hide || !value) {
+										return null
+									}
+									const content = (
+										<div className="flex gap-1.5 items-center">
+											<Icon className="h-4 w-4" /> {value}
+										</div>
+									)
+									return (
+										<div key={value} className="contents">
+											<Separator orientation="vertical" className="h-4 bg-primary/30" />
+											{label ? (
+												<TooltipProvider>
+													<Tooltip delayDuration={150}>
+														<TooltipTrigger asChild>{content}</TooltipTrigger>
+														<TooltipContent>{label}</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											) : (
+												content
+											)}
+										</div>
+									)
+								})}
+							</div>
+						</div>
+						<div className="xl:ms-auto flex items-center gap-2 max-sm:-mb-1">
+							<ChartTimeSelect className="w-full xl:w-40" agentVersion={chartData.agentVersion} />
+							<TooltipProvider delayDuration={100}>
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<Button
+											aria-label={t`Toggle grid`}
+											variant="outline"
+											size="icon"
+											className="hidden xl:flex p-0 text-primary"
+											onClick={() => setGrid(!grid)}
+										>
+											{grid ? (
+												<LayoutGridIcon className="h-[1.2rem] w-[1.2rem] opacity-75" />
+											) : (
+												<Rows className="h-[1.3rem] w-[1.3rem] opacity-75" />
+											)}
+										</Button>
+									</TooltipTrigger>
+									<TooltipContent>{t`Toggle grid`}</TooltipContent>
+								</Tooltip>
+							</TooltipProvider>
+						</div>
+					</div>
+				</Card>
+
 
 				{/* <Tabs defaultValue="overview" className="w-full">
 					<TabsList className="w-full h-11">
@@ -410,6 +578,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 					</TabsContent>
 				</Tabs> */}
 
+
 				{/* main charts */}
 				<div className="grid xl:grid-cols-2 gap-4">
 					<ChartCard
@@ -418,26 +587,51 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 						title={t`CPU Usage`}
 						description={t`Average system-wide CPU utilization`}
 						cornerEl={
-							<div className="flex gap-2">
+							<>
 								{maxValSelect}
 								<CpuCoresSheet chartData={chartData} dataEmpty={dataEmpty} grid={grid} maxValues={maxValues} />
-							</div>
+							</>
 						}
+						legend={true}
 					>
 						<AreaChartDefault
 							chartData={chartData}
 							maxToggled={maxValues}
+							legend={true}
 							dataPoints={[
 								{
-									label: t`CPU Usage`,
+									label: t`Total`,
 									dataKey: ({ stats }) => (showMax ? stats?.cpum : stats?.cpu),
 									color: 1,
 									opacity: 0.4,
 								},
+								{
+									label: t`User`,
+									dataKey: ({ stats }) => stats?.cpuu,
+									color: 2,
+									opacity: 0.3,
+								},
+								{
+									label: t`System`,
+									dataKey: ({ stats }) => stats?.cpus,
+									color: 3,
+									opacity: 0.3,
+								},
+								{
+									label: t`IOWait`,
+									dataKey: ({ stats }) => stats?.cpui,
+									color: 4,
+									opacity: 0.3,
+								},
+								{
+									label: t`Steal`,
+									dataKey: ({ stats }) => stats?.cpust,
+									color: 5,
+									opacity: 0.3,
+								},
 							]}
 							tickFormatter={(val) => `${toFixedFloat(val, 2)}%`}
 							contentFormatter={({ value }) => `${decimalString(value)}%`}
-							domain={pinnedAxisDomain()}
 						/>
 					</ChartCard>
 
@@ -445,7 +639,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 						<ChartCard
 							empty={dataEmpty}
 							grid={grid}
-							title={dockerOrPodman(t`Docker CPU Usage`, isPodman)}
+							title={dockerOrPodman(t`Docker CPU Usage`, system)}
 							description={t`Average CPU utilization of containers`}
 							cornerEl={containerFilterBar}
 						>
@@ -472,8 +666,8 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 						<ChartCard
 							empty={dataEmpty}
 							grid={grid}
-							title={dockerOrPodman(t`Docker Memory Usage`, isPodman)}
-							description={dockerOrPodman(t`Memory usage of docker containers`, isPodman)}
+							title={dockerOrPodman(t`Docker Memory Usage`, system)}
+							description={dockerOrPodman(t`Memory usage of docker containers`, system)}
 							cornerEl={containerFilterBar}
 						>
 							<ContainerChart
@@ -531,7 +725,6 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 								const { value: convertedValue, unit } = formatBytes(value, true, userSettings.unitDisk, false)
 								return `${decimalString(convertedValue, convertedValue >= 100 ? 1 : 2)} ${unit}`
 							}}
-							showTotal={true}
 						/>
 					</ChartCard>
 
@@ -585,7 +778,6 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 								const { value, unit } = formatBytes(data.value, true, userSettings.unitNet, false)
 								return `${decimalString(value, value >= 100 ? 1 : 2)} ${unit}`
 							}}
-							showTotal={true}
 						/>
 					</ChartCard>
 
@@ -593,8 +785,8 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 						<ChartCard
 							empty={dataEmpty}
 							grid={grid}
-							title={dockerOrPodman(t`Docker Network I/O`, isPodman)}
-							description={dockerOrPodman(t`Network traffic of docker containers`, isPodman)}
+							title={dockerOrPodman(t`Docker Network I/O`, system)}
+							description={dockerOrPodman(t`Network traffic of docker containers`, system)}
 							cornerEl={containerFilterBar}
 						>
 							<ContainerChart
@@ -633,7 +825,10 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 
 					{/* Temperature chart */}
 					{systemStats.at(-1)?.stats.t && (
-						<div ref={temperatureChartRef} className={cn("odd:last-of-type:col-span-full", { "col-span-full": !grid })}>
+						<div
+							ref={temperatureChartRef}
+							className={cn("odd:last-of-type:col-span-full", { "col-span-full": !grid })}
+						>
 							<ChartCard
 								empty={dataEmpty}
 								grid={grid}
@@ -795,9 +990,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 													label: t`Write`,
 													dataKey: ({ stats }) => {
 														if (showMax) {
-															return (
-																stats?.efs?.[extraFsName]?.wbm || (stats?.efs?.[extraFsName]?.wm ?? 0) * 1024 * 1024
-															)
+															return stats?.efs?.[extraFsName]?.wbm || (stats?.efs?.[extraFsName]?.wm ?? 0) * 1024 * 1024
 														}
 														return stats?.efs?.[extraFsName]?.wb || (stats?.efs?.[extraFsName]?.w ?? 0) * 1024 * 1024
 													},
@@ -835,14 +1028,12 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 					</div>
 				)}
 
-				{compareSemVer(chartData.agentVersion, parseSemVer("0.15.0")) >= 0 && <LazySmartTable systemId={system.id} />}
-
-				{containerData.length > 0 && compareSemVer(chartData.agentVersion, parseSemVer("0.14.0")) >= 0 && (
-					<LazyContainersTable systemId={system.id} />
+				{compareSemVer(chartData.agentVersion, parseSemVer("0.15.0")) >= 0 && (
+					<LazySmartTable systemId={system.id} />
 				)}
 
-				{system.info?.os === Os.Linux && compareSemVer(chartData.agentVersion, parseSemVer("0.16.0")) >= 0 && (
-					<LazySystemdTable systemId={system.id} />
+				{containerData.length > 0 && compareSemVer(chartData.agentVersion, parseSemVer("0.14.0")) >= 0 && (
+					<LazyContainersTable systemId={id} />
 				)}
 			</div>
 
@@ -875,31 +1066,15 @@ function GpuEnginesChart({ chartData }: { chartData: ChartData }) {
 }
 
 function FilterBar({ store = $containerFilter }: { store?: typeof $containerFilter }) {
-	const storeValue = useStore(store)
-	const [inputValue, setInputValue] = useState(storeValue)
+	const containerFilter = useStore(store)
 	const { t } = useLingui()
 
-	useEffect(() => {
-		setInputValue(storeValue)
-	}, [storeValue])
+	const debouncedStoreSet = useMemo(() => debounce((value: string) => store.set(value), 80), [store])
 
-	useEffect(() => {
-		if (inputValue === storeValue) {
-			return
-		}
-		const handle = window.setTimeout(() => store.set(inputValue), 80)
-		return () => clearTimeout(handle)
-	}, [inputValue, storeValue, store])
-
-	const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
-		const value = e.target.value
-		setInputValue(value)
-	}, [])
-
-	const handleClear = useCallback(() => {
-		setInputValue("")
-		store.set("")
-	}, [store])
+	const handleChange = useCallback(
+		(e: React.ChangeEvent<HTMLInputElement>) => debouncedStoreSet(e.target.value),
+		[debouncedStoreSet]
+	)
 
 	return (
 		<>
@@ -907,16 +1082,16 @@ function FilterBar({ store = $containerFilter }: { store?: typeof $containerFilt
 				placeholder={t`Filter...`}
 				className="ps-4 pe-8 w-full sm:w-44"
 				onChange={handleChange}
-				value={inputValue}
+				value={containerFilter}
 			/>
-			{inputValue && (
+			{containerFilter && (
 				<Button
 					type="button"
 					variant="ghost"
 					size="icon"
 					aria-label="Clear"
 					className="absolute right-1 top-1/2 -translate-y-1/2 h-7 w-7 text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-100"
-					onClick={handleClear}
+					onClick={() => store.set("")}
 				>
 					<XIcon className="h-4 w-4" />
 				</Button>
@@ -976,7 +1151,7 @@ export function ChartCard({
 				<CardDescription>{description}</CardDescription>
 				{cornerEl && <div className="py-1 grid sm:justify-end sm:absolute sm:top-3.5 sm:end-3.5">{cornerEl}</div>}
 			</CardHeader>
-			<div className={cn("ps-0 w-[calc(100%-1.3em)] relative group", legend ? "h-54 md:h-56" : "h-48 md:h-52")}>
+			<div className={cn("ps-0 w-[calc(100%-1.5em)] relative group", legend ? "h-54 md:h-56" : "h-48 md:h-52")}>
 				{
 					<Spinner
 						msg={empty ? t`Waiting for enough records to display` : undefined}
@@ -1010,15 +1185,4 @@ function LazySmartTable({ systemId }: { systemId: string }) {
 			{isIntersecting && <SmartTable systemId={systemId} />}
 		</div>
 	)
-}
-
-const SystemdTable = lazy(() => import("../systemd-table/systemd-table"))
-
-function LazySystemdTable({ systemId }: { systemId: string }) {
-	const { isIntersecting, ref } = useIntersectionObserver()
-	return (
-		<div ref={ref} className={cn(isIntersecting && "contents")}>
-			{isIntersecting && <SystemdTable systemId={systemId} />}
-		</div>
-	)
-}
+}

internal/site/src/components/routes/system/cpu-cores-sheet.tsx

@@ -0,0 +1,119 @@
+import { t } from "@lingui/core/macro"
+import { MoreHorizontalIcon } from "lucide-react"
+import { memo, useRef, useState } from "react"
+import AreaChartDefault from "@/components/charts/area-chart"
+import ChartTimeSelect from "@/components/charts/chart-time-select"
+import { Button } from "@/components/ui/button"
+import { Sheet, SheetContent, SheetTrigger } from "@/components/ui/sheet"
+import { DialogTitle } from "@/components/ui/dialog"
+import { decimalString, toFixedFloat } from "@/lib/utils"
+import type { ChartData, SystemStatsRecord } from "@/types"
+import { ChartCard } from "../system"
+
+export default memo(function CpuCoresSheet({
+	chartData,
+	dataEmpty,
+	grid,
+	maxValues,
+}: {
+	chartData: ChartData
+	dataEmpty: boolean
+	grid: boolean
+	maxValues: boolean
+}) {
+	const [cpuCoresOpen, setCpuCoresOpen] = useState(false)
+	const hasOpened = useRef(false)
+
+	if (cpuCoresOpen && !hasOpened.current) {
+		hasOpened.current = true
+	}
+
+	// Get list of CPU cores from the latest stats
+	const cpuCoresData = chartData.systemStats.at(-1)?.stats?.cpuc ?? {}
+	const coreNames = Object.keys(cpuCoresData).sort((a, b) => {
+		const numA = Number.parseInt(a.replace("cpu", ""))
+		const numB = Number.parseInt(b.replace("cpu", ""))
+		return numA - numB
+	})
+
+	if (coreNames.length === 0) {
+		return null
+	}
+
+	return (
+		<Sheet open={cpuCoresOpen} onOpenChange={setCpuCoresOpen}>
+			<DialogTitle className="sr-only">{t`Per-core CPU usage`}</DialogTitle>
+			<SheetTrigger asChild>
+				<Button
+					title={t`View per-core CPU`}
+					variant="outline"
+					size="icon"
+					className="shrink-0 max-sm:absolute max-sm:top-3 max-sm:end-3"
+				>
+					<MoreHorizontalIcon />
+				</Button>
+			</SheetTrigger>
+			{hasOpened.current && (
+				<SheetContent aria-describedby={undefined} className="overflow-auto w-200 !max-w-full p-4 sm:p-6">
+					<ChartTimeSelect className="w-[calc(100%-2em)]" agentVersion={chartData.agentVersion} />
+					{coreNames.map((coreName) => (
+						<ChartCard
+							key={coreName}
+							empty={dataEmpty}
+							grid={grid}
+							title={coreName.toUpperCase()}
+							description={t`CPU usage breakdown for ${coreName}`}
+							legend={true}
+							className="min-h-auto"
+						>
+							<AreaChartDefault
+								chartData={chartData}
+								maxToggled={maxValues}
+								legend={true}
+								dataPoints={[
+									{
+										label: t`Total`,
+										dataKey: ({ stats }: SystemStatsRecord) => {
+											const core = stats?.cpuc?.[coreName]
+											if (!core) return undefined
+											// Sum all metrics: user + system + iowait + steal
+											return core[0] + core[1] + core[2] + core[3]
+										},
+										color: 1,
+										opacity: 0.4,
+									},
+									{
+										label: t`User`,
+										dataKey: ({ stats }: SystemStatsRecord) => stats?.cpuc?.[coreName]?.[0],
+										color: 2,
+										opacity: 0.3,
+									},
+									{
+										label: t`System`,
+										dataKey: ({ stats }: SystemStatsRecord) => stats?.cpuc?.[coreName]?.[1],
+										color: 3,
+										opacity: 0.3,
+									},
+									{
+										label: t`IOWait`,
+										dataKey: ({ stats }: SystemStatsRecord) => stats?.cpuc?.[coreName]?.[2],
+										color: 4,
+										opacity: 0.3,
+									},
+									{
+										label: t`Steal`,
+										dataKey: ({ stats }: SystemStatsRecord) => stats?.cpuc?.[coreName]?.[3],
+										color: 5,
+										opacity: 0.3,
+									},
+								]}
+								tickFormatter={(val) => `${toFixedFloat(val, 2)}%`}
+								contentFormatter={({ value }) => `${decimalString(value)}%`}
+							/>
+						</ChartCard>
+					))}
+				</SheetContent>
+			)}
+		</Sheet>
+	)
+})

internal/site/src/components/routes/system/cpu-sheet.tsx

@@ -1,195 +0,0 @@
-import { t } from "@lingui/core/macro"
-import { MoreHorizontalIcon } from "lucide-react"
-import { memo, useRef, useState } from "react"
-import AreaChartDefault, { DataPoint } from "@/components/charts/area-chart"
-import ChartTimeSelect from "@/components/charts/chart-time-select"
-import { Button } from "@/components/ui/button"
-import { Sheet, SheetContent, SheetTrigger } from "@/components/ui/sheet"
-import { DialogTitle } from "@/components/ui/dialog"
-import { compareSemVer, decimalString, parseSemVer, toFixedFloat } from "@/lib/utils"
-import type { ChartData, SystemStatsRecord } from "@/types"
-import { ChartCard } from "../system"
-
-const minAgentVersion = parseSemVer("0.15.3")
-
-export default memo(function CpuCoresSheet({
-	chartData,
-	dataEmpty,
-	grid,
-	maxValues,
-}: {
-	chartData: ChartData
-	dataEmpty: boolean
-	grid: boolean
-	maxValues: boolean
-}) {
-	const [cpuCoresOpen, setCpuCoresOpen] = useState(false)
-	const hasOpened = useRef(false)
-
-	const supportsBreakdown = compareSemVer(chartData.agentVersion, minAgentVersion) >= 0
-
-	if (!supportsBreakdown) {
-		return null
-	}
-
-	if (cpuCoresOpen && !hasOpened.current) {
-		hasOpened.current = true
-	}
-
-	// Latest stats snapshot
-	const latest = chartData.systemStats.at(-1)?.stats
-	const cpus = latest?.cpus ?? []
-	const numCores = cpus.length
-	const hasBreakdown = (latest?.cpub?.length ?? 0) > 0
-
-	const breakdownDataPoints = [
-		{
-			label: "System",
-			dataKey: ({ stats }: SystemStatsRecord) => stats?.cpub?.[1],
-			color: 3,
-			opacity: 0.35,
-			stackId: "a"
-		},
-		{
-			label: "User",
-			dataKey: ({ stats }: SystemStatsRecord) => stats?.cpub?.[0],
-			color: 1,
-			opacity: 0.35,
-			stackId: "a"
-		},
-		{
-			label: "IOWait",
-			dataKey: ({ stats }: SystemStatsRecord) => stats?.cpub?.[2],
-			color: 4,
-			opacity: 0.35,
-			stackId: "a"
-		},
-		{
-			label: "Steal",
-			dataKey: ({ stats }: SystemStatsRecord) => stats?.cpub?.[3],
-			color: 5,
-			opacity: 0.35,
-			stackId: "a"
-		},
-		{
-			label: "Idle",
-			dataKey: ({ stats }: SystemStatsRecord) => stats?.cpub?.[4],
-			color: 2,
-			opacity: 0.35,
-			stackId: "a"
-		},
-		{
-			label: t`Other`,
-			dataKey: ({ stats }: SystemStatsRecord) => {
-				const total = stats?.cpub?.reduce((acc, curr) => acc + curr, 0) ?? 0
-				return total > 0 ? 100 - total : null
-			},
-			color: `hsl(80, 65%, 52%)`,
-			opacity: 0.35,
-			stackId: "a"
-		},
-	] as DataPoint[]
-
-
-	return (
-		<Sheet open={cpuCoresOpen} onOpenChange={setCpuCoresOpen}>
-			<DialogTitle className="sr-only">{t`CPU Usage`}</DialogTitle>
-			<SheetTrigger asChild>
-				<Button
-					title={t`View more`}
-					variant="outline"
-					size="icon"
-					className="shrink-0 max-sm:absolute max-sm:top-3 max-sm:end-3"
-				>
-					<MoreHorizontalIcon />
-				</Button>
-			</SheetTrigger>
-			{hasOpened.current && (
-				<SheetContent aria-describedby={undefined} className="overflow-auto w-200 !max-w-full p-4 sm:p-6">
-					<ChartTimeSelect className="w-[calc(100%-2em)] bg-card" agentVersion={chartData.agentVersion} />
-					{hasBreakdown && (
-						<ChartCard
-							key="cpu-breakdown"
-							empty={dataEmpty}
-							grid={grid}
-							title={t`CPU Time Breakdown`}
-							description={t`Percentage of time spent in each state`}
-							legend={true}
-							className="min-h-auto"
-						>
-							<AreaChartDefault
-								chartData={chartData}
-								maxToggled={maxValues}
-								legend={true}
-								dataPoints={breakdownDataPoints}
-								tickFormatter={(val) => `${toFixedFloat(val, 2)}%`}
-								contentFormatter={({ value }) => `${decimalString(value)}%`}
-								reverseStackOrder={true}
-								itemSorter={() => 1}
-								domain={[0, 100]}
-							/>
-						</ChartCard>
-					)}
-
-					{numCores > 0 && (
-						<ChartCard
-							key="cpu-cores-all"
-							empty={dataEmpty}
-							grid={grid}
-							title={t`CPU Cores`}
-							legend={numCores < 10}
-							description={t`Per-core average utilization`}
-							className="min-h-auto"
-						>
-							<AreaChartDefault
-								hideYAxis={true}
-								chartData={chartData}
-								maxToggled={maxValues}
-								legend={numCores < 10}
-								dataPoints={Array.from({ length: numCores }).map((_, i) => ({
-									label: `CPU ${i}`,
-									dataKey: ({ stats }: SystemStatsRecord) => stats?.cpus?.[i] ?? 1 / (stats?.cpus?.length ?? 1),
-									color: `hsl(${226 + (((i * 360) / Math.max(1, numCores)) % 360)}, var(--chart-saturation), var(--chart-lightness))`,
-									opacity: 0.35,
-									stackId: "a"
-								}))}
-								tickFormatter={(val) => `${val}%`}
-								contentFormatter={({ value }) => `${value}%`}
-								reverseStackOrder={true}
-								itemSorter={() => 1}
-							/>
-						</ChartCard>
-					)}
-
-					{Array.from({ length: numCores }).map((_, i) => (
-						<ChartCard
-							key={`cpu-core-${i}`}
-							empty={dataEmpty}
-							grid={grid}
-							title={`CPU ${i}`}
-							description={t`Per-core average utilization`}
-							legend={false}
-							className="min-h-auto"
-						>
-							<AreaChartDefault
-								chartData={chartData}
-								maxToggled={maxValues}
-								legend={false}
-								dataPoints={[
-									{
-										label: t`Usage`,
-										dataKey: ({ stats }: SystemStatsRecord) => stats?.cpus?.[i],
-										color: `hsl(${226 + (((i * 360) / Math.max(1, numCores)) % 360)}, 65%, 52%)`,
-										opacity: 0.35,
-									},
-								]}
-								tickFormatter={(val) => `${val}%`}
-								contentFormatter={({ value }) => `${value}%`}
-							/>
-						</ChartCard>
-					))}
-				</SheetContent>
-			)}
-		</Sheet>
-	)
-})

internal/site/src/components/routes/system/info-bar.tsx

@@ -1,259 +0,0 @@
-import { plural } from "@lingui/core/macro"
-import { useLingui } from "@lingui/react/macro"
-import {
-	AppleIcon,
-	ChevronRightSquareIcon,
-	ClockArrowUp,
-	CpuIcon,
-	GlobeIcon,
-	LayoutGridIcon,
-	MemoryStickIcon,
-	MonitorIcon,
-	Rows,
-} from "lucide-react"
-import { useEffect, useMemo, useState } from "react"
-import ChartTimeSelect from "@/components/charts/chart-time-select"
-import { Button } from "@/components/ui/button"
-import { Card } from "@/components/ui/card"
-import { FreeBsdIcon, TuxIcon, WebSocketIcon, WindowsIcon } from "@/components/ui/icons"
-import { Separator } from "@/components/ui/separator"
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
-import { pb } from "@/lib/api"
-import { ConnectionType, connectionTypeLabels, Os, SystemStatus } from "@/lib/enums"
-import { cn, formatBytes, getHostDisplayValue, secondsToString, toFixedFloat } from "@/lib/utils"
-import type { ChartData, SystemDetailsRecord, SystemRecord } from "@/types"
-
-export default function InfoBar({
-	system,
-	chartData,
-	grid,
-	setGrid,
-	setIsPodman,
-}: {
-	system: SystemRecord
-	chartData: ChartData
-	grid: boolean
-	setGrid: (grid: boolean) => void
-	setIsPodman: (isPodman: boolean) => void
-}) {
-	const { t } = useLingui()
-	const [details, setDetails] = useState<SystemDetailsRecord | null>(null)
-
-	// Fetch system_details on mount / when system changes
-	useEffect(() => {
-		let active = true
-		setDetails(null)
-		// skip fetching system details if agent is older version which includes details in Info struct
-		if (!system.id || system.info?.m) {
-			return
-		}
-		pb.collection<SystemDetailsRecord>("system_details")
-			.getOne(system.id, {
-				fields: "hostname,kernel,cores,threads,cpu,os,os_name,arch,memory,podman",
-				headers: {
-					"Cache-Control": "public, max-age=60",
-				},
-			})
-			.then((details) => {
-				if (active) {
-					setDetails(details)
-					setIsPodman(details.podman)
-				}
-			})
-			.catch(() => {})
-
-		return () => {
-			active = false
-		}
-	}, [system.id])
-
-	// values for system info bar - use details with fallback to system.info
-	const systemInfo = useMemo(() => {
-		if (!system.info) {
-			return []
-		}
-
-		// Use details if available, otherwise fall back to system.info
-		const hostname = details?.hostname ?? system.info.h
-		const kernel = details?.kernel ?? system.info.k
-		const cores = details?.cores ?? system.info.c
-		const threads = details?.threads ?? system.info.t ?? 0
-		const cpuModel = details?.cpu ?? system.info.m
-		const os = details?.os ?? system.info.os ?? Os.Linux
-		const osName = details?.os_name
-		const arch = details?.arch
-		const memory = details?.memory
-
-		const osInfo = {
-			[Os.Linux]: {
-				Icon: TuxIcon,
-				// show kernel in tooltip if os name is available, otherwise show the kernel
-				value: osName || kernel,
-				label: osName ? kernel : undefined,
-			},
-			[Os.Darwin]: {
-				Icon: AppleIcon,
-				value: osName || `macOS ${kernel}`,
-			},
-			[Os.Windows]: {
-				Icon: WindowsIcon,
-				value: osName || kernel,
-				label: osName ? kernel : undefined,
-			},
-			[Os.FreeBSD]: {
-				Icon: FreeBsdIcon,
-				value: osName || kernel,
-				label: osName ? kernel : undefined,
-			},
-		}
-
-		let uptime: string
-		if (system.info.u < 3600) {
-			uptime = secondsToString(system.info.u, "minute")
-		} else if (system.info.u < 360000) {
-			uptime = secondsToString(system.info.u, "hour")
-		} else {
-			uptime = secondsToString(system.info.u, "day")
-		}
-		const info = [
-			{ value: getHostDisplayValue(system), Icon: GlobeIcon },
-			{
-				value: hostname,
-				Icon: MonitorIcon,
-				label: "Hostname",
-				// hide if hostname is same as host or name
-				hide: hostname === system.host || hostname === system.name,
-			},
-			{ value: uptime, Icon: ClockArrowUp, label: t`Uptime`, hide: !system.info.u },
-			osInfo[os],
-			{
-				value: cpuModel,
-				Icon: CpuIcon,
-				hide: !cpuModel,
-				label: `${plural(cores, { one: "# core", other: "# cores" })} / ${plural(threads, { one: "# thread", other: "# threads" })}${arch ? ` / ${arch}` : ""}`,
-			},
-		] as {
-			value: string | number | undefined
-			label?: string
-			Icon: React.ElementType
-			hide?: boolean
-		}[]
-
-		if (memory) {
-			const memValue = formatBytes(memory, false, undefined, false)
-			info.push({
-				value: `${toFixedFloat(memValue.value, memValue.value >= 10 ? 1 : 2)} ${memValue.unit}`,
-				Icon: MemoryStickIcon,
-				hide: !memory,
-				label: t`Memory`,
-			})
-		}
-
-		return info
-	}, [system, details, t])
-
-	let translatedStatus: string = system.status
-	if (system.status === SystemStatus.Up) {
-		translatedStatus = t({ message: "Up", comment: "Context: System is up" })
-	} else if (system.status === SystemStatus.Down) {
-		translatedStatus = t({ message: "Down", comment: "Context: System is down" })
-	}
-
-	return (
-		<Card>
-			<div className="grid xl:flex gap-4 px-4 sm:px-6 pt-3 sm:pt-4 pb-5">
-				<div>
-					<h1 className="text-[1.6rem] font-semibold mb-1.5">{system.name}</h1>
-					<div className="flex flex-wrap items-center gap-3 gap-y-2 text-sm opacity-90">
-						<TooltipProvider>
-							<Tooltip>
-								<TooltipTrigger asChild>
-									<div className="capitalize flex gap-2 items-center">
-										<span className={cn("relative flex h-3 w-3")}>
-											{system.status === SystemStatus.Up && (
-												<span
-													className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"
-													style={{ animationDuration: "1.5s" }}
-												></span>
-											)}
-											<span
-												className={cn("relative inline-flex rounded-full h-3 w-3", {
-													"bg-green-500": system.status === SystemStatus.Up,
-													"bg-red-500": system.status === SystemStatus.Down,
-													"bg-primary/40": system.status === SystemStatus.Paused,
-													"bg-yellow-500": system.status === SystemStatus.Pending,
-												})}
-											></span>
-										</span>
-										{translatedStatus}
-									</div>
-								</TooltipTrigger>
-								{system.info.ct && (
-									<TooltipContent>
-										<div className="flex gap-1 items-center">
-											{system.info.ct === ConnectionType.WebSocket ? (
-												<WebSocketIcon className="size-4" />
-											) : (
-												<ChevronRightSquareIcon className="size-4" strokeWidth={2} />
-											)}
-											{connectionTypeLabels[system.info.ct as ConnectionType]}
-										</div>
-									</TooltipContent>
-								)}
-							</Tooltip>
-						</TooltipProvider>
-
-						{systemInfo.map(({ value, label, Icon, hide }) => {
-							if (hide || !value) {
-								return null
-							}
-							const content = (
-								<div className="flex gap-1.5 items-center">
-									<Icon className="h-4 w-4" /> {value}
-								</div>
-							)
-							return (
-								<div key={value} className="contents">
-									<Separator orientation="vertical" className="h-4 bg-primary/30" />
-									{label ? (
-										<TooltipProvider>
-											<Tooltip delayDuration={150}>
-												<TooltipTrigger asChild>{content}</TooltipTrigger>
-												<TooltipContent>{label}</TooltipContent>
-											</Tooltip>
-										</TooltipProvider>
-									) : (
-										content
-									)}
-								</div>
-							)
-						})}
-					</div>
-				</div>
-				<div className="xl:ms-auto flex items-center gap-2 max-sm:-mb-1">
-					<ChartTimeSelect className="w-full xl:w-40" agentVersion={chartData.agentVersion} />
-					<TooltipProvider delayDuration={100}>
-						<Tooltip>
-							<TooltipTrigger asChild>
-								<Button
-									aria-label={t`Toggle grid`}
-									variant="outline"
-									size="icon"
-									className="hidden xl:flex p-0 text-primary"
-									onClick={() => setGrid(!grid)}
-								>
-									{grid ? (
-										<LayoutGridIcon className="h-[1.2rem] w-[1.2rem] opacity-75" />
-									) : (
-										<Rows className="h-[1.3rem] w-[1.3rem] opacity-75" />
-									)}
-								</Button>
-							</TooltipTrigger>
-							<TooltipContent>{t`Toggle grid`}</TooltipContent>
-						</Tooltip>
-					</TooltipProvider>
-				</div>
-			</div>
-		</Card>
-	)
-}

internal/site/src/components/routes/system/network-sheet.tsx

@@ -53,7 +53,7 @@ export default memo(function NetworkSheet({
 			</SheetTrigger>
 			{hasOpened.current && (
 				<SheetContent aria-describedby={undefined} className="overflow-auto w-200 !max-w-full p-4 sm:p-6">
-					<ChartTimeSelect className="w-[calc(100%-2em)] bg-card" agentVersion={chartData.agentVersion} />
+					<ChartTimeSelect className="w-[calc(100%-2em)]" agentVersion={chartData.agentVersion} />
 					<ChartCard
 						empty={dataEmpty}
 						grid={grid}

internal/site/src/components/systemd-table/systemd-table-columns.tsx

@@ -1,200 +0,0 @@
-import type { Column, ColumnDef } from "@tanstack/react-table"
-import { Button } from "@/components/ui/button"
-import { cn, decimalString, formatBytes, hourWithSeconds } from "@/lib/utils"
-import type { SystemdRecord } from "@/types"
-import { ServiceStatus, ServiceStatusLabels, ServiceSubState, ServiceSubStateLabels } from "@/lib/enums"
-import {
-	ActivityIcon,
-	ArrowUpDownIcon,
-	ClockIcon,
-	CpuIcon,
-	MemoryStickIcon,
-	TerminalSquareIcon,
-} from "lucide-react"
-import { Badge } from "../ui/badge"
-import { t } from "@lingui/core/macro"
-// import { $allSystemsById } from "@/lib/stores"
-// import { useStore } from "@nanostores/react"
-
-function getSubStateColor(subState: ServiceSubState) {
-	switch (subState) {
-		case ServiceSubState.Running:
-			return "bg-green-500"
-		case ServiceSubState.Failed:
-			return "bg-red-500"
-		case ServiceSubState.Dead:
-			return "bg-yellow-500"
-		default:
-			return "bg-zinc-500"
-	}
-}
-
-
-export const systemdTableCols: ColumnDef<SystemdRecord>[] = [
-	{
-		id: "name",
-		sortingFn: (a, b) => a.original.name.localeCompare(b.original.name),
-		accessorFn: (record) => record.name,
-		header: ({ column }) => <HeaderButton column={column} name={t`Name`} Icon={TerminalSquareIcon} />,
-		cell: ({ getValue }) => {
-			return <span className="ms-1.5 xl:w-50 block truncate">{getValue() as string}</span>
-		},
-	},
-	// {
-	// 	id: "system",
-	// 	accessorFn: (record) => record.system,
-	// 	sortingFn: (a, b) => {
-	// 		const allSystems = $allSystemsById.get()
-	// 		const systemNameA = allSystems[a.original.system]?.name ?? ""
-	// 		const systemNameB = allSystems[b.original.system]?.name ?? ""
-	// 		return systemNameA.localeCompare(systemNameB)
-	// 	},
-	// 	header: ({ column }) => <HeaderButton column={column} name={t`System`} Icon={ServerIcon} />,
-	// 	cell: ({ getValue }) => {
-	// 		const allSystems = useStore($allSystemsById)
-	// 		return <span className="ms-1.5 xl:w-34 block truncate">{allSystems[getValue() as string]?.name ?? ""}</span>
-	// 	},
-	// },
-	{
-		id: "state",
-		accessorFn: (record) => record.state,
-		header: ({ column }) => <HeaderButton column={column} name={t`State`} Icon={ActivityIcon} />,
-		cell: ({ getValue }) => {
-			const statusValue = getValue() as ServiceStatus
-			const statusLabel = ServiceStatusLabels[statusValue] || "Unknown"
-			return (
-				<Badge variant="outline" className="dark:border-white/12">
-					<span className={cn("size-2 me-1.5 rounded-full", getStatusColor(statusValue))} />
-					{statusLabel}
-				</Badge>
-			)
-		},
-	},
-	{
-		id: "sub",
-		accessorFn: (record) => record.sub,
-		header: ({ column }) => <HeaderButton column={column} name={t`Sub State`} Icon={ActivityIcon} />,
-		cell: ({ getValue }) => {
-			const subState = getValue() as ServiceSubState
-			const subStateLabel = ServiceSubStateLabels[subState] || "Unknown"
-			return (
-				<Badge variant="outline" className="dark:border-white/12 text-xs capitalize">
-					<span className={cn("size-2 me-1.5 rounded-full", getSubStateColor(subState))} />
-					{subStateLabel}
-				</Badge>
-			)
-		},
-	},
-	{
-		id: "cpu",
-		accessorFn: (record) => {
-			if (record.sub !== ServiceSubState.Running) {
-				return -1
-			}
-			return record.cpu
-		},
-		invertSorting: true,
-		header: ({ column }) => <HeaderButton column={column} name={`${t`CPU`} (10m)`} Icon={CpuIcon} />,
-		cell: ({ getValue }) => {
-			const val = getValue() as number
-			if (val < 0) {
-				return <span className="ms-1.5 text-muted-foreground">N/A</span>
-			}
-			return <span className="ms-1.5 tabular-nums">{`${decimalString(val, val >= 10 ? 1 : 2)}%`}</span>
-		},
-	},
-	{
-		id: "cpuPeak",
-		accessorFn: (record) => {
-			if (record.sub !== ServiceSubState.Running) {
-				return -1
-			}
-			return record.cpuPeak ?? 0
-		},
-		invertSorting: true,
-		header: ({ column }) => <HeaderButton column={column} name={t`CPU Peak`} Icon={CpuIcon} />,
-		cell: ({ getValue }) => {
-			const val = getValue() as number
-			if (val < 0) {
-				return <span className="ms-1.5 text-muted-foreground">N/A</span>
-			}
-			return <span className="ms-1.5 tabular-nums">{`${decimalString(val, val >= 10 ? 1 : 2)}%`}</span>
-		},
-	},
-	{
-		id: "memory",
-		accessorFn: (record) => record.memory,
-		invertSorting: true,
-		header: ({ column }) => <HeaderButton column={column} name={t`Memory`} Icon={MemoryStickIcon} />,
-		cell: ({ getValue }) => {
-			const val = getValue() as number
-			if (!val) {
-				return <span className="ms-1.5 text-muted-foreground">N/A</span>
-			}
-			const formatted = formatBytes(val, false, undefined, false)
-			return (
-				<span className="ms-1.5 tabular-nums">{`${decimalString(formatted.value, formatted.value >= 10 ? 1 : 2)} ${formatted.unit}`}</span>
-			)
-		},
-	},
-	{
-		id: "memPeak",
-		accessorFn: (record) => record.memPeak,
-		invertSorting: true,
-		header: ({ column }) => <HeaderButton column={column} name={t`Memory Peak`} Icon={MemoryStickIcon} />,
-		cell: ({ getValue }) => {
-			const val = getValue() as number
-			if (!val) {
-				return <span className="ms-1.5 text-muted-foreground">N/A</span>
-			}
-			const formatted = formatBytes(val, false, undefined, false)
-			return (
-				<span className="ms-1.5 tabular-nums">{`${decimalString(formatted.value, formatted.value >= 10 ? 1 : 2)} ${formatted.unit}`}</span>
-			)
-		},
-	},
-	{
-		id: "updated",
-		invertSorting: true,
-		accessorFn: (record) => record.updated,
-		header: ({ column }) => <HeaderButton column={column} name={t`Updated`} Icon={ClockIcon} />,
-		cell: ({ getValue }) => {
-			const timestamp = getValue() as number
-			return (
-				<span className="ms-1.5 tabular-nums">
-					{hourWithSeconds(new Date(timestamp).toISOString())}
-				</span>
-			)
-		},
-	},
-]
-
-function HeaderButton({ column, name, Icon }: { column: Column<SystemdRecord>; name: string; Icon: React.ElementType }) {
-	const isSorted = column.getIsSorted()
-	return (
-		<Button
-			className={cn("h-9 px-3 flex items-center gap-2 duration-50", isSorted && "bg-accent/70 light:bg-accent text-accent-foreground/90")}
-			variant="ghost"
-			onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-		>
-			{Icon && <Icon className="size-4" />}
-			{name}
-			<ArrowUpDownIcon className="size-4" />
-		</Button>
-	)
-}
-
-export function getStatusColor(status: ServiceStatus) {
-	switch (status) {
-		case ServiceStatus.Active:
-			return "bg-green-500"
-		case ServiceStatus.Failed:
-			return "bg-red-500"
-		case ServiceStatus.Reloading:
-		case ServiceStatus.Activating:
-		case ServiceStatus.Deactivating:
-			return "bg-yellow-500"
-		default:
-			return "bg-zinc-500"
-	}
-}

internal/site/src/components/systemd-table/systemd-table.tsx

@@ -1,667 +0,0 @@
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
-import {
-	type ColumnFiltersState,
-	flexRender,
-	getCoreRowModel,
-	getFilteredRowModel,
-	getSortedRowModel,
-	type Row,
-	type SortingState,
-	type Table as TableType,
-	useReactTable,
-	type VisibilityState,
-} from "@tanstack/react-table"
-import { useVirtualizer, type VirtualItem } from "@tanstack/react-virtual"
-import { LoaderCircleIcon } from "lucide-react"
-import { listenKeys } from "nanostores"
-import { memo, type ReactNode, useEffect, useMemo, useRef, useState } from "react"
-import { getStatusColor, systemdTableCols } from "@/components/systemd-table/systemd-table-columns"
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
-import { Card, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-import { Input } from "@/components/ui/input"
-import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@/components/ui/sheet"
-import { TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { pb } from "@/lib/api"
-import { ServiceStatus, ServiceStatusLabels, type ServiceSubState, ServiceSubStateLabels } from "@/lib/enums"
-import { $allSystemsById } from "@/lib/stores"
-import { cn, decimalString, formatBytes, useBrowserStorage } from "@/lib/utils"
-import type { SystemdRecord, SystemdServiceDetails } from "@/types"
-import { Separator } from "../ui/separator"
-
-export default function SystemdTable({ systemId }: { systemId?: string }) {
-	const loadTime = Date.now()
-	const [data, setData] = useState<SystemdRecord[]>([])
-	const [sorting, setSorting] = useBrowserStorage<SortingState>(
-		`sort-sd-${systemId ? 1 : 0}`,
-		[{ id: systemId ? "name" : "system", desc: false }],
-		sessionStorage
-	)
-	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
-	const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({})
-	const [globalFilter, setGlobalFilter] = useState("")
-
-	// clear old data when systemId changes
-	useEffect(() => {
-		return setData([])
-	}, [systemId])
-
-
-	useEffect(() => {
-		const lastUpdated = data[0]?.updated ?? 0
-
-		function fetchData(systemId?: string) {
-			pb.collection<SystemdRecord>("systemd_services")
-				.getList(0, 2000, {
-					fields: "name,state,sub,cpu,cpuPeak,memory,memPeak,updated",
-					filter: systemId ? pb.filter("system={:system}", { system: systemId }) : undefined,
-				})
-				.then(
-					({ items }) =>
-						items.length &&
-						setData((curItems) => {
-							const lastUpdated = Math.max(items[0].updated, items.at(-1)?.updated ?? 0)
-							const systemdNames = new Set()
-							const newItems: SystemdRecord[] = []
-							for (const item of items) {
-								if (Math.abs(lastUpdated - item.updated) < 70_000) {
-									systemdNames.add(item.name)
-									newItems.push(item)
-								}
-							}
-							for (const item of curItems) {
-								if (!systemdNames.has(item.name) && lastUpdated - item.updated < 70_000) {
-									newItems.push(item)
-								}
-							}
-							return newItems
-						})
-				)
-		}
-
-		// initial load
-		fetchData(systemId)
-
-		// if no systemId, pull system containers after every system update
-		if (!systemId) {
-			return $allSystemsById.listen((_value, _oldValue, systemId) => {
-				// exclude initial load of systems
-				if (Date.now() - loadTime > 500) {
-					fetchData(systemId)
-				}
-			})
-		}
-
-		// if systemId, fetch containers after the system is updated
-		return listenKeys($allSystemsById, [systemId], (_newSystems) => {
-			// don't fetch data if the last update is less than 9.5 minutes
-			if (lastUpdated > Date.now() - 9.5 * 60 * 1000) {
-				return
-			}
-			fetchData(systemId)
-		})
-	}, [systemId])
-
-	const table = useReactTable({
-		data,
-		// columns: systemdTableCols.filter((col) => (systemId ? col.id !== "system" : true)),
-		columns: systemdTableCols,
-		getCoreRowModel: getCoreRowModel(),
-		getSortedRowModel: getSortedRowModel(),
-		getFilteredRowModel: getFilteredRowModel(),
-		onSortingChange: setSorting,
-		onColumnFiltersChange: setColumnFilters,
-		onColumnVisibilityChange: setColumnVisibility,
-		defaultColumn: {
-			sortUndefined: "last",
-			size: 100,
-			minSize: 0,
-		},
-		state: {
-			sorting,
-			columnFilters,
-			columnVisibility,
-			globalFilter,
-		},
-		onGlobalFilterChange: setGlobalFilter,
-		globalFilterFn: (row, _columnId, filterValue) => {
-			const service = row.original
-			const systemName = $allSystemsById.get()[service.system]?.name ?? ""
-			const name = service.name ?? ""
-			const statusLabel = ServiceStatusLabels[service.state as ServiceStatus] ?? ""
-			const subState = service.sub ?? ""
-			const searchString = `${systemName} ${name} ${statusLabel} ${subState}`.toLowerCase()
-
-			return (filterValue as string)
-				.toLowerCase()
-				.split(" ")
-				.every((term) => searchString.includes(term))
-		},
-	})
-
-	const rows = table.getRowModel().rows
-	const visibleColumns = table.getVisibleLeafColumns()
-
-	const statusTotals = useMemo(() => {
-		const totals = [0, 0, 0, 0, 0, 0]
-		for (const service of data) {
-			totals[service.state]++
-		}
-		return totals
-	}, [data])
-
-	if (!data.length && !globalFilter) {
-		return null
-	}
-
-	return (
-		<Card className="p-6 @container w-full">
-			<CardHeader className="p-0 mb-4">
-				<div className="grid md:flex gap-5 w-full items-end">
-					<div className="px-2 sm:px-1">
-						<CardTitle className="mb-2">
-							<Trans>Systemd Services</Trans>
-						</CardTitle>
-						<CardDescription className="flex items-center">
-							<Trans>Total: {data.length}</Trans>
-							<Separator orientation="vertical" className="h-4 mx-2 bg-primary/40" />
-							<Trans>Failed: {statusTotals[ServiceStatus.Failed]}</Trans>
-							<Separator orientation="vertical" className="h-4 mx-2 bg-primary/40" />
-							<Trans>Updated every 10 minutes.</Trans>
-						</CardDescription>
-					</div>
-					<Input
-						placeholder={t`Filter...`}
-						value={globalFilter}
-						onChange={(e) => setGlobalFilter(e.target.value)}
-						className="ms-auto px-4 w-full max-w-full md:w-64"
-					/>
-				</div>
-			</CardHeader>
-			<div className="rounded-md">
-				<AllSystemdTable table={table} rows={rows} colLength={visibleColumns.length} systemId={systemId} />
-			</div>
-		</Card>
-	)
-}
-
-const AllSystemdTable = memo(function AllSystemdTable({
-	table,
-	rows,
-	colLength,
-	systemId,
-}: {
-	table: TableType<SystemdRecord>
-	rows: Row<SystemdRecord>[]
-	colLength: number
-	systemId?: string
-}) {
-	// The virtualizer will need a reference to the scrollable container element
-	const scrollRef = useRef<HTMLDivElement>(null)
-	const activeService = useRef<SystemdRecord | null>(null)
-	const [sheetOpen, setSheetOpen] = useState(false)
-	const openSheet = (service: SystemdRecord) => {
-		activeService.current = service
-		setSheetOpen(true)
-	}
-
-	const virtualizer = useVirtualizer<HTMLDivElement, HTMLTableRowElement>({
-		count: rows.length,
-		estimateSize: () => 54,
-		getScrollElement: () => scrollRef.current,
-		overscan: 5,
-	})
-	const virtualRows = virtualizer.getVirtualItems()
-
-	const paddingTop = Math.max(0, virtualRows[0]?.start ?? 0 - virtualizer.options.scrollMargin)
-	const paddingBottom = Math.max(0, virtualizer.getTotalSize() - (virtualRows[virtualRows.length - 1]?.end ?? 0))
-
-	return (
-		<div
-			className={cn(
-				"h-min max-h-[calc(100dvh-17rem)] max-w-full relative overflow-auto border rounded-md",
-				// don't set min height if there are less than 2 rows, do set if we need to display the empty state
-				(!rows.length || rows.length > 2) && "min-h-50"
-			)}
-			ref={scrollRef}
-		>
-			{/* add header height to table size */}
-			<div style={{ height: `${virtualizer.getTotalSize() + 48}px`, paddingTop, paddingBottom }}>
-				<table className="text-sm w-full h-full text-nowrap">
-					<SystemdTableHead table={table} />
-					<TableBody>
-						{rows.length ? (
-							virtualRows.map((virtualRow) => {
-								const row = rows[virtualRow.index]
-								return <SystemdTableRow key={row.id} row={row} virtualRow={virtualRow} openSheet={openSheet} />
-							})
-						) : (
-							<TableRow>
-								<TableCell colSpan={colLength} className="h-37 text-center pointer-events-none">
-									<Trans>No results.</Trans>
-								</TableCell>
-							</TableRow>
-						)}
-					</TableBody>
-				</table>
-			</div>
-			<SystemdSheet
-				sheetOpen={sheetOpen}
-				setSheetOpen={setSheetOpen}
-				activeService={activeService}
-				systemId={systemId}
-			/>
-		</div>
-	)
-})
-
-function SystemdSheet({
-	sheetOpen,
-	setSheetOpen,
-	activeService,
-	systemId,
-}: {
-	sheetOpen: boolean
-	setSheetOpen: (open: boolean) => void
-	activeService: React.RefObject<SystemdRecord | null>
-	systemId?: string
-}) {
-	const service = activeService.current
-	const [details, setDetails] = useState<SystemdServiceDetails | null>(null)
-	const [isLoading, setIsLoading] = useState(false)
-	const [error, setError] = useState<string | null>(null)
-
-	useEffect(() => {
-		if (!sheetOpen || !service) {
-			return
-		}
-
-		setError(null)
-
-		let cancelled = false
-		setDetails(null)
-		setIsLoading(true)
-
-		pb.send<{ details: SystemdServiceDetails }>("/api/beszel/systemd/info", {
-			query: {
-				system: systemId,
-				service: service.name,
-			},
-		})
-			.then(({ details }) => {
-				if (cancelled) return
-				if (details) {
-					setDetails(details)
-				} else {
-					setDetails(null)
-					setError(t`No results found.`)
-				}
-			})
-			.catch((err) => {
-				if (cancelled) return
-				setError(err?.message ?? "Failed to load service details")
-				setDetails(null)
-			})
-			.finally(() => {
-				if (!cancelled) {
-					setIsLoading(false)
-				}
-			})
-
-		return () => {
-			cancelled = true
-		}
-	}, [sheetOpen, service, systemId])
-
-	if (!service) return null
-
-	const statusLabel = ServiceStatusLabels[service.state as ServiceStatus] ?? ""
-	const subStateLabel = ServiceSubStateLabels[service.sub as ServiceSubState] ?? ""
-
-	const notAvailable = <span className="text-muted-foreground">N/A</span>
-
-	const formatMemory = (value?: number | null) => {
-		if (value === undefined || value === null) {
-			return value === null ? t`Unlimited` : undefined
-		}
-		const { value: convertedValue, unit } = formatBytes(value, false, undefined, false)
-		const digits = convertedValue >= 10 ? 1 : 2
-		return `${decimalString(convertedValue, digits)} ${unit}`
-	}
-
-	const formatCpuTime = (ns?: number) => {
-		if (!ns) return undefined
-		const seconds = ns / 1_000_000_000
-		if (seconds >= 3600) {
-			const hours = Math.floor(seconds / 3600)
-			const minutes = Math.floor((seconds % 3600) / 60)
-			const secs = Math.floor(seconds % 60)
-			return [hours ? `${hours}h` : null, minutes ? `${minutes}m` : null, secs ? `${secs}s` : null]
-				.filter(Boolean)
-				.join(" ")
-		}
-		if (seconds >= 60) {
-			const minutes = Math.floor(seconds / 60)
-			const secs = Math.floor(seconds % 60)
-			return `${minutes}m ${secs}s`
-		}
-		if (seconds >= 1) {
-			return `${decimalString(seconds, 2)}s`
-		}
-		return `${decimalString(seconds * 1000, 2)}ms`
-	}
-
-	const formatTasks = (current?: number, max?: number) => {
-		const hasCurrent = typeof current === "number" && current >= 0
-		const hasMax = typeof max === "number" && max > 0 && max !== null
-		if (!hasCurrent && !hasMax) {
-			return undefined
-		}
-		return (
-			<>
-				{hasCurrent ? current : notAvailable}
-				{hasMax && (
-					<span className="text-muted-foreground ms-1.5">
-						{`(${t`limit`}: ${max})`}
-					</span>
-				)}
-				{max === null && (
-					<span className="text-muted-foreground ms-1.5">
-						{`(${t`limit`}: ${t`Unlimited`.toLowerCase()})`}
-					</span>
-				)}
-			</>
-		)
-	}
-
-	const formatTimestamp = (timestamp?: number) => {
-		if (!timestamp) return undefined
-		// systemd timestamps are in microseconds, convert to milliseconds for JavaScript Date
-		const date = new Date(timestamp / 1000)
-		if (Number.isNaN(date.getTime())) return undefined
-		return date.toLocaleString()
-	}
-
-	const activeStateValue = (() => {
-		const stateText = details?.ActiveState
-			? details.SubState
-				? `${details.ActiveState} (${details.SubState})`
-				: details.ActiveState
-			: subStateLabel
-				? `${statusLabel} (${subStateLabel})`
-				: statusLabel
-
-		for (const [index, status] of ServiceStatusLabels.entries()) {
-			if (details?.ActiveState?.toLowerCase() === status.toLowerCase()) {
-				service.state = index as ServiceStatus
-				break
-			}
-		}
-
-		return (
-			<div className="flex items-center gap-2">
-				<div className={cn("w-2 h-2 rounded-full flex-shrink-0", getStatusColor(service.state))} />
-				{stateText}
-			</div>
-		)
-	})()
-
-	const statusTextValue = details?.Result
-
-	const cpuTime = formatCpuTime(details?.CPUUsageNSec)
-	const tasks = formatTasks(details?.TasksCurrent, details?.TasksMax)
-	const memoryCurrent = formatMemory(details?.MemoryCurrent)
-	const memoryPeak = formatMemory(details?.MemoryPeak)
-	const memoryLimit = formatMemory(details?.MemoryLimit)
-	const restartsValue = typeof details?.NRestarts === "number" ? details.NRestarts : undefined
-	const mainPidValue = typeof details?.MainPID === "number" && details.MainPID > 0 ? details.MainPID : undefined
-	const execMainPidValue =
-		typeof details?.ExecMainPID === "number" && details.ExecMainPID > 0 && details.ExecMainPID !== details?.MainPID
-			? details.ExecMainPID
-			: undefined
-	const activeEnterTimestamp = formatTimestamp(details?.ActiveEnterTimestamp)
-	const activeExitTimestamp = formatTimestamp(details?.ActiveExitTimestamp)
-	const inactiveEnterTimestamp = formatTimestamp(details?.InactiveEnterTimestamp)
-	const execMainStartTimestamp = undefined // Property not available in current systemd interface
-
-	const renderRow = (key: string, label: ReactNode, value?: ReactNode, alwaysShow = false) => {
-		if (!alwaysShow && (value === undefined || value === null || value === "")) {
-			return null
-		}
-		return (
-			<tr key={key} className="border-b last:border-b-0">
-				<td className="px-3 py-2 font-medium bg-muted dark:bg-muted/40 align-top w-35">{label}</td>
-				<td className="px-3 py-2">{value ?? notAvailable}</td>
-			</tr>
-		)
-	}
-	
-	const capitalize = (str: string) => `${str.charAt(0).toUpperCase()}${str.slice(1).toLowerCase()}`
-
-	return (
-		<Sheet open={sheetOpen} onOpenChange={setSheetOpen}>
-			<SheetContent className="w-full sm:max-w-220 p-6 overflow-y-auto">
-				<SheetHeader className="p-0">
-					<SheetTitle>
-						<Trans>Service Details</Trans>
-					</SheetTitle>
-				</SheetHeader>
-				<div className="grid gap-6">
-					{isLoading && (
-						<div className="flex items-center gap-2 text-sm text-muted-foreground">
-							<LoaderCircleIcon className="size-4 animate-spin" />
-							<Trans>Loading...</Trans>
-						</div>
-					)}
-					{error && (
-						<Alert className="border-destructive/50 text-destructive dark:border-destructive/60 dark:text-destructive">
-							<AlertTitle>
-								<Trans>Error</Trans>
-							</AlertTitle>
-							<AlertDescription>{error}</AlertDescription>
-						</Alert>
-					)}
-
-					<div>
-						<div className="border rounded-md">
-							<table className="w-full text-sm">
-								<tbody>
-									{renderRow("name", t`Name`, service.name, true)}
-									{renderRow("description", t`Description`, details?.Description, true)}
-									{renderRow("loadState", t`Load state`, details?.LoadState, true)}
-									{renderRow(
-										"bootState",
-										t`Boot state`,
-										<div className="flex items-center">
-											{details?.UnitFileState}
-											{details?.UnitFilePreset && (
-												<span className="text-muted-foreground ms-1.5">(preset: {details?.UnitFilePreset})</span>
-											)}
-										</div>,
-										true
-									)}
-									{renderRow("unitFile", t`Unit file`, details?.FragmentPath, true)}
-									{renderRow("active", t`Active state`, activeStateValue, true)}
-									{renderRow("status", t`Status`, statusTextValue, true)}
-									{renderRow(
-										"documentation",
-										t`Documentation`,
-										Array.isArray(details?.Documentation) && details.Documentation.length > 0
-											? details.Documentation.join(", ")
-											: undefined
-									)}
-								</tbody>
-							</table>
-						</div>
-					</div>
-
-					<div>
-						<h3 className="text-sm font-medium mb-3">
-							<Trans>Runtime Metrics</Trans>
-						</h3>
-						<div className="border rounded-md">
-							<table className="w-full text-sm">
-								<tbody>
-									{renderRow("mainPid", t`Main PID`, mainPidValue, true)}
-									{renderRow("execMainPid", t`Exec main PID`, execMainPidValue)}
-									{renderRow("tasks", t`Tasks`, tasks, true)}
-									{renderRow("cpuTime", t`CPU time`, cpuTime)}
-									{renderRow("memory", t`Memory`, memoryCurrent, true)}
-									{renderRow("memoryPeak", capitalize(t`Memory Peak`), memoryPeak)}
-									{renderRow("memoryLimit", t`Memory limit`, memoryLimit)}
-									{renderRow("restarts", t`Restarts`, restartsValue, true)}
-								</tbody>
-							</table>
-						</div>
-					</div>
-
-					<div className="hidden has-[tr]:block">
-						<h3 className="text-sm font-medium mb-3">
-							<Trans>Relationships</Trans>
-						</h3>
-						<div className="border rounded-md">
-							<table className="w-full text-sm">
-								<tbody>
-									{renderRow(
-										"wants",
-										t`Wants`,
-										Array.isArray(details?.Wants) && details.Wants.length > 0 ? details.Wants.join(", ") : undefined
-									)}
-									{renderRow(
-										"requires",
-										t`Requires`,
-										Array.isArray(details?.Requires) && details.Requires.length > 0
-											? details.Requires.join(", ")
-											: undefined
-									)}
-									{renderRow(
-										"requiredBy",
-										t`Required by`,
-										Array.isArray(details?.RequiredBy) && details.RequiredBy.length > 0
-											? details.RequiredBy.join(", ")
-											: undefined
-									)}
-									{renderRow(
-										"conflicts",
-										t`Conflicts`,
-										Array.isArray(details?.Conflicts) && details.Conflicts.length > 0
-											? details.Conflicts.join(", ")
-											: undefined
-									)}
-									{renderRow(
-										"before",
-										t`Before`,
-										Array.isArray(details?.Before) && details.Before.length > 0 ? details.Before.join(", ") : undefined
-									)}
-									{renderRow(
-										"after",
-										t`After`,
-										Array.isArray(details?.After) && details.After.length > 0 ? details.After.join(", ") : undefined
-									)}
-									{renderRow(
-										"triggers",
-										t`Triggers`,
-										Array.isArray(details?.Triggers) && details.Triggers.length > 0
-											? details.Triggers.join(", ")
-											: undefined
-									)}
-									{renderRow(
-										"triggeredBy",
-										t`Triggered by`,
-										Array.isArray(details?.TriggeredBy) && details.TriggeredBy.length > 0
-											? details.TriggeredBy.join(", ")
-											: undefined
-									)}
-								</tbody>
-							</table>
-						</div>
-					</div>
-
-					<div className="hidden has-[tr]:block">
-						<h3 className="text-sm font-medium mb-3">
-							<Trans>Lifecycle</Trans>
-						</h3>
-						<div className="border rounded-md">
-							<table className="w-full text-sm">
-								<tbody>
-									{renderRow("activeSince", t`Became active`, activeEnterTimestamp)}
-									{service.state !== ServiceStatus.Active &&
-										renderRow("lastActive", t`Exited active`, activeExitTimestamp)}
-									{renderRow("inactiveSince", t`Became inactive`, inactiveEnterTimestamp)}
-									{renderRow("execMainStart", t`Process started`, execMainStartTimestamp)}
-									{/* {renderRow("invocationId", t`Invocation ID`, details?.InvocationID)} */}
-									{/* {renderRow("freezerState", t`Freezer State`, details?.FreezerState)} */}
-								</tbody>
-							</table>
-						</div>
-					</div>
-
-					<div className="hidden has-[tr]:block">
-						<h3 className="text-sm font-medium mb-3">
-							<Trans>Capabilities</Trans>
-						</h3>
-						<div className="border rounded-md">
-							<table className="w-full text-sm">
-								<tbody>
-									{renderRow("canStart", t`Can start`, details?.CanStart ? t`Yes` : t`No`)}
-									{renderRow("canStop", t`Can stop`, details?.CanStop ? t`Yes` : t`No`)}
-									{renderRow("canReload", t`Can reload`, details?.CanReload ? t`Yes` : t`No`)}
-									{/* {renderRow("refuseManualStart", t`Refuse Manual Start`, details?.RefuseManualStart ? t`Yes` : t`No`)}
-									{renderRow("refuseManualStop", t`Refuse Manual Stop`, details?.RefuseManualStop ? t`Yes` : t`No`)} */}
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-			</SheetContent>
-		</Sheet>
-	)
-}
-
-function SystemdTableHead({ table }: { table: TableType<SystemdRecord> }) {
-	return (
-		<TableHeader className="sticky top-0 z-50 w-full border-b-2">
-			{table.getHeaderGroups().map((headerGroup) => (
-				<tr key={headerGroup.id}>
-					{headerGroup.headers.map((header) => {
-						return (
-							<TableHead className="px-2" key={header.id}>
-								{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
-							</TableHead>
-						)
-					})}
-				</tr>
-			))}
-		</TableHeader>
-	)
-}
-
-const SystemdTableRow = memo(function SystemdTableRow({
-	row,
-	virtualRow,
-	openSheet,
-}: {
-	row: Row<SystemdRecord>
-	virtualRow: VirtualItem
-	openSheet: (service: SystemdRecord) => void
-}) {
-	return (
-		<TableRow
-			data-state={row.getIsSelected() && "selected"}
-			className="cursor-pointer transition-opacity"
-			onClick={() => openSheet(row.original)}
-		>
-			{row.getVisibleCells().map((cell) => (
-				<TableCell
-					key={cell.id}
-					className="py-0"
-					style={{
-						height: virtualRow.size,
-					}}
-				>
-					{flexRender(cell.column.columnDef.cell, cell.getContext())}
-				</TableCell>
-			))}
-		</TableRow>
-	)
-})

internal/site/src/components/systems-table/systems-table-columns.tsx

@@ -1,4 +1,3 @@
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: Hooks live inside memoized column definitions */
 import { t } from "@lingui/core/macro"
 import { Trans, useLingui } from "@lingui/react/macro"
 import { useStore } from "@nanostores/react"
@@ -17,14 +16,12 @@ import {
 	PenBoxIcon,
 	PlayCircleIcon,
 	ServerIcon,
-	TerminalSquareIcon,
 	Trash2Icon,
 	WifiIcon,
 } from "lucide-react"
 import { memo, useMemo, useRef, useState } from "react"
-import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip"
 import { isReadOnlyUser, pb } from "@/lib/api"
-import { BatteryState, ConnectionType, connectionTypeLabels, MeterState, SystemStatus } from "@/lib/enums"
+import { ConnectionType, connectionTypeLabels, MeterState, SystemStatus } from "@/lib/enums"
 import { $longestSystemNameLen, $userSettings } from "@/lib/stores"
 import {
 	cn,
@@ -35,7 +32,6 @@ import {
 	getMeterState,
 	parseSemVer,
 } from "@/lib/utils"
-import { batteryStateTranslations } from "@/lib/i18n"
 import type { SystemRecord } from "@/types"
 import { SystemDialog } from "../add-system"
 import AlertButton from "../alerts/alert-button"
@@ -59,18 +55,7 @@ import {
 	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "../ui/dropdown-menu"
-import {
-	BatteryMediumIcon,
-	EthernetIcon,
-	GpuIcon,
-	HourglassIcon,
-	ThermometerIcon,
-	WebSocketIcon,
-	BatteryHighIcon,
-	BatteryLowIcon,
-	PlugChargingIcon,
-	BatteryFullIcon,
-} from "../ui/icons"
+import { EthernetIcon, GpuIcon, HourglassIcon, ThermometerIcon, WebSocketIcon } from "../ui/icons"
 
 const STATUS_COLORS = {
 	[SystemStatus.Up]: "bg-green-500",
@@ -83,7 +68,7 @@ const STATUS_COLORS = {
  * @param viewMode - "table" or "grid"
  * @returns - Column definitions for the systems table
  */
-export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<SystemRecord>[] {
+export default function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<SystemRecord>[] {
 	return [
 		{
 			// size: 200,
@@ -148,7 +133,7 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 			header: sortableHeader,
 		},
 		{
-			accessorFn: ({ info }) => info.cpu || undefined,
+			accessorFn: ({ info }) => info.cpu,
 			id: "cpu",
 			name: () => t`CPU`,
 			cell: TableCellWithMeter,
@@ -157,7 +142,7 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 		},
 		{
 			// accessorKey: "info.mp",
-			accessorFn: ({ info }) => info.mp || undefined,
+			accessorFn: ({ info }) => info.mp,
 			id: "memory",
 			name: () => t`Memory`,
 			cell: TableCellWithMeter,
@@ -165,15 +150,15 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 			header: sortableHeader,
 		},
 		{
-			accessorFn: ({ info }) => info.dp || undefined,
+			accessorFn: ({ info }) => info.dp,
 			id: "disk",
 			name: () => t`Disk`,
-			cell: DiskCellWithMultiple,
+			cell: TableCellWithMeter,
 			Icon: HardDriveIcon,
 			header: sortableHeader,
 		},
 		{
-			accessorFn: ({ info }) => info.g || undefined,
+			accessorFn: ({ info }) => info.g,
 			id: "gpu",
 			name: () => "GPU",
 			cell: TableCellWithMeter,
@@ -186,9 +171,9 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 				const sum = info.la?.reduce((acc, curr) => acc + curr, 0)
 				// TODO: remove this in future release in favor of la array
 				if (!sum) {
-					return (info.l1 ?? 0) + (info.l5 ?? 0) + (info.l15 ?? 0) || undefined
+					return (info.l1 ?? 0) + (info.l5 ?? 0) + (info.l15 ?? 0)
 				}
-				return sum || undefined
+				return sum
 			},
 			name: () => t({ message: "Load Avg", comment: "Short label for load average" }),
 			size: 0,
@@ -231,7 +216,7 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 			},
 		},
 		{
-			accessorFn: ({ info }) => info.bb || (info.b || 0) * 1024 * 1024 || undefined,
+			accessorFn: ({ info }) => info.bb || (info.b || 0) * 1024 * 1024,
 			id: "net",
 			name: () => t`Net`,
 			size: 0,
@@ -243,7 +228,7 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 				if (sys.status === SystemStatus.Paused) {
 					return null
 				}
-				const { value, unit } = formatBytes((info.getValue() || 0) as number, true, userSettings.unitNet, false)
+				const { value, unit } = formatBytes(info.getValue() as number, true, userSettings.unitNet, false)
 				return (
 					<span className="tabular-nums whitespace-nowrap">
 						{decimalString(value, value >= 100 ? 1 : 2)} {unit}
@@ -273,95 +258,11 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 				)
 			},
 		},
-		{
-			accessorFn: ({ info }) => info.bat?.[0],
-			id: "battery",
-			name: () => t({ message: "Bat", comment: "Battery label in systems table header" }),
-			size: 70,
-			Icon: BatteryMediumIcon,
-			header: sortableHeader,
-			hideSort: true,
-			cell(info) {
-				const [pct, state] = info.row.original.info.bat ?? []
-				if (pct === undefined) {
-					return null
-				}
-
-				const iconColor = pct < 10 ? "text-red-500" : pct < 25 ? "text-yellow-500" : "text-muted-foreground"
-
-				let Icon = PlugChargingIcon
-
-				if (state !== BatteryState.Charging) {
-					if (pct < 25) {
-						Icon = BatteryLowIcon
-					} else if (pct < 75) {
-						Icon = BatteryMediumIcon
-					} else if (pct < 95) {
-						Icon = BatteryHighIcon
-					} else {
-						Icon = BatteryFullIcon
-					}
-				}
-
-				const stateLabel =
-					state !== undefined ? (batteryStateTranslations[state as BatteryState]?.() ?? undefined) : undefined
-
-				return (
-					<Link
-						tabIndex={-1}
-						href={getPagePath($router, "system", { id: info.row.original.id })}
-						className="flex items-center gap-1 tabular-nums tracking-tight relative z-10"
-						title={stateLabel}
-					>
-						<Icon className={cn("size-3.5", iconColor)} />
-						<span className="min-w-10">{pct}%</span>
-					</Link>
-				)
-			},
-		},
-		{
-			accessorFn: ({ info }) => info.sv?.[0],
-			id: "services",
-			name: () => t`Services`,
-			size: 50,
-			Icon: TerminalSquareIcon,
-			header: sortableHeader,
-			hideSort: true,
-			sortingFn: (a, b) => {
-				// sort priorities: 1) failed services, 2) total services
-				const [totalCountA, numFailedA] = a.original.info.sv ?? [0, 0]
-				const [totalCountB, numFailedB] = b.original.info.sv ?? [0, 0]
-				if (numFailedA !== numFailedB) {
-					return numFailedA - numFailedB
-				}
-				return totalCountA - totalCountB
-			},
-			cell(info) {
-				const sys = info.row.original
-				const [totalCount, numFailed] = sys.info.sv ?? [0, 0]
-				if (sys.status !== SystemStatus.Up || totalCount === 0) {
-					return null
-				}
-				return (
-					<span className="tabular-nums whitespace-nowrap flex gap-1.5 items-center">
-						<span
-							className={cn("block size-2 rounded-full", {
-								[STATUS_COLORS[SystemStatus.Down]]: numFailed > 0,
-								[STATUS_COLORS[SystemStatus.Up]]: numFailed === 0,
-							})}
-						/>
-						{totalCount}{" "}
-						<span className="text-muted-foreground text-sm -ms-0.5">
-							({t`Failed`.toLowerCase()}: {numFailed})
-						</span>
-					</span>
-				)
-			},
-		},
 		{
 			accessorFn: ({ info }) => info.v,
 			id: "agent",
 			name: () => t`Agent`,
+			// invertSorting: true,
 			size: 50,
 			Icon: WifiIcon,
 			hideSort: true,
@@ -453,101 +354,6 @@ function TableCellWithMeter(info: CellContext<SystemRecord, unknown>) {
 	)
 }
 
-function DiskCellWithMultiple(info: CellContext<SystemRecord, unknown>) {
-	const { info: sysInfo, status, id } = info.row.original
-	const extraFs = Object.entries(sysInfo.efs ?? {})
-
-	if (extraFs.length === 0) {
-		return TableCellWithMeter(info)
-	}
-
-	const rootDiskPct = sysInfo.dp
-
-	// sort extra disks by percentage descending
-	extraFs.sort((a, b) => b[1] - a[1])
-
-	function getIndicatorColor(pct: number) {
-		const threshold = getMeterState(pct)
-		return (
-			(status !== SystemStatus.Up && STATUS_COLORS.paused) ||
-			(threshold === MeterState.Good && STATUS_COLORS.up) ||
-			(threshold === MeterState.Warn && STATUS_COLORS.pending) ||
-			STATUS_COLORS.down
-		)
-	}
-
-	function getMeterClass(pct: number) {
-		return cn("h-full", getIndicatorColor(pct))
-	}
-
-	// Extra disk indicators (max 3 dots - one per state if any disk exists in range)
-	const stateColors = [STATUS_COLORS.up, STATUS_COLORS.pending, STATUS_COLORS.down]
-	const extraDiskIndicators =
-		status !== SystemStatus.Up
-			? []
-			: [...new Set(extraFs.map(([, pct]) => getMeterState(pct)))].sort().map((state) => stateColors[state])
-
-	return (
-		<Tooltip>
-			<TooltipTrigger asChild>
-				<Link
-					href={getPagePath($router, "system", { id })}
-					tabIndex={-1}
-					className="flex flex-col gap-0.5 w-full relative z-10"
-				>
-					<div className="flex gap-2 items-center tabular-nums tracking-tight">
-						<span className="min-w-8 shrink-0">{decimalString(rootDiskPct, rootDiskPct >= 10 ? 1 : 2)}%</span>
-						<span className="flex-1 min-w-8 flex items-center gap-0.5 px-1 justify-end bg-muted h-[1em] rounded-sm overflow-hidden relative">
-							{/* Root disk */}
-							<span
-								className={cn("absolute inset-0", getMeterClass(rootDiskPct))}
-								style={{ width: `${rootDiskPct}%` }}
-							></span>
-							{/* Extra disk indicators */}
-							{extraDiskIndicators.map((color) => (
-								<span
-									key={color}
-									className={cn("size-1.5 rounded-full shrink-0 outline-[0.5px] outline-muted", color)}
-								/>
-							))}
-						</span>
-					</div>
-				</Link>
-			</TooltipTrigger>
-			<TooltipContent side="right" className="max-w-xs pb-2">
-				<div className="grid gap-1">
-					<div className="grid gap-0.5">
-						<div className="text-[0.65rem] text-muted-foreground uppercase tracking-wide tabular-nums">
-							<Trans context="Root disk label">Root</Trans>
-						</div>
-						<div className="flex gap-2 items-center tabular-nums text-xs">
-							<span className="min-w-7">{decimalString(rootDiskPct, rootDiskPct >= 10 ? 1 : 2)}%</span>
-							<span className="flex-1 min-w-12 grid bg-muted h-2.5 rounded-sm overflow-hidden">
-								<span className={getMeterClass(rootDiskPct)} style={{ width: `${rootDiskPct}%` }}></span>
-							</span>
-						</div>
-					</div>
-					{extraFs.map(([name, pct]) => {
-						return (
-							<div key={name} className="grid gap-0.5">
-								<div className="text-[0.65rem] max-w-40 text-muted-foreground uppercase tracking-wide truncate">
-									{name}
-								</div>
-								<div className="flex gap-2 items-center tabular-nums text-xs">
-									<span className="min-w-7">{decimalString(pct, pct >= 10 ? 1 : 2)}%</span>
-									<span className="flex-1 min-w-12 grid bg-muted h-2.5 rounded-sm overflow-hidden">
-										<span className={getMeterClass(pct)} style={{ width: `${pct}%` }}></span>
-									</span>
-								</div>
-							</div>
-						)
-					})}
-				</div>
-			</TooltipContent>
-		</Tooltip>
-	)
-}
-
 export function IndicatorDot({ system, className }: { system: SystemRecord; className?: ClassValue }) {
 	className ||= STATUS_COLORS[system.status as keyof typeof STATUS_COLORS] || ""
 	return (
@@ -657,5 +463,5 @@ export const ActionsButton = memo(({ system }: { system: SystemRecord }) => {
 				</AlertDialog>
 			</>
 		)
-	}, [id, status, host, name, system, t, deleteOpen, editOpen])
+	}, [id, status, host, name, t, deleteOpen, editOpen])
 })

internal/site/src/components/systems-table/systems-table.tsx

@@ -24,7 +24,6 @@ import {
 	LayoutGridIcon,
 	LayoutListIcon,
 	Settings2Icon,
-	XIcon,
 } from "lucide-react"
 import { memo, useEffect, useMemo, useRef, useState } from "react"
 import { Button } from "@/components/ui/button"
@@ -48,7 +47,7 @@ import type { SystemRecord } from "@/types"
 import AlertButton from "../alerts/alert-button"
 import { $router, Link } from "../router"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/card"
-import { SystemsTableColumns, ActionsButton, IndicatorDot } from "./systems-table-columns"
+import SystemsTableColumns, { ActionsButton, IndicatorDot } from "./systems-table-columns"
 
 type ViewMode = "table" | "grid"
 type StatusFilter = "all" | SystemRecord["status"]
@@ -61,7 +60,7 @@ export default function SystemsTable() {
 	const upSystems = $upSystems.get()
 	const pausedSystems = $pausedSystems.get()
 	const { i18n, t } = useLingui()
-	const [filter, setFilter] = useState<string>("")
+	const [filter, setFilter] = useState<string>()
 	const [statusFilter, setStatusFilter] = useState<StatusFilter>("all")
 	const [sorting, setSorting] = useBrowserStorage<SortingState>(
 		"sortMode",
@@ -146,26 +145,7 @@ export default function SystemsTable() {
 					</div>
 
 					<div className="flex gap-2 ms-auto w-full md:w-80">
-						<div className="relative flex-1">
-							<Input
-								placeholder={t`Filter...`}
-								onChange={(e) => setFilter(e.target.value)}
-								value={filter}
-								className="ps-4 pe-10 w-full"
-							/>
-							{filter && (
-								<Button
-									type="button"
-									variant="ghost"
-									size="icon"
-									aria-label={t`Clear`}
-									className="absolute right-1 top-1/2 -translate-y-1/2 h-7 w-7 text-muted-foreground"
-									onClick={() => setFilter("")}
-								>
-									<XIcon className="h-4 w-4" />
-								</Button>
-							)}
-						</div>
+						<Input placeholder={t`Filter...`} onChange={(e) => setFilter(e.target.value)} className="px-4" />
 						<DropdownMenu>
 							<DropdownMenuTrigger asChild>
 								<Button variant="outline">
@@ -298,7 +278,6 @@ export default function SystemsTable() {
 		upSystemsLength,
 		downSystemsLength,
 		pausedSystemsLength,
-		filter,
 	])
 
 	return (

internal/site/src/components/ui/chart.tsx

@@ -1,11 +1,8 @@
 import type { JSX } from "react"
-import { useLingui } from "@lingui/react/macro"
 import * as React from "react"
 import * as RechartsPrimitive from "recharts"
 import { chartTimeData, cn } from "@/lib/utils"
 import type { ChartData } from "@/types"
-import { Separator } from "./separator"
-import { AxisDomain } from "recharts/types/util/types"
 
 // Format: { THEME_NAME: CSS_SELECTOR }
 const THEMES = { light: "", dark: ".dark" } as const
@@ -103,8 +100,6 @@ const ChartTooltipContent = React.forwardRef<
 		filter?: string
 		contentFormatter?: (item: any, key: string) => React.ReactNode | string
 		truncate?: boolean
-		showTotal?: boolean
-		totalLabel?: React.ReactNode
 	}
 >(
 	(
@@ -126,16 +121,11 @@ const ChartTooltipContent = React.forwardRef<
 			itemSorter,
 			contentFormatter: content = undefined,
 			truncate = false,
-			showTotal = false,
-			totalLabel,
 		},
 		ref
 	) => {
 		// const { config } = useChart()
 		const config = {}
-		const { t } = useLingui()
-		const totalLabelNode = totalLabel ?? t`Total`
-		const totalName = typeof totalLabelNode === "string" ? totalLabelNode : t`Total`
 
 		React.useMemo(() => {
 			if (filter) {
@@ -151,76 +141,6 @@ const ChartTooltipContent = React.forwardRef<
 			}
 		}, [itemSorter, payload])
 
-		const totalValueDisplay = React.useMemo(() => {
-			if (!showTotal || !payload?.length) {
-				return null
-			}
-
-			let totalValue = 0
-			let hasNumericValue = false
-			const aggregatedNestedValues: Record<string, number> = {}
-
-			for (const item of payload) {
-				const numericValue = typeof item.value === "number" ? item.value : Number(item.value)
-				if (Number.isFinite(numericValue)) {
-					totalValue += numericValue
-					hasNumericValue = true
-				}
-
-				if (content && item?.payload) {
-					const payloadKey = `${nameKey || item.name || item.dataKey || "value"}`
-					const nestedPayload = (item.payload as Record<string, unknown> | undefined)?.[payloadKey]
-
-					if (nestedPayload && typeof nestedPayload === "object") {
-						for (const [nestedKey, nestedValue] of Object.entries(nestedPayload)) {
-							if (typeof nestedValue === "number" && Number.isFinite(nestedValue)) {
-								aggregatedNestedValues[nestedKey] = (aggregatedNestedValues[nestedKey] ?? 0) + nestedValue
-							}
-						}
-					}
-				}
-			}
-
-			if (!hasNumericValue) {
-				return null
-			}
-
-			const totalKey = "__total__"
-			const totalItem: any = {
-				value: totalValue,
-				name: totalName,
-				dataKey: totalKey,
-				color,
-			}
-
-			if (content) {
-				const basePayload =
-					payload[0]?.payload && typeof payload[0].payload === "object"
-						? { ...(payload[0].payload as Record<string, unknown>) }
-						: {}
-				totalItem.payload = {
-					...basePayload,
-					[totalKey]: aggregatedNestedValues,
-				}
-			}
-
-			if (typeof formatter === "function") {
-				return formatter(
-					totalValue,
-					totalName,
-					totalItem,
-					payload.length,
-					totalItem.payload ?? payload[0]?.payload
-				)
-			}
-
-			if (content) {
-				return content(totalItem, totalKey)
-			}
-
-			return `${totalValue.toLocaleString()}${unit ?? ""}`
-		}, [color, content, formatter, nameKey, payload, showTotal, totalName, unit])
-
 		const tooltipLabel = React.useMemo(() => {
 			if (hideLabel || !payload?.length) {
 				return null
@@ -322,15 +242,6 @@ const ChartTooltipContent = React.forwardRef<
 							</div>
 						)
 					})}
-					{totalValueDisplay ? (
-						<>
-							<Separator className="mt-0.5" />
-							<div className="flex items-center justify-between gap-2 -mt-0.75 font-medium">
-								<span className="text-muted-foreground ps-3">{totalLabelNode}</span>
-								<span>{totalValueDisplay}</span>
-							</div>
-						</>
-					) : null}
 				</div>
 			</div>
 		)
@@ -346,17 +257,14 @@ const ChartLegendContent = React.forwardRef<
 	Pick<RechartsPrimitive.LegendProps, "payload" | "verticalAlign"> & {
 		hideIcon?: boolean
 		nameKey?: string
-		reverse?: boolean
 	}
->(({ className, payload, verticalAlign = "bottom", reverse = false }, ref) => {
+>(({ className, payload, verticalAlign = "bottom" }, ref) => {
 	// const { config } = useChart()
 
 	if (!payload?.length) {
 		return null
 	}
 
-	const reversedPayload = reverse ? [...payload].reverse() : payload
-
 	return (
 		<div
 			ref={ref}
@@ -366,7 +274,7 @@ const ChartLegendContent = React.forwardRef<
 				className
 			)}
 		>
-			{reversedPayload.map((item) => {
+			{payload.map((item) => {
 				// const key = `${nameKey || item.dataKey || 'value'}`
 				// const itemConfig = getPayloadConfigFromPayload(config, item, key)
 
@@ -455,15 +363,3 @@ export {
 	xAxis,
 	// ChartStyle,
 }
-
-export function pinnedAxisDomain(): AxisDomain {
-	return [0, (dataMax: number) => {
-		if (dataMax > 10) {
-			return Math.round(dataMax)
-		}
-		if (dataMax > 1) {
-			return Math.round(dataMax / 0.1) * 0.1
-		}
-		return dataMax
-	}]
-}

internal/site/src/components/ui/icons.tsx

@@ -131,7 +131,6 @@ export function HourglassIcon(props: SVGProps<SVGSVGElement>) {
 	)
 }
 
-// Apache 2.0 https://github.com/Templarian/MaterialDesign/blob/master/LICENSE
 export function WebSocketIcon(props: SVGProps<SVGSVGElement>) {
 	return (
 		<svg viewBox="0 0 256 193" {...props} fill="currentColor">
@@ -140,48 +139,3 @@ export function WebSocketIcon(props: SVGProps<SVGSVGElement>) {
 		</svg>
 	)
 }
-
-// Apache 2.0 https://github.com/Templarian/MaterialDesign/blob/master/LICENSE
-export function BatteryMediumIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 24 24" {...props} fill="currentColor">
-			<path d="M16 13H8V6h8m.67-2H15V2H9v2H7.33A1.33 1.33 0 0 0 6 5.33v15.34C6 21.4 6.6 22 7.33 22h9.34A1.33 1.33 0 0 0 18 20.67V5.33C18 4.6 17.4 4 16.67 4" />
-		</svg>
-	)
-}
-
-// Apache 2.0 https://github.com/Templarian/MaterialDesign/blob/master/LICENSE
-export function BatteryLowIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 24 24" {...props} fill="currentColor">
-			<path d="M16 20H8V6h8m.67-2H15V2H9v2H7.33C6.6 4 6 4.6 6 5.33v15.34C6 21.4 6.6 22 7.33 22h9.34c.74 0 1.33-.59 1.33-1.33V5.33C18 4.6 17.4 4 16.67 4M15 16H9v3h6zm0-4.5H9v3h6z" />
-		</svg>
-	)
-}
-
-// Apache 2.0 https://github.com/Templarian/MaterialDesign/blob/master/LICENSE
-export function BatteryHighIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 24 24" {...props} fill="currentColor">
-			<path d="M16 9H8V6h8m.67-2H15V2H9v2H7.33A1.33 1.33 0 0 0 6 5.33v15.34C6 21.4 6.6 22 7.33 22h9.34A1.33 1.33 0 0 0 18 20.67V5.33C18 4.6 17.4 4 16.67 4" />
-		</svg>
-	)
-}
-
-// Apache 2.0 https://github.com/Templarian/MaterialDesign/blob/master/LICENSE
-export function BatteryFullIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 24 24" {...props} fill="currentColor">
-			<path d="M16.67 4H15V2H9v2H7.33A1.33 1.33 0 0 0 6 5.33v15.34C6 21.4 6.6 22 7.33 22h9.34A1.33 1.33 0 0 0 18 20.67V5.33C18 4.6 17.4 4 16.67 4" />
-		</svg>
-	)
-}
-
-// https://github.com/phosphor-icons/core (MIT license)
-export function PlugChargingIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 256 256" {...props} fill="currentColor">
-			<path d="M224,48H180V16a12,12,0,0,0-24,0V48H100V16a12,12,0,0,0-24,0V48H32.55C24.4,48,20,54.18,20,60A12,12,0,0,0,32,72H44v92a44.05,44.05,0,0,0,44,44h28v32a12,12,0,0,0,24,0V208h28a44.05,44.05,0,0,0,44-44V72h12a12,12,0,0,0,0-24ZM188,164a20,20,0,0,1-20,20H88a20,20,0,0,1-20-20V72H188Zm-85.86-29.17a12,12,0,0,1-1.38-11l12-32a12,12,0,1,1,22.48,8.42L129.32,116H144a12,12,0,0,1,11.24,16.21l-12,32a12,12,0,0,1-22.48-8.42L126.68,140H112A12,12,0,0,1,102.14,134.83Z" />
-		</svg>
-	)
-}

internal/site/src/index.css

@@ -32,9 +32,6 @@
 	--chart-4: hsl(280 65% 60%);
 	--chart-5: hsl(340 75% 55%);
 	--table-header: hsl(225, 6%, 97%);
-	--chart-saturation: 65%;
-	--chart-lightness: 50%;
-	--container: 1500px;
 }
 
 .dark {
@@ -54,13 +51,11 @@
 	--accent: hsl(220 5% 15.5%);
 	--accent-foreground: hsl(220 2% 98%);
 	--destructive: hsl(0 62% 46%);
-	--border: hsl(220 3% 17%);
+	--border: hsl(220 3% 16%);
 	--input: hsl(220 4% 22%);
 	--ring: hsl(220 4% 80%);
 	--table-header: hsl(220, 6%, 13%);
 	--radius: 0.8rem;
-	--chart-saturation: 60%;
-	--chart-lightness: 55%;
 }
 
 @theme inline {
@@ -117,6 +112,7 @@
 }
 
 @layer utilities {
+
 	/* Fonts */
 	@supports (font-variation-settings: normal) {
 		:root {
@@ -141,7 +137,6 @@
 
 	body {
 		@apply bg-background text-foreground;
-		font-variant-ligatures: no-contextual;
 	}
 
 	button {
@@ -150,8 +145,7 @@
 }
 
 @utility container {
-	max-width: var(--container);
-	@apply mx-auto px-4;
+	@apply max-w-370 mx-auto px-4;
 }
 
 @utility link {
@@ -161,6 +155,10 @@
 @utility ns-dialog {
 	/* New system dialog width */
 	min-width: 30.3rem;
+
+	:where(:lang(zh), :lang(zh-CN), :lang(ko)) & {
+		min-width: 27.9rem;
+	}
 }
 
 .recharts-tooltip-wrapper {
@@ -170,4 +168,4 @@
 
 .recharts-yAxis {
 	@apply tabular-nums;
-}
+}

internal/site/src/lib/alerts.ts

@@ -1,11 +1,10 @@
 import { t } from "@lingui/core/macro"
-import { CpuIcon, HardDriveIcon, MemoryStickIcon, ServerIcon } from "lucide-react"
+import { CpuIcon, HardDriveIcon, HourglassIcon, MemoryStickIcon, ServerIcon, ThermometerIcon } from "lucide-react"
 import type { RecordSubscription } from "pocketbase"
-import { EthernetIcon, GpuIcon } from "@/components/ui/icons"
+import { EthernetIcon } from "@/components/ui/icons"
 import { $alerts } from "@/lib/stores"
 import type { AlertInfo, AlertRecord } from "@/types"
 import { pb } from "./api"
-import { ThermometerIcon, BatteryMediumIcon, HourglassIcon } from "@/components/ui/icons"
 
 /** Alert info for each alert type */
 export const alertInfo: Record<string, AlertInfo> = {
@@ -42,12 +41,6 @@ export const alertInfo: Record<string, AlertInfo> = {
 		desc: () => t`Triggers when combined up/down exceeds a threshold`,
 		max: 125,
 	},
-	GPU: {
-		name: () => t`GPU Usage`,
-		unit: "%",
-		icon: GpuIcon,
-		desc: () => t`Triggers when GPU usage exceeds a threshold`,
-	},
 	Temperature: {
 		name: () => t`Temperature`,
 		unit: "°C",
@@ -84,14 +77,6 @@ export const alertInfo: Record<string, AlertInfo> = {
 		step: 0.1,
 		desc: () => t`Triggers when 15 minute load average exceeds a threshold`,
 	},
-	Battery: {
-		name: () => t`Battery`,
-		unit: "%",
-		icon: BatteryMediumIcon,
-		desc: () => t`Triggers when battery charge drops below a threshold`,
-		start: 20,
-		invert: true,
-	},
 } as const
 
 /** Helper to manage user alerts */

internal/site/src/lib/enums.ts

@@ -71,26 +71,3 @@ export enum ConnectionType {
 }
 
 export const connectionTypeLabels = ["", "SSH", "WebSocket"] as const
-
-/** Systemd service state */
-export enum ServiceStatus {
-	Active,
-	Inactive,
-	Failed,
-	Activating,
-	Deactivating,
-	Reloading,
-}
-
-export const ServiceStatusLabels = ["Active", "Inactive", "Failed", "Activating", "Deactivating", "Reloading"] as const
-
-/** Systemd service sub state */
-export enum ServiceSubState {
-	Dead,
-	Running,
-	Exited,
-	Failed,
-	Unknown,
-}
-
-export const ServiceSubStateLabels = ["Dead", "Running", "Exited", "Failed", "Unknown"] as const

internal/site/src/lib/i18n.ts

@@ -7,15 +7,13 @@ import { messages as enMessages } from "@/locales/en/en"
 import { BatteryState } from "./enums"
 import { $direction } from "./stores"
 
-const rtlLanguages = new Set(["ar", "fa", "he"])
-
 // activates locale
 function activateLocale(locale: string, messages: Messages = enMessages) {
 	i18n.load(locale, messages)
 	i18n.activate(locale)
 	document.documentElement.lang = locale
 	localStorage.setItem("lang", locale)
-	$direction.set(rtlLanguages.has(locale) ? "rtl" : "ltr")
+	$direction.set(locale.startsWith("ar") || locale.startsWith("fa") ? "rtl" : "ltr")
 }
 
 // dynamically loads translations for the given locale

internal/site/src/lib/languages.ts

@@ -44,11 +44,6 @@ export default [
 		label: "Français",
 		e: "🇫🇷",
 	},
-	{
-		lang: "he",
-		label: "עברית",
-		e: "🕎",
-	},
 	{
 		lang: "hr",
 		label: "Hrvatski",
@@ -94,6 +89,11 @@ export default [
 		label: "Português",
 		e: "🇧🇷",
 	},
+	{
+		lang: "tr",
+		label: "Türkçe",
+		e: "🇹🇷",
+	},
 	{
 		lang: "ru",
 		label: "Русский",
@@ -104,21 +104,11 @@ export default [
 		label: "Slovenščina",
 		e: "🇸🇮",
 	},
-	{
-		lang: "sr",
-		label: "Српски",
-		e: "🇷🇸",
-	},
 	{
 		lang: "sv",
 		label: "Svenska",
 		e: "🇸🇪",
 	},
-	{
-		lang: "tr",
-		label: "Türkçe",
-		e: "🇹🇷",
-	},
 	{
 		lang: "uk",
 		label: "Українська",

internal/site/src/lib/utils.ts

@@ -287,7 +287,7 @@ export function formatBytes(
 	}
 }
 
-export const chartMargin = { top: 12, right: 5 }
+export const chartMargin = { top: 12 }
 
 /**
  * Retuns value of system host, truncating full path if socket.