refactoring

- network interface delta
- string concatenation

agent/network.go

@@ -6,10 +6,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/henrygd/beszel/agent/deltatracker"
 	"github.com/henrygd/beszel/internal/entities/system"
 	psutilNet "github.com/shirou/gopsutil/v4/net"
 )
 
+var netInterfaceDeltaTracker = deltatracker.NewDeltaTracker[string, uint64]()
+
 func (a *Agent) updateNetworkStats(systemStats *system.Stats) {
 	// network stats
 	if len(a.netInterfaces) == 0 {
@@ -40,10 +43,14 @@ func (a *Agent) updateNetworkStats(systemStats *system.Stats) {
 			totalBytesRecv += v.BytesRecv
 
 			// track deltas for each network interface
-			netInterfaceDeltaTracker.Set(fmt.Sprintf("%sdown", v.Name), v.BytesRecv)
-			netInterfaceDeltaTracker.Set(fmt.Sprintf("%sup", v.Name), v.BytesSent)
-			upDelta := netInterfaceDeltaTracker.Delta(fmt.Sprintf("%sup", v.Name)) * 1000 / msElapsed
-			downDelta := netInterfaceDeltaTracker.Delta(fmt.Sprintf("%sdown", v.Name)) * 1000 / msElapsed
+			var upDelta, downDelta uint64
+			upKey, downKey := fmt.Sprintf("%sup", v.Name), fmt.Sprintf("%sdown", v.Name)
+			netInterfaceDeltaTracker.Set(upKey, v.BytesSent)
+			netInterfaceDeltaTracker.Set(downKey, v.BytesRecv)
+			if msElapsed > 0 {
+				upDelta = netInterfaceDeltaTracker.Delta(upKey) * 1000 / msElapsed
+				downDelta = netInterfaceDeltaTracker.Delta(downKey) * 1000 / msElapsed
+			}
 			// add interface to systemStats
 			systemStats.NetworkInterfaces[v.Name] = [4]uint64{upDelta, downDelta, v.BytesSent, v.BytesRecv}
 		}

agent/system.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/henrygd/beszel"
 	"github.com/henrygd/beszel/agent/battery"
-	"github.com/henrygd/beszel/agent/deltatracker"
 	"github.com/henrygd/beszel/internal/entities/system"
 
 	"github.com/shirou/gopsutil/v4/cpu"
@@ -21,8 +20,6 @@ import (
 	"github.com/shirou/gopsutil/v4/mem"
 )
 
-var netInterfaceDeltaTracker = deltatracker.NewDeltaTracker[string, uint64]()
-
 // Sets initial / non-changing values about the host system
 func (a *Agent) initializeSystemInfo() {
 	a.systemInfo.AgentVersion = beszel.Version
@@ -34,7 +31,7 @@ func (a *Agent) initializeSystemInfo() {
 		a.systemInfo.KernelVersion = version
 		a.systemInfo.Os = system.Darwin
 	} else if strings.Contains(platform, "indows") {
-		a.systemInfo.KernelVersion = strings.Replace(platform, "Microsoft ", "", 1) + " " + version
+		a.systemInfo.KernelVersion = fmt.Sprintf("%s %s", strings.Replace(platform, "Microsoft ", "", 1), version)
 		a.systemInfo.Os = system.Windows
 	} else if platform == "freebsd" {
 		a.systemInfo.Os = system.Freebsd

beszel.go

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

internal/site/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "beszel",
-	"version": "0.12.8",
+	"version": "0.12.9",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "beszel",
-			"version": "0.12.8",
+			"version": "0.12.9",
 			"dependencies": {
 				"@henrygd/queue": "^1.0.7",
 				"@henrygd/semaphore": "^0.0.2",

internal/site/package.json

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

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

@@ -960,9 +960,7 @@ export function ChartCard({
 			<CardHeader className="pb-5 pt-4 gap-1 relative max-sm:py-3 max-sm:px-4">
 				<CardTitle className="text-xl sm:text-2xl">{title}</CardTitle>
 				<CardDescription>{description}</CardDescription>
-				{cornerEl && (
-					<div className="relative py-1 grid sm:justify-end sm:absolute sm:top-3.5 sm:end-3.5">{cornerEl}</div>
-				)}
+				{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.5em)] relative group", legend ? "h-54 md:h-56" : "h-48 md:h-52")}>
 				{

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

@@ -40,13 +40,18 @@ export default memo(function NetworkSheet({
 	return (
 		<Sheet open={netInterfacesOpen} onOpenChange={setNetInterfacesOpen}>
 			<SheetTrigger asChild>
-				<Button variant="outline" size="icon" className="shrink-0">
+				<Button
+					aria-label={t`View more`}
+					variant="outline"
+					size="icon"
+					className="shrink-0 absolute top-3 end-3 sm:inline-flex sm:top-0 sm:end-0"
+				>
 					<MoreHorizontalIcon />
 				</Button>
 			</SheetTrigger>
 			{hasOpened.current && (
 				<SheetContent className="overflow-auto w-200 !max-w-full p-4 sm:p-6">
-					<ChartTimeSelect className="w-[calc(100%-1.5em)]" />
+					<ChartTimeSelect className="w-[calc(100%-2em)]" />
 					<ChartCard
 						empty={dataEmpty}
 						grid={grid}

supplemental/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.12.9
+
+- Fix divide by zero error introduced in 0.12.8 :) (#1175)
+
+
 ## 0.12.8
 
 - Add per-interface network traffic charts. (#926)
@@ -14,6 +19,8 @@
 
 - Add FreeBSD support for agent install script and update command.
 
+- Fix status alerts not being resolved when system comes up. (#1052)
+
 ## 0.12.7
 
 - Make LibreHardwareMonitor opt-in with `LHM=true` environment variable. (#1130)