support ZFS ARC on freebsd

- Match FILESYSTEM directly against I/O devices if partition lookup
fails
- Fall back to the most active I/O device if no root device is detected
- Add WARN logs in final fallback case to most active device

agent/cpu.go

@@ -14,10 +14,10 @@ var lastPerCoreCpuTimes = make(map[uint16][]cpu.TimesStat)
 // init initializes the CPU monitoring by storing the initial CPU times
 // for the default 60-second cache interval.
 func init() {
-	if times, err := cpu.Times(false); err == nil {
+	if times, err := cpu.Times(false); err == nil && len(times) > 0 {
 		lastCpuTimes[60000] = times[0]
 	}
-	if perCoreTimes, err := cpu.Times(true); err == nil {
+	if perCoreTimes, err := cpu.Times(true); err == nil && len(perCoreTimes) > 0 {
 		lastPerCoreCpuTimes[60000] = perCoreTimes
 	}
 }

agent/disk.go

@@ -78,14 +78,21 @@ func (a *Agent) initializeDiskInfo() {
 		if _, exists := a.fsStats[key]; !exists {
 			if root {
 				slog.Info("Detected root device", "name", key)
-				// Check if root device is in /proc/diskstats. Do not guess a
-				// fallback device for root: that can misattribute root I/O to a
-				// different disk while usage remains tied to root mountpoint.
+				// Try to map root device to a diskIoCounters entry. First
+				// checks for an exact key match, then uses findIoDevice for
+				// normalized / prefix-based matching (e.g. nda0p2 → nda0),
+				// and finally falls back to the FILESYSTEM env var.
 				if _, ioMatch = diskIoCounters[key]; !ioMatch {
-					if matchedKey, match := findIoDevice(filesystem, diskIoCounters); match {
+					if matchedKey, match := findIoDevice(key, diskIoCounters); match {
 						key = matchedKey
 						ioMatch = true
-					} else {
+					} else if filesystem != "" {
+						if matchedKey, match := findIoDevice(filesystem, diskIoCounters); match {
+							key = matchedKey
+							ioMatch = true
+						}
+					}
+					if !ioMatch {
 						slog.Warn("Root I/O unmapped; set FILESYSTEM", "device", device, "mountpoint", mountpoint)
 					}
 				}
@@ -114,14 +121,22 @@ func (a *Agent) initializeDiskInfo() {
 	// Use FILESYSTEM env var to find root filesystem
 	if filesystem != "" {
 		for _, p := range partitions {
-			if strings.HasSuffix(p.Device, filesystem) || p.Mountpoint == filesystem {
+			if filesystemMatchesPartitionSetting(filesystem, p) {
 				addFsStat(p.Device, p.Mountpoint, true)
 				hasRoot = true
 				break
 			}
 		}
 		if !hasRoot {
-			slog.Warn("Partition details not found", "filesystem", filesystem)
+			// FILESYSTEM may name a physical disk absent from partitions (e.g.
+			// ZFS lists dataset paths like zroot/ROOT/default, not block devices).
+			// Try matching directly against diskIoCounters.
+			if ioKey, match := findIoDevice(filesystem, diskIoCounters); match {
+				a.fsStats[ioKey] = &system.FsStats{Root: true, Mountpoint: rootMountPoint}
+				hasRoot = true
+			} else {
+				slog.Warn("Partition details not found", "filesystem", filesystem)
+			}
 		}
 	}
 
@@ -187,28 +202,180 @@ func (a *Agent) initializeDiskInfo() {
 		}
 	}
 
-	// If no root filesystem set, use fallback
+	// If no root filesystem set, try the most active I/O device as a last
+	// resort (e.g. ZFS where dataset names are unrelated to disk names).
 	if !hasRoot {
-		rootKey := filepath.Base(rootMountPoint)
-		if _, exists := a.fsStats[rootKey]; exists {
-			rootKey = "root"
+		rootKey := mostActiveIoDevice(diskIoCounters)
+		if rootKey != "" {
+			slog.Warn("Using most active device for root I/O; set FILESYSTEM to override", "device", rootKey)
+		} else {
+			rootKey = filepath.Base(rootMountPoint)
+			if _, exists := a.fsStats[rootKey]; exists {
+				rootKey = "root"
+			}
+			slog.Warn("Root I/O device not detected; set FILESYSTEM to override")
 		}
-		slog.Warn("Root device not detected; root I/O disabled", "mountpoint", rootMountPoint)
 		a.fsStats[rootKey] = &system.FsStats{Root: true, Mountpoint: rootMountPoint}
 	}
 
+	a.pruneDuplicateRootExtraFilesystems()
 	a.initializeDiskIoStats(diskIoCounters)
 }
 
-// Returns matching device from /proc/diskstats.
-// bool is true if a match was found.
-func findIoDevice(filesystem string, diskIoCounters map[string]disk.IOCountersStat) (string, bool) {
-	for _, d := range diskIoCounters {
-		if d.Name == filesystem || (d.Label != "" && d.Label == filesystem) {
-			return d.Name, true
+// Removes extra filesystems that mirror root usage (https://github.com/henrygd/beszel/issues/1428).
+func (a *Agent) pruneDuplicateRootExtraFilesystems() {
+	var rootMountpoint string
+	for _, stats := range a.fsStats {
+		if stats != nil && stats.Root {
+			rootMountpoint = stats.Mountpoint
+			break
 		}
 	}
-	return "", false
+	if rootMountpoint == "" {
+		return
+	}
+	rootUsage, err := disk.Usage(rootMountpoint)
+	if err != nil {
+		return
+	}
+	for name, stats := range a.fsStats {
+		if stats == nil || stats.Root {
+			continue
+		}
+		extraUsage, err := disk.Usage(stats.Mountpoint)
+		if err != nil {
+			continue
+		}
+		if hasSameDiskUsage(rootUsage, extraUsage) {
+			slog.Info("Ignoring duplicate FS", "name", name, "mount", stats.Mountpoint)
+			delete(a.fsStats, name)
+		}
+	}
+}
+
+// hasSameDiskUsage compares root/extra usage with a small byte tolerance.
+func hasSameDiskUsage(a, b *disk.UsageStat) bool {
+	if a == nil || b == nil || a.Total == 0 || b.Total == 0 {
+		return false
+	}
+	// Allow minor drift between sequential disk usage calls.
+	const toleranceBytes uint64 = 16 * 1024 * 1024
+	return withinUsageTolerance(a.Total, b.Total, toleranceBytes) &&
+		withinUsageTolerance(a.Used, b.Used, toleranceBytes)
+}
+
+// withinUsageTolerance reports whether two byte values differ by at most tolerance.
+func withinUsageTolerance(a, b, tolerance uint64) bool {
+	if a >= b {
+		return a-b <= tolerance
+	}
+	return b-a <= tolerance
+}
+
+type ioMatchCandidate struct {
+	name  string
+	bytes uint64
+	ops   uint64
+}
+
+// findIoDevice prefers exact device/label matches, then falls back to a
+// prefix-related candidate with the highest recent activity.
+func findIoDevice(filesystem string, diskIoCounters map[string]disk.IOCountersStat) (string, bool) {
+	filesystem = normalizeDeviceName(filesystem)
+	if filesystem == "" {
+		return "", false
+	}
+
+	candidates := []ioMatchCandidate{}
+
+	for _, d := range diskIoCounters {
+		if normalizeDeviceName(d.Name) == filesystem || (d.Label != "" && normalizeDeviceName(d.Label) == filesystem) {
+			return d.Name, true
+		}
+		if prefixRelated(normalizeDeviceName(d.Name), filesystem) ||
+			(d.Label != "" && prefixRelated(normalizeDeviceName(d.Label), filesystem)) {
+			candidates = append(candidates, ioMatchCandidate{
+				name:  d.Name,
+				bytes: d.ReadBytes + d.WriteBytes,
+				ops:   d.ReadCount + d.WriteCount,
+			})
+		}
+	}
+
+	if len(candidates) == 0 {
+		return "", false
+	}
+
+	best := candidates[0]
+	for _, c := range candidates[1:] {
+		if c.bytes > best.bytes ||
+			(c.bytes == best.bytes && c.ops > best.ops) ||
+			(c.bytes == best.bytes && c.ops == best.ops && c.name < best.name) {
+			best = c
+		}
+	}
+
+	slog.Info("Using disk I/O fallback", "requested", filesystem, "selected", best.name)
+	return best.name, true
+}
+
+// mostActiveIoDevice returns the device with the highest I/O activity,
+// or "" if diskIoCounters is empty.
+func mostActiveIoDevice(diskIoCounters map[string]disk.IOCountersStat) string {
+	var best ioMatchCandidate
+	for _, d := range diskIoCounters {
+		c := ioMatchCandidate{
+			name:  d.Name,
+			bytes: d.ReadBytes + d.WriteBytes,
+			ops:   d.ReadCount + d.WriteCount,
+		}
+		if best.name == "" || c.bytes > best.bytes ||
+			(c.bytes == best.bytes && c.ops > best.ops) ||
+			(c.bytes == best.bytes && c.ops == best.ops && c.name < best.name) {
+			best = c
+		}
+	}
+	return best.name
+}
+
+// prefixRelated reports whether either identifier is a prefix of the other.
+func prefixRelated(a, b string) bool {
+	if a == "" || b == "" || a == b {
+		return false
+	}
+	return strings.HasPrefix(a, b) || strings.HasPrefix(b, a)
+}
+
+// filesystemMatchesPartitionSetting checks whether a FILESYSTEM env var value
+// matches a partition by mountpoint, exact device name, or prefix relationship
+// (e.g. FILESYSTEM=ada0 matches partition /dev/ada0p2).
+func filesystemMatchesPartitionSetting(filesystem string, p disk.PartitionStat) bool {
+	filesystem = strings.TrimSpace(filesystem)
+	if filesystem == "" {
+		return false
+	}
+	if p.Mountpoint == filesystem {
+		return true
+	}
+
+	fsName := normalizeDeviceName(filesystem)
+	partName := normalizeDeviceName(p.Device)
+	if fsName == "" || partName == "" {
+		return false
+	}
+	if fsName == partName {
+		return true
+	}
+	return prefixRelated(partName, fsName)
+}
+
+// normalizeDeviceName canonicalizes device strings for comparisons.
+func normalizeDeviceName(value string) string {
+	name := filepath.Base(strings.TrimSpace(value))
+	if name == "." {
+		return ""
+	}
+	return name
 }
 
 // Sets start values for disk I/O stats.

agent/disk_test.go

@@ -116,7 +116,7 @@ func TestFindIoDevice(t *testing.T) {
 		assert.Equal(t, "sda", device)
 	})
 
-	t.Run("returns no fallback when not found", func(t *testing.T) {
+	t.Run("returns no match when not found", func(t *testing.T) {
 		ioCounters := map[string]disk.IOCountersStat{
 			"sda": {Name: "sda"},
 			"sdb": {Name: "sdb"},
@@ -126,6 +126,106 @@ func TestFindIoDevice(t *testing.T) {
 		assert.False(t, ok)
 		assert.Equal(t, "", device)
 	})
+
+	t.Run("uses uncertain unique prefix fallback", func(t *testing.T) {
+		ioCounters := map[string]disk.IOCountersStat{
+			"nvme0n1": {Name: "nvme0n1"},
+			"sda":     {Name: "sda"},
+		}
+
+		device, ok := findIoDevice("nvme0n1p2", ioCounters)
+		assert.True(t, ok)
+		assert.Equal(t, "nvme0n1", device)
+	})
+
+	t.Run("uses dominant activity when prefix matches are ambiguous", func(t *testing.T) {
+		ioCounters := map[string]disk.IOCountersStat{
+			"sda": {Name: "sda", ReadBytes: 5000, WriteBytes: 5000, ReadCount: 100, WriteCount: 100},
+			"sdb": {Name: "sdb", ReadBytes: 1000, WriteBytes: 1000, ReadCount: 50, WriteCount: 50},
+		}
+
+		device, ok := findIoDevice("sd", ioCounters)
+		assert.True(t, ok)
+		assert.Equal(t, "sda", device)
+	})
+
+	t.Run("uses highest activity when ambiguous without dominance", func(t *testing.T) {
+		ioCounters := map[string]disk.IOCountersStat{
+			"sda": {Name: "sda", ReadBytes: 3000, WriteBytes: 3000, ReadCount: 50, WriteCount: 50},
+			"sdb": {Name: "sdb", ReadBytes: 2500, WriteBytes: 2500, ReadCount: 40, WriteCount: 40},
+		}
+
+		device, ok := findIoDevice("sd", ioCounters)
+		assert.True(t, ok)
+		assert.Equal(t, "sda", device)
+	})
+
+	t.Run("matches /dev/-prefixed partition to parent disk", func(t *testing.T) {
+		ioCounters := map[string]disk.IOCountersStat{
+			"nda0": {Name: "nda0", ReadBytes: 1000, WriteBytes: 1000},
+		}
+
+		device, ok := findIoDevice("/dev/nda0p2", ioCounters)
+		assert.True(t, ok)
+		assert.Equal(t, "nda0", device)
+	})
+
+	t.Run("uses deterministic name tie-breaker", func(t *testing.T) {
+		ioCounters := map[string]disk.IOCountersStat{
+			"sdb": {Name: "sdb", ReadBytes: 2000, WriteBytes: 2000, ReadCount: 10, WriteCount: 10},
+			"sda": {Name: "sda", ReadBytes: 2000, WriteBytes: 2000, ReadCount: 10, WriteCount: 10},
+		}
+
+		device, ok := findIoDevice("sd", ioCounters)
+		assert.True(t, ok)
+		assert.Equal(t, "sda", device)
+	})
+}
+
+func TestFilesystemMatchesPartitionSetting(t *testing.T) {
+	p := disk.PartitionStat{Device: "/dev/ada0p2", Mountpoint: "/"}
+
+	t.Run("matches mountpoint setting", func(t *testing.T) {
+		assert.True(t, filesystemMatchesPartitionSetting("/", p))
+	})
+
+	t.Run("matches exact partition setting", func(t *testing.T) {
+		assert.True(t, filesystemMatchesPartitionSetting("ada0p2", p))
+		assert.True(t, filesystemMatchesPartitionSetting("/dev/ada0p2", p))
+	})
+
+	t.Run("matches prefix-style parent setting", func(t *testing.T) {
+		assert.True(t, filesystemMatchesPartitionSetting("ada0", p))
+		assert.True(t, filesystemMatchesPartitionSetting("/dev/ada0", p))
+	})
+
+	t.Run("does not match unrelated device", func(t *testing.T) {
+		assert.False(t, filesystemMatchesPartitionSetting("sda", p))
+		assert.False(t, filesystemMatchesPartitionSetting("nvme0n1", p))
+		assert.False(t, filesystemMatchesPartitionSetting("", p))
+	})
+}
+
+func TestMostActiveIoDevice(t *testing.T) {
+	t.Run("returns most active device", func(t *testing.T) {
+		ioCounters := map[string]disk.IOCountersStat{
+			"nda0": {Name: "nda0", ReadBytes: 5000, WriteBytes: 5000, ReadCount: 100, WriteCount: 100},
+			"nda1": {Name: "nda1", ReadBytes: 1000, WriteBytes: 1000, ReadCount: 50, WriteCount: 50},
+		}
+		assert.Equal(t, "nda0", mostActiveIoDevice(ioCounters))
+	})
+
+	t.Run("uses deterministic tie-breaker", func(t *testing.T) {
+		ioCounters := map[string]disk.IOCountersStat{
+			"sdb": {Name: "sdb", ReadBytes: 1000, WriteBytes: 1000, ReadCount: 10, WriteCount: 10},
+			"sda": {Name: "sda", ReadBytes: 1000, WriteBytes: 1000, ReadCount: 10, WriteCount: 10},
+		}
+		assert.Equal(t, "sda", mostActiveIoDevice(ioCounters))
+	})
+
+	t.Run("returns empty for empty map", func(t *testing.T) {
+		assert.Equal(t, "", mostActiveIoDevice(map[string]disk.IOCountersStat{}))
+	})
 }
 
 func TestIsDockerSpecialMountpoint(t *testing.T) {
@@ -372,3 +472,37 @@ func TestDiskUsageCaching(t *testing.T) {
 			"lastDiskUsageUpdate should be refreshed when cache expires")
 	})
 }
+
+func TestHasSameDiskUsage(t *testing.T) {
+	const toleranceBytes uint64 = 16 * 1024 * 1024
+
+	t.Run("returns true when totals and usage are equal", func(t *testing.T) {
+		a := &disk.UsageStat{Total: 100 * 1024 * 1024 * 1024, Used: 42 * 1024 * 1024 * 1024}
+		b := &disk.UsageStat{Total: 100 * 1024 * 1024 * 1024, Used: 42 * 1024 * 1024 * 1024}
+		assert.True(t, hasSameDiskUsage(a, b))
+	})
+
+	t.Run("returns true within tolerance", func(t *testing.T) {
+		a := &disk.UsageStat{Total: 100 * 1024 * 1024 * 1024, Used: 42 * 1024 * 1024 * 1024}
+		b := &disk.UsageStat{
+			Total: a.Total + toleranceBytes - 1,
+			Used:  a.Used - toleranceBytes + 1,
+		}
+		assert.True(t, hasSameDiskUsage(a, b))
+	})
+
+	t.Run("returns false when total exceeds tolerance", func(t *testing.T) {
+		a := &disk.UsageStat{Total: 100 * 1024 * 1024 * 1024, Used: 42 * 1024 * 1024 * 1024}
+		b := &disk.UsageStat{
+			Total: a.Total + toleranceBytes + 1,
+			Used:  a.Used,
+		}
+		assert.False(t, hasSameDiskUsage(a, b))
+	})
+
+	t.Run("returns false for nil or zero total", func(t *testing.T) {
+		assert.False(t, hasSameDiskUsage(nil, &disk.UsageStat{Total: 1, Used: 1}))
+		assert.False(t, hasSameDiskUsage(&disk.UsageStat{Total: 1, Used: 1}, nil))
+		assert.False(t, hasSameDiskUsage(&disk.UsageStat{Total: 0, Used: 0}, &disk.UsageStat{Total: 1, Used: 1}))
+	})
+}

agent/system.go

@@ -7,12 +7,12 @@ import (
 	"log/slog"
 	"os"
 	"runtime"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/henrygd/beszel"
 	"github.com/henrygd/beszel/agent/battery"
+	"github.com/henrygd/beszel/agent/zfs"
 	"github.com/henrygd/beszel/internal/entities/container"
 	"github.com/henrygd/beszel/internal/entities/system"
 
@@ -107,7 +107,7 @@ func (a *Agent) refreshSystemDetails() {
 	}
 
 	// zfs
-	if _, err := getARCSize(); err != nil {
+	if _, err := zfs.ARCSize(); err != nil {
 		slog.Debug("Not monitoring ZFS ARC", "err", err)
 	} else {
 		a.zfs = true
@@ -178,7 +178,7 @@ func (a *Agent) getSystemStats(cacheTimeMs uint16) system.Stats {
 		// }
 		// subtract ZFS ARC size from used memory and add as its own category
 		if a.zfs {
-			if arcSize, _ := getARCSize(); arcSize > 0 && arcSize < v.Used {
+			if arcSize, _ := zfs.ARCSize(); arcSize > 0 && arcSize < v.Used {
 				v.Used = v.Used - arcSize
 				v.UsedPercent = float64(v.Used) / float64(v.Total) * 100.0
 				systemStats.MemZfsArc = bytesToGigabytes(arcSize)
@@ -250,32 +250,6 @@ func (a *Agent) getSystemStats(cacheTimeMs uint16) system.Stats {
 	return systemStats
 }
 
-// Returns the size of the ZFS ARC memory cache in bytes
-func getARCSize() (uint64, error) {
-	file, err := os.Open("/proc/spl/kstat/zfs/arcstats")
-	if err != nil {
-		return 0, err
-	}
-	defer file.Close()
-
-	// Scan the lines
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.HasPrefix(line, "size") {
-			// Example line: size 4 15032385536
-			fields := strings.Fields(line)
-			if len(fields) < 3 {
-				return 0, err
-			}
-			// Return the size as uint64
-			return strconv.ParseUint(fields[2], 10, 64)
-		}
-	}
-
-	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")

agent/zfs/zfs_freebsd.go

@@ -0,0 +1,11 @@
+//go:build freebsd
+
+package zfs
+
+import (
+	"golang.org/x/sys/unix"
+)
+
+func ARCSize() (uint64, error) {
+	return unix.SysctlUint64("kstat.zfs.misc.arcstats.size")
+}

agent/zfs/zfs_linux.go

@@ -0,0 +1,34 @@
+//go:build linux
+
+// Package zfs provides functions to read ZFS statistics.
+package zfs
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+)
+
+func ARCSize() (uint64, error) {
+	file, err := os.Open("/proc/spl/kstat/zfs/arcstats")
+	if err != nil {
+		return 0, err
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.HasPrefix(line, "size") {
+			fields := strings.Fields(line)
+			if len(fields) < 3 {
+				return 0, fmt.Errorf("unexpected arcstats size format: %s", line)
+			}
+			return strconv.ParseUint(fields[2], 10, 64)
+		}
+	}
+
+	return 0, fmt.Errorf("size field not found in arcstats")
+}

agent/zfs/zfs_unsupported.go

@@ -0,0 +1,9 @@
+//go:build !linux && !freebsd
+
+package zfs
+
+import "errors"
+
+func ARCSize() (uint64, error) {
+	return 0, errors.ErrUnsupported
+}

beszel.go

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

internal/alerts/alerts_system.go

@@ -38,7 +38,7 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 		case "Memory":
 			val = data.Info.MemPct
 		case "Bandwidth":
-			val = data.Info.Bandwidth
+			val = float64(data.Info.BandwidthBytes) / (1024 * 1024)
 			unit = " MB/s"
 		case "Disk":
 			maxUsedPct := data.Info.DiskPct

internal/site/biome.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.2.3/schema.json",
+	"$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
 	"vcs": {
 		"enabled": true,
 		"clientKind": "git",
@@ -12,7 +12,7 @@
 		"lineWidth": 120,
 		"formatWithErrors": true
 	},
-	"assist": { "actions": { "source": { "organizeImports": "on" } } },
+	"assist": { "actions": { "source": { "organizeImports": "off" } } },
 	"linter": {
 		"enabled": true,
 		"rules": {

internal/site/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "beszel",
 	"private": true,
-	"version": "0.18.3",
+	"version": "0.18.4",
 	"type": "module",
 	"scripts": {
 		"dev": "vite --host",

internal/site/src/components/install-dropdowns.tsx

@@ -43,7 +43,7 @@ export function copyDockerCompose(port = "45876", publicKey: string, token: stri
 
 export function copyDockerRun(port = "45876", publicKey: string, token: string) {
 	copyToClipboard(
-		`docker run -d --name beszel-agent --network host --restart unless-stopped -v /var/run/docker.sock:/var/run/docker.sock:ro -v ./beszel_agent_data:/var/lib/beszel-agent -e KEY="${publicKey}" -e LISTEN=${port} -e TOKEN="${token}" -e HUB_URL="${getHubURL()}" henrygd/beszel-agent`
+		`docker run -d --name beszel-agent --network host --restart unless-stopped -v /var/run/docker.sock:/var/run/docker.sock:ro -v beszel_agent_data:/var/lib/beszel-agent -e KEY="${publicKey}" -e LISTEN=${port} -e TOKEN="${token}" -e HUB_URL="${getHubURL()}" henrygd/beszel-agent`
 	)
 }
 

internal/site/src/components/lang-toggle.tsx

@@ -32,7 +32,10 @@ export function LangToggle() {
 						className={cn("px-2.5 flex gap-2.5 cursor-pointer", lang === i18n.locale && "bg-accent/70 font-medium")}
 						onClick={() => dynamicActivate(lang)}
 					>
-						<span>{e}</span> {label}
+						<span>
+							{e || <code className="font-mono bg-muted text-[.65em] w-5 h-4 grid place-items-center">{lang}</code>}
+						</span>{" "}
+						{label}
 					</DropdownMenuItem>
 				))}
 			</DropdownMenuContent>

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

@@ -70,7 +70,16 @@ export default function SettingsProfilePage({ userSettings }: { userSettings: Us
 						<SelectContent>
 							{languages.map(([lang, label, e]) => (
 								<SelectItem key={lang} value={lang}>
-									<span className="me-2.5">{e}</span>
+									<span className="me-2.5">
+										{e || (
+											<code
+												aria-hidden="true"
+												className="font-mono bg-muted text-[.65em] w-5 h-4 inline-grid place-items-center"
+											>
+												{lang}
+											</code>
+										)}
+									</span>
 									{label}
 								</SelectItem>
 							))}

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

@@ -1,7 +1,6 @@
 import { t } from "@lingui/core/macro"
 import { Trans } from "@lingui/react/macro"
 import { redirectPage } from "@nanostores/router"
-import clsx from "clsx"
 import { LoaderCircleIcon, SendIcon } from "lucide-react"
 import { useEffect, useState } from "react"
 import { $router } from "@/components/router"
@@ -10,6 +9,7 @@ import { Button } from "@/components/ui/button"
 import { Separator } from "@/components/ui/separator"
 import { toast } from "@/components/ui/use-toast"
 import { isAdmin, pb } from "@/lib/api"
+import { cn } from "@/lib/utils"
 
 interface HeartbeatStatus {
 	enabled: boolean
@@ -37,10 +37,10 @@ export default function HeartbeatSettings() {
 			setIsLoading(true)
 			const res = await pb.send<HeartbeatStatus>("/api/beszel/heartbeat-status", {})
 			setStatus(res)
-		} catch (error: any) {
+		} catch (error: unknown) {
 			toast({
 				title: t`Error`,
-				description: error.message,
+				description: (error as Error).message,
 				variant: "destructive",
 			})
 		} finally {
@@ -66,10 +66,10 @@ export default function HeartbeatSettings() {
 					variant: "destructive",
 				})
 			}
-		} catch (error: any) {
+		} catch (error: unknown) {
 			toast({
 				title: t`Error`,
-				description: error.message,
+				description: (error as Error).message,
 				variant: "destructive",
 			})
 		} finally {
@@ -77,8 +77,6 @@ export default function HeartbeatSettings() {
 		}
 	}
 
-	const TestIcon = isTesting ? LoaderCircleIcon : SendIcon
-
 	return (
 		<div>
 			<div>
@@ -94,107 +92,123 @@ export default function HeartbeatSettings() {
 			</div>
 			<Separator className="my-4" />
 
-			{isLoading ? (
-				<div className="flex items-center gap-2 text-muted-foreground py-4">
-					<LoaderCircleIcon className="h-4 w-4 animate-spin" />
-					<Trans>Loading...</Trans>
-				</div>
-			) : status?.enabled ? (
-				<div className="space-y-5">
-					<div className="flex items-center gap-2">
-						<Badge variant="success">
-							<Trans>Active</Trans>
-						</Badge>
-					</div>
-					<div className="grid gap-4 sm:grid-cols-2">
-						<ConfigItem label={t`Endpoint URL`} value={status.url ?? ""} mono />
-						<ConfigItem label={t`Interval`} value={`${status.interval}s`} />
-						<ConfigItem label={t`HTTP Method`} value={status.method ?? "POST"} />
-					</div>
-
-					<Separator />
-
-					<div>
-						<h4 className="text-base font-medium mb-1">
-							<Trans>Test heartbeat</Trans>
-						</h4>
-						<p className="text-sm text-muted-foreground leading-relaxed mb-3">
-							<Trans>Send a single heartbeat ping to verify your endpoint is working.</Trans>
-						</p>
-						<Button
-							type="button"
-							variant="outline"
-							className="flex items-center gap-1.5"
-							onClick={sendTestHeartbeat}
-							disabled={isTesting}
-						>
-							<TestIcon className={clsx("h-4 w-4", isTesting && "animate-spin")} />
-							<Trans>Send test heartbeat</Trans>
-						</Button>
-					</div>
-
-					<Separator />
-
-					<div>
-						<h4 className="text-base font-medium mb-2">
-							<Trans>Payload format</Trans>
-						</h4>
-						<p className="text-sm text-muted-foreground leading-relaxed mb-2">
-							<Trans>
-								When using POST, each heartbeat includes a JSON payload with system status summary, list of down
-								systems, and triggered alerts.
-							</Trans>
-						</p>
-						<p className="text-sm text-muted-foreground leading-relaxed">
-							<Trans>
-								The overall status is <code className="bg-muted rounded-sm px-1 text-primary">ok</code> when all systems
-								are up, <code className="bg-muted rounded-sm px-1 text-primary">warn</code> when alerts are triggered,
-								and <code className="bg-muted rounded-sm px-1 text-primary">error</code> when any system is down.
-							</Trans>
-						</p>
-					</div>
-				</div>
+			{status?.enabled ? (
+				<EnabledState status={status} isTesting={isTesting} sendTestHeartbeat={sendTestHeartbeat} />
 			) : (
-				<div className="grid gap-4">
-					<div>
-						<p className="text-sm text-muted-foreground leading-relaxed mb-3">
-							<Trans>Set the following environment variables on your Beszel hub to enable heartbeat monitoring:</Trans>
-						</p>
-						<div className="grid gap-2.5">
-							<EnvVarItem
-								name="HEARTBEAT_URL"
-								description={t`Endpoint URL to ping (required)`}
-								example="https://uptime.betterstack.com/api/v1/heartbeat/xxxx"
-							/>
-							<EnvVarItem name="HEARTBEAT_INTERVAL" description={t`Seconds between pings (default: 60)`} example="60" />
-							<EnvVarItem
-								name="HEARTBEAT_METHOD"
-								description={t`HTTP method: POST, GET, or HEAD (default: POST)`}
-								example="POST"
-							/>
-						</div>
-					</div>
-					<p className="text-sm text-muted-foreground leading-relaxed">
-						<Trans>After setting the environment variables, restart your Beszel hub for changes to take effect.</Trans>
-					</p>
-				</div>
+				<NotEnabledState isLoading={isLoading} />
 			)}
 		</div>
 	)
 }
 
+function EnabledState({
+	status,
+	isTesting,
+	sendTestHeartbeat,
+}: {
+	status: HeartbeatStatus
+	isTesting: boolean
+	sendTestHeartbeat: () => void
+}) {
+	const TestIcon = isTesting ? LoaderCircleIcon : SendIcon
+	return (
+		<div className="space-y-5">
+			<div className="flex items-center gap-2">
+				<Badge variant="success">
+					<Trans>Active</Trans>
+				</Badge>
+			</div>
+			<div className="grid gap-4 sm:grid-cols-2">
+				<ConfigItem label={t`Endpoint URL`} value={status.url ?? ""} mono />
+				<ConfigItem label={t`Interval`} value={`${status.interval}s`} />
+				<ConfigItem label={t`HTTP Method`} value={status.method ?? "POST"} />
+			</div>
+
+			<Separator />
+
+			<div>
+				<h4 className="text-base font-medium mb-1">
+					<Trans>Test heartbeat</Trans>
+				</h4>
+				<p className="text-sm text-muted-foreground leading-relaxed mb-3">
+					<Trans>Send a single heartbeat ping to verify your endpoint is working.</Trans>
+				</p>
+				<Button
+					type="button"
+					variant="outline"
+					className="flex items-center gap-1.5"
+					onClick={sendTestHeartbeat}
+					disabled={isTesting}
+				>
+					<TestIcon className={cn("size-4", isTesting && "animate-spin")} />
+					<Trans>Send test heartbeat</Trans>
+				</Button>
+			</div>
+
+			<Separator />
+
+			<div>
+				<h4 className="text-base font-medium mb-2">
+					<Trans>Payload format</Trans>
+				</h4>
+				<p className="text-sm text-muted-foreground leading-relaxed mb-2">
+					<Trans>
+						When using POST, each heartbeat includes a JSON payload with system status summary, list of down systems,
+						and triggered alerts.
+					</Trans>
+				</p>
+				<p className="text-sm text-muted-foreground leading-relaxed">
+					<Trans>
+						The overall status is <code className="bg-muted rounded-sm px-1 text-primary">ok</code> when all systems are
+						up, <code className="bg-muted rounded-sm px-1 text-primary">warn</code> when alerts are triggered, and{" "}
+						<code className="bg-muted rounded-sm px-1 text-primary">error</code> when any system is down.
+					</Trans>
+				</p>
+			</div>
+		</div>
+	)
+}
+
+function NotEnabledState({ isLoading }: { isLoading?: boolean }) {
+	return (
+		<div className={cn("grid gap-4", isLoading && "animate-pulse")}>
+			<div>
+				<p className="text-sm text-muted-foreground leading-relaxed mb-3">
+					<Trans>Set the following environment variables on your Beszel hub to enable heartbeat monitoring:</Trans>
+				</p>
+				<div className="grid gap-2.5">
+					<EnvVarItem
+						name="HEARTBEAT_URL"
+						description={t`Endpoint URL to ping (required)`}
+						example="https://uptime.betterstack.com/api/v1/heartbeat/xxxx"
+					/>
+					<EnvVarItem name="HEARTBEAT_INTERVAL" description={t`Seconds between pings (default: 60)`} example="60" />
+					<EnvVarItem
+						name="HEARTBEAT_METHOD"
+						description={t`HTTP method: POST, GET, or HEAD (default: POST)`}
+						example="POST"
+					/>
+				</div>
+			</div>
+			<p className="text-sm text-muted-foreground leading-relaxed">
+				<Trans>After setting the environment variables, restart your Beszel hub for changes to take effect.</Trans>
+			</p>
+		</div>
+	)
+}
+
 function ConfigItem({ label, value, mono }: { label: string; value: string; mono?: boolean }) {
 	return (
 		<div>
 			<p className="text-sm font-medium mb-0.5">{label}</p>
-			<p className={clsx("text-sm text-muted-foreground break-all", mono && "font-mono")}>{value}</p>
+			<p className={cn("text-sm text-muted-foreground break-all", mono && "font-mono")}>{value}</p>
 		</div>
 	)
 }
 
 function EnvVarItem({ name, description, example }: { name: string; description: string; example: string }) {
 	return (
-		<div className="bg-muted/50 rounded-md px-3 py-2 grid gap-1.5">
+		<div className="bg-muted/50 rounded-md px-3 py-2.5 grid gap-1.5">
 			<code className="text-sm font-mono text-primary font-medium leading-tight">{name}</code>
 			<p className="text-sm text-muted-foreground">{description}</p>
 			<p className="text-xs text-muted-foreground">

internal/site/src/lib/languages.ts

@@ -8,7 +8,7 @@ export default [
 	["es", "Español", "🇪🇸"],
 	["fa", "فارسی", "🇮🇷"],
 	["fr", "Français", "🇫🇷"],
-	["he", "עברית", "🕎"],
+	["he", "עברית", ""],
 	["hr", "Hrvatski", "🇭🇷"],
 	["hu", "Magyar", "🇭🇺"],
 	["id", "Indonesia", "🇮🇩"],

internal/site/src/locales/ar/ar.po

@@ -937,7 +937,6 @@ msgstr "متوسط التحميل"
 msgid "Load state"
 msgstr "حالة التحميل"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "جاري التحميل..."

internal/site/src/locales/bg/bg.po

@@ -937,7 +937,6 @@ msgstr "Средно натоварване"
 msgid "Load state"
 msgstr "Състояние на зареждане"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Зареждане..."

internal/site/src/locales/cs/cs.po

@@ -937,7 +937,6 @@ msgstr "Prům. zatížení"
 msgid "Load state"
 msgstr "Stav načtení"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Načítání..."

internal/site/src/locales/da/da.po

@@ -937,7 +937,6 @@ msgstr "Belastning gns."
 msgid "Load state"
 msgstr "Indlæsningstilstand"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Indlæser..."

internal/site/src/locales/de/de.po

@@ -937,7 +937,6 @@ msgstr "Systemlast"
 msgid "Load state"
 msgstr "Ladezustand"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Lädt..."

internal/site/src/locales/en/en.po

@@ -932,7 +932,6 @@ msgstr "Load Avg"
 msgid "Load state"
 msgstr "Load state"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Loading..."

internal/site/src/locales/es/es.po

@@ -937,7 +937,6 @@ msgstr "Carga media"
 msgid "Load state"
 msgstr "Estado de carga"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Cargando..."

internal/site/src/locales/fa/fa.po

@@ -937,7 +937,6 @@ msgstr "میانگین بار"
 msgid "Load state"
 msgstr "وضعیت بارگذاری"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "در حال بارگذاری..."

internal/site/src/locales/fr/fr.po

@@ -937,7 +937,6 @@ msgstr "Charge moy."
 msgid "Load state"
 msgstr "État de charge"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Chargement..."

internal/site/src/locales/he/he.po

@@ -937,7 +937,6 @@ msgstr "ממוצע עומס"
 msgid "Load state"
 msgstr "מצב עומס"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "טוען..."

internal/site/src/locales/hr/hr.po

@@ -937,7 +937,6 @@ msgstr "Prosječno Opterećenje"
 msgid "Load state"
 msgstr "Stanje učitavanja"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Učitavanje..."

internal/site/src/locales/hu/hu.po

@@ -937,7 +937,6 @@ msgstr "Terhelési átlag"
 msgid "Load state"
 msgstr "Betöltési állapot"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Betöltés..."

internal/site/src/locales/id/id.po

@@ -937,7 +937,6 @@ msgstr "Rata-rata Beban"
 msgid "Load state"
 msgstr "Beban saat ini"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Memuat..."

internal/site/src/locales/it/it.po

@@ -937,7 +937,6 @@ msgstr "Carico Medio"
 msgid "Load state"
 msgstr "Stato di caricamento"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Caricamento..."

internal/site/src/locales/ja/ja.po

@@ -937,7 +937,6 @@ msgstr "負荷平均"
 msgid "Load state"
 msgstr "ロード状態"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "読み込み中..."

internal/site/src/locales/ko/ko.po

@@ -937,7 +937,6 @@ msgstr "부하 평균"
 msgid "Load state"
 msgstr "로드 상태"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "로딩 중..."

internal/site/src/locales/nl/nl.po

@@ -937,7 +937,6 @@ msgstr "Gem. Belasting"
 msgid "Load state"
 msgstr "Laadstatus"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Laden..."

internal/site/src/locales/no/no.po

@@ -937,7 +937,6 @@ msgstr "Snittbelastning"
 msgid "Load state"
 msgstr "Lastetilstand"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Laster..."

internal/site/src/locales/pl/pl.po

@@ -937,7 +937,6 @@ msgstr "Śr. obciążenie"
 msgid "Load state"
 msgstr "Stan obciążenia"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Ładowanie..."

internal/site/src/locales/pt/pt.po

@@ -937,7 +937,6 @@ msgstr "Carga Média"
 msgid "Load state"
 msgstr "Estado de carga"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Carregando..."

internal/site/src/locales/ru/ru.po

@@ -937,7 +937,6 @@ msgstr "Ср. загрузка"
 msgid "Load state"
 msgstr "Состояние загрузки"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Загрузка..."

internal/site/src/locales/sl/sl.po

@@ -937,7 +937,6 @@ msgstr "Povpr. obrem."
 msgid "Load state"
 msgstr "Stanje nalaganja"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Nalaganje..."

internal/site/src/locales/sr/sr.po

@@ -937,7 +937,6 @@ msgstr "Просечно опт."
 msgid "Load state"
 msgstr "Стање учитавања"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Учитавање..."

internal/site/src/locales/sv/sv.po

@@ -937,7 +937,6 @@ msgstr "Belastning"
 msgid "Load state"
 msgstr "Laddningstillstånd"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Laddar..."

internal/site/src/locales/tr/tr.po

@@ -937,7 +937,6 @@ msgstr "Yük Ort."
 msgid "Load state"
 msgstr "Yükleme durumu"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Yükleniyor..."

internal/site/src/locales/uk/uk.po

@@ -937,7 +937,6 @@ msgstr "Сер. навантаження"
 msgid "Load state"
 msgstr "Стан завантаження"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Завантаження..."

internal/site/src/locales/vi/vi.po

@@ -937,7 +937,6 @@ msgstr "Tải TB"
 msgid "Load state"
 msgstr "Trạng thái tải"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "Đang tải..."

internal/site/src/locales/zh-CN/zh-CN.po

@@ -937,7 +937,6 @@ msgstr "负载"
 msgid "Load state"
 msgstr "加载状态"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "加载中..."

internal/site/src/locales/zh-HK/zh-HK.po

@@ -937,7 +937,6 @@ msgstr "平均負載"
 msgid "Load state"
 msgstr "載入狀態"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "載入中..."

internal/site/src/locales/zh/zh.po

@@ -937,7 +937,6 @@ msgstr "平均負載"
 msgid "Load state"
 msgstr "載入狀態"
 
-#: src/components/routes/settings/heartbeat.tsx
 #: src/components/systemd-table/systemd-table.tsx
 msgid "Loading..."
 msgstr "載入中..."

supplemental/CHANGELOG.md

@@ -1,10 +1,10 @@
-## Unreleased
+## 0.18.4
 
-- Add outbound heartbeat monitoring to external services (BetterStack, Uptime Kuma, Healthchecks.io, etc.) with system status summary payload. Configured via `BESZEL_HUB_HEARTBEAT_URL`, `BESZEL_HUB_HEARTBEAT_INTERVAL`, and `BESZEL_HUB_HEARTBEAT_METHOD` environment variables.
+- Add outbound heartbeat monitoring to external services (#1729)
 
-- Add GPU monitoring for Apple Silicon. (#1747, #1746)
+- Add experimental GPU monitoring for Apple Silicon. (#1747, #1746)
 
-- Add `nvtop` integration for expanded GPU compatibility.
+- Add `nvtop` integration for GPU monitoring. (#1508)
 
 - Add `GPU_COLLECTOR` environment variable to manually specify the GPU collector(s).
 
@@ -16,11 +16,21 @@
 
 - Add `fingerprint` command to the agent. (#1726)
 
+- Add precise value entry for alerts via text input. (#1718)
+
 - Include GTT memory in AMD GPU metrics and improve device name lookup. (#1569)
 
+- Improve multiplexed logs detection for Podman. (#1755)
+
+- Harden against Docker API path traversal.
+
 - Fix issue where the agent could report incorrect root disk I/O when running in Docker. (#1737)
 
-- Update Go to 1.26.
+- Retry Docker check on non-200 HTTP response. (#1754)
+
+- Fix race issue with meter threshold colors.
+
+- Update Go version and dependencies.
 
 - Add `InstallMethod` parameter to Windows install script.
 

supplemental/scripts/install-agent.sh

@@ -374,7 +374,7 @@ else
 fi
 
 # Stop existing service if it exists (for upgrades)
-if [ -f "$BIN_PATH" ]; then
+if [ "$UNINSTALL" != true ] && [ -f "$BIN_PATH" ]; then
   echo "Existing installation detected. Stopping service for upgrade..."
   if is_alpine; then
     rc-service beszel-agent stop 2>/dev/null || true
@@ -451,7 +451,7 @@ if [ "$UNINSTALL" = true ]; then
   else
     echo "Stopping and disabling the agent service..."
     systemctl stop beszel-agent.service
-    systemctl disable beszel-agent.service
+    systemctl disable beszel-agent.service >/dev/null 2>&1
 
     echo "Removing the systemd service file..."
     rm /etc/systemd/system/beszel-agent.service
@@ -459,7 +459,7 @@ if [ "$UNINSTALL" = true ]; then
     # Remove the update timer and service if they exist
     echo "Removing the daily update service and timer..."
     systemctl stop beszel-agent-update.timer 2>/dev/null
-    systemctl disable beszel-agent-update.timer 2>/dev/null
+    systemctl disable beszel-agent-update.timer >/dev/null 2>&1
     rm -f /etc/systemd/system/beszel-agent-update.service
     rm -f /etc/systemd/system/beszel-agent-update.timer
 
@@ -549,14 +549,14 @@ else
 fi
 
 # Create a dedicated user for the service if it doesn't exist
-echo "Creating a dedicated user for the Beszel Agent service..."
+echo "Configuring the dedicated user for the Beszel Agent service..."
 if is_alpine; then
   if ! id -u beszel >/dev/null 2>&1; then
     addgroup beszel
     adduser -S -D -H -s /sbin/nologin -G beszel beszel
   fi
   # Add the user to the docker group to allow access to the Docker socket if group docker exists
-  if getent group docker; then
+  if getent group docker >/dev/null 2>&1; then
     echo "Adding beszel to docker group"
     addgroup beszel docker
   fi
@@ -604,12 +604,12 @@ else
     useradd --system --home-dir /nonexistent --shell /bin/false beszel
   fi
   # Add the user to the docker group to allow access to the Docker socket if group docker exists
-  if getent group docker; then
+  if getent group docker >/dev/null 2>&1; then
     echo "Adding beszel to docker group"
     usermod -aG docker beszel
   fi
   # Add the user to the disk group to allow access to disk devices if group disk exists
-  if getent group disk; then
+  if getent group disk >/dev/null 2>&1; then
     echo "Adding beszel to disk group"
     usermod -aG disk beszel
   fi
@@ -629,7 +629,6 @@ if [ ! -d "$BIN_DIR" ]; then
 fi
 
 # Download and install the Beszel Agent
-echo "Downloading and installing the agent..."
 
 OS=$(uname -s | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/')
 ARCH=$(detect_architecture)
@@ -656,19 +655,29 @@ else
   INSTALL_VERSION=$(echo "$INSTALL_VERSION" | sed 's/^v//')
 fi
 
-echo "Downloading and installing agent version ${INSTALL_VERSION} from ${GITHUB_URL} ..."
+echo "Downloading beszel-agent v${INSTALL_VERSION}..."
 
 # Download checksums file
 TEMP_DIR=$(mktemp -d)
 cd "$TEMP_DIR" || exit 1
-CHECKSUM=$(curl -sL "$GITHUB_URL/henrygd/beszel/releases/download/v${INSTALL_VERSION}/beszel_${INSTALL_VERSION}_checksums.txt" | grep "$FILE_NAME" | cut -d' ' -f1)
+CHECKSUM=$(curl -fsSL "$GITHUB_URL/henrygd/beszel/releases/download/v${INSTALL_VERSION}/beszel_${INSTALL_VERSION}_checksums.txt" | grep "$FILE_NAME" | cut -d' ' -f1)
 if [ -z "$CHECKSUM" ] || ! echo "$CHECKSUM" | grep -qE "^[a-fA-F0-9]{64}$"; then
   echo "Failed to get checksum or invalid checksum format"
+  echo "Try again with --mirror (or --mirror <url>) if GitHub is not reachable."
+  rm -rf "$TEMP_DIR"
   exit 1
 fi
 
-if ! curl -#L "$GITHUB_URL/henrygd/beszel/releases/download/v${INSTALL_VERSION}/$FILE_NAME" -o "$FILE_NAME"; then
-  echo "Failed to download the agent from ""$GITHUB_URL/henrygd/beszel/releases/download/v${INSTALL_VERSION}/$FILE_NAME"
+if ! curl -fL# --retry 3 --retry-delay 2 --connect-timeout 10 "$GITHUB_URL/henrygd/beszel/releases/download/v${INSTALL_VERSION}/$FILE_NAME" -o "$FILE_NAME"; then
+  echo "Failed to download the agent from $GITHUB_URL/henrygd/beszel/releases/download/v${INSTALL_VERSION}/$FILE_NAME"
+  echo "Try again with --mirror (or --mirror <url>) if GitHub is not reachable."
+  rm -rf "$TEMP_DIR"
+  exit 1
+fi
+
+if ! tar -tzf "$FILE_NAME" >/dev/null 2>&1; then
+  echo "Downloaded archive is invalid or incomplete (possible network/proxy issue)."
+  echo "Try again with --mirror (or --mirror <url>) if the download path is unstable."
   rm -rf "$TEMP_DIR"
   exit 1
 fi
@@ -685,6 +694,12 @@ if ! tar -xzf "$FILE_NAME" beszel-agent; then
   exit 1
 fi
 
+if [ ! -s "$TEMP_DIR/beszel-agent" ]; then
+  echo "Downloaded binary is missing or empty."
+  rm -rf "$TEMP_DIR"
+  exit 1
+fi
+
 if [ -f "$BIN_PATH" ]; then
   echo "Backing up existing binary..."
   cp "$BIN_PATH" "$BIN_PATH.bak"
@@ -871,6 +886,8 @@ EOF
 
 elif is_freebsd; then
   echo "Checking for existing FreeBSD service configuration..."
+  # Ensure rc.d directory exists on minimal FreeBSD installs
+  mkdir -p /usr/local/etc/rc.d
   
   # Create environment configuration file with proper permissions if it doesn't exist
   if [ ! -f "$AGENT_DIR/env" ]; then
@@ -989,7 +1006,7 @@ EOF
   # Load and start the service
   printf "\nLoading and starting the agent service...\n"
   systemctl daemon-reload
-  systemctl enable beszel-agent.service
+  systemctl enable beszel-agent.service >/dev/null 2>&1
   systemctl restart beszel-agent.service
 
 
@@ -1035,7 +1052,7 @@ WantedBy=timers.target
 EOF
 
     systemctl daemon-reload
-    systemctl enable --now beszel-agent-update.timer
+    systemctl enable --now beszel-agent-update.timer >/dev/null 2>&1
 
     printf "\nDaily updates have been enabled.\n"
     ;;

supplemental/scripts/install-hub.sh

@@ -156,7 +156,7 @@ fi
 
 # Define default values
 PORT=8090
-GITHUB_PROXY_URL="https://ghfast.top/"
+GITHUB_URL="https://github.com"
 AUTO_UPDATE_FLAG="false"
 UNINSTALL=false
 
@@ -173,7 +173,7 @@ while [ $# -gt 0 ]; do
       printf "Options: \n"
       printf "  -u           : Uninstall the Beszel Hub\n"
       printf "  -p <port>    : Specify a port number (default: 8090)\n"
-      printf "  -c <url>     : Use a custom GitHub mirror URL (e.g., https://ghfast.top/)\n"
+      printf "  -c, --mirror [URL] : Use a GitHub mirror/proxy URL (default: https://gh.beszel.dev)\n"
       printf "  --auto-update : Enable automatic daily updates (disabled by default)\n"
       printf "  -h, --help   : Display this help message\n"
       exit 0
@@ -183,10 +183,14 @@ while [ $# -gt 0 ]; do
       PORT="$1"
       shift
       ;;
-    -c)
-      shift
-      GITHUB_PROXY_URL=$(ensure_trailing_slash "$1")
+    -c | --mirror)
       shift
+      if [ -n "$1" ] && ! echo "$1" | grep -q '^-'; then
+        GITHUB_URL="$(ensure_trailing_slash "$1")https://github.com"
+        shift
+      else
+        GITHUB_URL="https://gh.beszel.dev"
+      fi
       ;;
     --auto-update)
       AUTO_UPDATE_FLAG="true"
@@ -199,9 +203,6 @@ while [ $# -gt 0 ]; do
   esac
 done
 
-# Ensure the proxy URL ends with a /
-GITHUB_PROXY_URL=$(ensure_trailing_slash "$GITHUB_PROXY_URL")
-
 # Set paths based on operating system
 if is_freebsd; then
   HUB_DIR="/usr/local/etc/beszel"
@@ -323,10 +324,41 @@ OS=$(uname -s | tr '[:upper:]' '[:lower:]')
 ARCH=$(detect_architecture)
 FILE_NAME="beszel_${OS}_${ARCH}.tar.gz"
 
-curl -sL "${GITHUB_PROXY_URL}https://github.com/henrygd/beszel/releases/latest/download/$FILE_NAME" | tar -xz -O beszel | tee ./beszel >/dev/null
-chmod +x ./beszel
-mv ./beszel "$BIN_PATH"
+TEMP_DIR=$(mktemp -d)
+ARCHIVE_PATH="$TEMP_DIR/$FILE_NAME"
+DOWNLOAD_URL="$GITHUB_URL/henrygd/beszel/releases/latest/download/$FILE_NAME"
+
+if ! curl -fL# --retry 3 --retry-delay 2 --connect-timeout 10 "$DOWNLOAD_URL" -o "$ARCHIVE_PATH"; then
+  echo "Failed to download the Beszel Hub from:"
+  echo "$DOWNLOAD_URL"
+  echo "Try again with --mirror (or --mirror <url>) if GitHub is not reachable."
+  rm -rf "$TEMP_DIR"
+  exit 1
+fi
+
+if ! tar -tzf "$ARCHIVE_PATH" >/dev/null 2>&1; then
+  echo "Downloaded archive is invalid or incomplete (possible network/proxy issue)."
+  echo "Try again with --mirror (or --mirror <url>) if the download path is unstable."
+  rm -rf "$TEMP_DIR"
+  exit 1
+fi
+
+if ! tar -xzf "$ARCHIVE_PATH" -C "$TEMP_DIR" beszel; then
+  echo "Failed to extract beszel from archive."
+  rm -rf "$TEMP_DIR"
+  exit 1
+fi
+
+if [ ! -s "$TEMP_DIR/beszel" ]; then
+  echo "Downloaded binary is missing or empty."
+  rm -rf "$TEMP_DIR"
+  exit 1
+fi
+
+chmod +x "$TEMP_DIR/beszel"
+mv "$TEMP_DIR/beszel" "$BIN_PATH"
 chown beszel:beszel "$BIN_PATH"
+rm -rf "$TEMP_DIR"
 
 if is_freebsd; then
   echo "Creating FreeBSD rc service..."
@@ -375,8 +407,8 @@ EOF
 
 else
   # Original systemd service installation code
-  printf "Creating the systemd service for the Beszel Hub...\n\n"
-  tee /etc/systemd/system/beszel-hub.service <<EOF
+  printf "Creating the systemd service for the Beszel Hub...\n"
+  cat >/etc/systemd/system/beszel-hub.service <<EOF
 [Unit]
 Description=Beszel Hub Service
 After=network.target
@@ -393,10 +425,10 @@ WantedBy=multi-user.target
 EOF
 
   # Load and start the service
-  printf "\nLoading and starting the Beszel Hub service...\n"
+  printf "Loading and starting the Beszel Hub service...\n"
   systemctl daemon-reload
-  systemctl enable beszel-hub.service
-  systemctl start beszel-hub.service
+  systemctl enable --quiet beszel-hub.service
+  systemctl start --quiet beszel-hub.service
 
   # Wait for the service to start or fail
   sleep 2
@@ -444,4 +476,4 @@ EOF
   fi
 fi
 
-echo "The Beszel Hub has been installed and configured successfully! It is now accessible on port $PORT."
+printf "\n\033[32mBeszel Hub has been installed successfully! It is now accessible on port $PORT.\033[0m\n"