fix translation

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Make release and binaries
 on:
   push:
     tags:
-      - 'v*'
+      - '*'
 
 permissions:
   contents: write

.gitignore

@@ -14,6 +14,4 @@ node_modules
 beszel/build
 *timestamp*
 .swc
-beszel/site/src/locales/**/*.ts
-*.bak
-__debug_*
+beszel/site/src/locales/**/*.ts

beszel/.goreleaser.yml

@@ -29,7 +29,6 @@ builds:
       - linux
       - darwin
       - freebsd
-      - openbsd
       - windows
     goarch:
       - amd64
@@ -37,13 +36,9 @@ builds:
       - arm
       - mips64
       - riscv64
-      - mipsle
-      - ppc64le
     ignore:
       - goos: freebsd
         goarch: arm
-      - goos: openbsd
-        goarch: arm
       - goos: windows
         goarch: arm
       - goos: darwin
@@ -52,8 +47,8 @@ builds:
         goarch: riscv64
 
 archives:
-  - id: beszel-agent
-    formats: [tar.gz]
+  - id: beszel
+    format: tar.gz
     builds:
       - beszel-agent
     name_template: >-
@@ -62,10 +57,10 @@ archives:
       {{- .Arch }}
     format_overrides:
       - goos: windows
-        formats: [zip]
+        format: zip
 
-  - id: beszel
-    formats: [tar.gz]
+  - id: beszel-agent
+    format: tar.gz
     builds:
       - beszel
     name_template: >-
@@ -89,6 +84,9 @@ nfpms:
       - beszel-agent
     formats:
       - deb
+    # don't think this is needed with CGO_ENABLED=0
+    # dependencies:
+    #   - libc6
     contents:
       - src: ../supplemental/debian/beszel-agent.service
         dst: lib/systemd/system/beszel-agent.service
@@ -113,103 +111,6 @@ nfpms:
         # https://github.com/goreleaser/goreleaser/issues/5487
         #config: ../supplemental/debian/config.sh
 
-scoops:
-  - ids: [beszel-agent]
-    name: beszel-agent
-    repository:
-      owner: henrygd
-      name: beszel-scoops
-    homepage: 'https://beszel.dev'
-    description: 'Agent for Beszel, a lightweight server monitoring platform.'
-    license: MIT
-
-# # Needs choco installed, so doesn't build on linux / default gh workflow :(
-# chocolateys:
-#   - title: Beszel Agent
-#     ids: [beszel-agent]
-#     package_source_url: https://github.com/henrygd/beszel-chocolatey
-#     owners: henrygd
-#     authors: henrygd
-#     summary: 'Agent for Beszel, a lightweight server monitoring platform.'
-#     description: |
-#       Beszel is a lightweight server monitoring platform that includes Docker statistics, historical data, and alert functions.
-
-#       It has a friendly web interface, simple configuration, and is ready to use out of the box. It supports automatic backup, multi-user, OAuth authentication, and API access.
-#     license_url: https://github.com/henrygd/beszel/blob/main/LICENSE
-#     project_url: https://beszel.dev
-#     project_source_url: https://github.com/henrygd/beszel
-#     docs_url: https://beszel.dev/guide/getting-started
-#     icon_url: https://cdn.jsdelivr.net/gh/selfhst/icons/png/beszel.png
-#     bug_tracker_url: https://github.com/henrygd/beszel/issues
-#     copyright: 2025 henrygd
-#     tags: foss cross-platform admin monitoring
-#     require_license_acceptance: false
-#     release_notes: 'https://github.com/henrygd/beszel/releases/tag/v{{ .Version }}'
-
-brews:
-  - ids: [beszel-agent]
-    name: beszel-agent
-    repository:
-      owner: henrygd
-      name: homebrew-beszel
-    homepage: 'https://beszel.dev'
-    description: 'Agent for Beszel, a lightweight server monitoring platform.'
-    license: MIT
-    extra_install: |
-      (bin/"beszel-agent-launcher").write <<~EOS
-        #!/bin/bash
-        set -a
-        if [ -f "$HOME/.config/beszel/beszel-agent.env" ]; then
-          source "$HOME/.config/beszel/beszel-agent.env"
-        fi
-        set +a
-        exec #{bin}/beszel-agent "$@"
-      EOS
-      (bin/"beszel-agent-launcher").chmod 0755
-    service: |
-      run ["#{bin}/beszel-agent-launcher"]
-      log_path "#{Dir.home}/.cache/beszel/beszel-agent.log"
-      error_log_path "#{Dir.home}/.cache/beszel/beszel-agent.log"
-      keep_alive true
-      restart_delay 5
-      name beszel-agent
-      process_type :background
-
-winget:
-  - ids: [beszel-agent]
-    name: beszel-agent
-    package_identifier: henrygd.beszel-agent
-    publisher: henrygd
-    license: MIT
-    license_url: 'https://github.com/henrygd/beszel/blob/main/LICENSE'
-    copyright: '2025 henrygd'
-    homepage: 'https://beszel.dev'
-    release_notes_url: 'https://github.com/henrygd/beszel/releases/tag/v{{ .Version }}'
-    publisher_support_url: 'https://github.com/henrygd/beszel/issues'
-    short_description: 'Agent for Beszel, a lightweight server monitoring platform.'
-    skip_upload: auto
-    description: |
-      Beszel is a lightweight server monitoring platform that includes Docker
-      statistics, historical data, and alert functions. It has a friendly web
-      interface, simple configuration, and is ready to use out of the box.
-      It supports automatic backup, multi-user, OAuth authentication, and
-      API access.
-    tags:
-      - homelab
-      - monitoring
-      - self-hosted
-    repository:
-      owner: henrygd
-      name: beszel-winget
-      branch: henrygd.beszel-agent-{{ .Version }}
-      pull_request:
-        enabled: false
-        draft: false
-        base:
-          owner: microsoft
-          name: winget-pkgs
-          branch: master
-
 release:
   draft: true
 

beszel/Makefile

@@ -14,10 +14,6 @@ clean:
 lint:
 	golangci-lint run
 
-test: export GOEXPERIMENT=synctest
-test:
-	go test -tags=testing ./...
-
 tidy:
 	go mod tidy
 

beszel/cmd/agent/agent.go

@@ -7,63 +7,50 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strings"
 
 	"golang.org/x/crypto/ssh"
 )
 
 // cli options
 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.
+	key  string // key is the public key(s) for SSH authentication.
+	addr string // addr is the address or port to listen on.
 }
 
-// parse parses the command line flags and populates the config struct.
-// It returns true if a subcommand was handled and the program should exit.
-func (opts *cmdOptions) parse() bool {
+// parseFlags parses the command line flags and populates the config struct.
+func (opts *cmdOptions) parseFlags() {
 	flag.StringVar(&opts.key, "key", "", "Public key(s) for SSH authentication")
-	flag.StringVar(&opts.listen, "listen", "", "Address or port to listen on")
+	flag.StringVar(&opts.addr, "addr", "", "Address or port to listen on")
 
 	flag.Usage = func() {
-		fmt.Printf("Usage: %s [command] [flags]\n", os.Args[0])
-		fmt.Println("\nCommands:")
-		fmt.Println("  health    Check if the agent is running")
-		fmt.Println("  help      Display this help message")
-		fmt.Println("  update    Update to the latest version")
-		fmt.Println("  version   Display the version")
-		fmt.Println("\nFlags:")
+		fmt.Printf("Usage: %s [options] [subcommand]\n", os.Args[0])
+		fmt.Println("\nOptions:")
 		flag.PrintDefaults()
+		fmt.Println("\nSubcommands:")
+		fmt.Println("  version      Display the version")
+		fmt.Println("  help         Display this help message")
+		fmt.Println("  update       Update the agent to the latest version")
 	}
+}
 
-	subcommand := ""
-	if len(os.Args) > 1 {
-		subcommand = os.Args[1]
+// handleSubcommand handles subcommands such as version, help, and update.
+// It returns true if a subcommand was handled, false otherwise.
+func handleSubcommand() bool {
+	if len(os.Args) <= 1 {
+		return false
 	}
-
-	switch subcommand {
-	case "-v", "version":
+	switch os.Args[1] {
+	case "version", "-v":
 		fmt.Println(beszel.AppName+"-agent", beszel.Version)
-		return true
+		os.Exit(0)
 	case "help":
 		flag.Usage()
-		return true
+		os.Exit(0)
 	case "update":
 		agent.Update()
-		return true
-	case "health":
-		// for health, we need to parse flags first to get the listen address
-		args := append(os.Args[2:], subcommand)
-		flag.CommandLine.Parse(args)
-		addr := opts.getAddress()
-		network := agent.GetNetwork(addr)
-		err := agent.Health(addr, network)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Print("ok")
-		return true
+		os.Exit(0)
 	}
-
-	flag.Parse()
 	return false
 }
 
@@ -92,18 +79,46 @@ func (opts *cmdOptions) loadPublicKeys() ([]ssh.PublicKey, error) {
 	return agent.ParseKeys(string(pubKey))
 }
 
+// getAddress gets the address to listen on from the command line flag, environment variable, or default value.
 func (opts *cmdOptions) getAddress() string {
-	return agent.GetAddress(opts.listen)
+	// Try command line flag first
+	if opts.addr != "" {
+		return opts.addr
+	}
+	// Try environment variables
+	if addr, ok := agent.GetEnv("ADDR"); ok && addr != "" {
+		return addr
+	}
+	// Legacy PORT environment variable support
+	if port, ok := agent.GetEnv("PORT"); ok && port != "" {
+		return port
+	}
+	return ":45876"
+}
+
+// getNetwork returns the network type to use for the server.
+func (opts *cmdOptions) getNetwork() string {
+	if network, _ := agent.GetEnv("NETWORK"); network != "" {
+		return network
+	}
+	if strings.HasPrefix(opts.addr, "/") {
+		return "unix"
+	}
+	return "tcp"
 }
 
 func main() {
 	var opts cmdOptions
-	subcommandHandled := opts.parse()
+	opts.parseFlags()
 
-	if subcommandHandled {
+	if handleSubcommand() {
 		return
 	}
 
+	flag.Parse()
+
+	opts.addr = opts.getAddress()
+
 	var serverConfig agent.ServerOptions
 	var err error
 	serverConfig.Keys, err = opts.loadPublicKeys()
@@ -111,9 +126,8 @@ func main() {
 		log.Fatal("Failed to load public keys:", err)
 	}
 
-	addr := opts.getAddress()
-	serverConfig.Addr = addr
-	serverConfig.Network = agent.GetNetwork(addr)
+	serverConfig.Addr = opts.addr
+	serverConfig.Network = opts.getNetwork()
 
 	agent := agent.NewAgent()
 	if err := agent.StartServer(serverConfig); err != nil {

beszel/cmd/agent/agent_test.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"beszel/internal/agent"
 	"crypto/ed25519"
 	"flag"
 	"os"
@@ -28,22 +27,22 @@ func TestGetAddress(t *testing.T) {
 		{
 			name: "use address from flag",
 			opts: cmdOptions{
-				listen: "8080",
+				addr: "8080",
 			},
-			expected: ":8080",
+			expected: "8080",
 		},
 		{
 			name: "use unix socket from flag",
 			opts: cmdOptions{
-				listen: "/tmp/beszel.sock",
+				addr: "/tmp/beszel.sock",
 			},
 			expected: "/tmp/beszel.sock",
 		},
 		{
-			name: "use LISTEN env var",
+			name: "use ADDR env var",
 			opts: cmdOptions{},
 			envVars: map[string]string{
-				"LISTEN": "1.2.3.4:9090",
+				"ADDR": "1.2.3.4:9090",
 			},
 			expected: "1.2.3.4:9090",
 		},
@@ -53,26 +52,26 @@ func TestGetAddress(t *testing.T) {
 			envVars: map[string]string{
 				"PORT": "7070",
 			},
-			expected: ":7070",
+			expected: "7070",
 		},
 		{
 			name: "use unix socket from env var",
 			opts: cmdOptions{
-				listen: "",
+				addr: "",
 			},
 			envVars: map[string]string{
-				"LISTEN": "/tmp/beszel.sock",
+				"ADDR": "/tmp/beszel.sock",
 			},
 			expected: "/tmp/beszel.sock",
 		},
 		{
 			name: "flag takes precedence over env vars",
 			opts: cmdOptions{
-				listen: ":8080",
+				addr: ":8080",
 			},
 			envVars: map[string]string{
-				"LISTEN": ":9090",
-				"PORT":   "7070",
+				"ADDR": ":9090",
+				"PORT": "7070",
 			},
 			expected: ":8080",
 		},
@@ -202,27 +201,27 @@ func TestGetNetwork(t *testing.T) {
 		},
 		{
 			name:     "only port",
-			opts:     cmdOptions{listen: "8080"},
+			opts:     cmdOptions{addr: "8080"},
 			expected: "tcp",
 		},
 		{
 			name:     "ipv4 address",
-			opts:     cmdOptions{listen: "1.2.3.4:8080"},
+			opts:     cmdOptions{addr: "1.2.3.4:8080"},
 			expected: "tcp",
 		},
 		{
 			name:     "ipv6 address",
-			opts:     cmdOptions{listen: "[2001:db8::1]:8080"},
+			opts:     cmdOptions{addr: "[2001:db8::1]:8080"},
 			expected: "tcp",
 		},
 		{
 			name:     "unix network",
-			opts:     cmdOptions{listen: "/tmp/beszel.sock"},
+			opts:     cmdOptions{addr: "/tmp/beszel.sock"},
 			expected: "unix",
 		},
 		{
 			name:     "env var network",
-			opts:     cmdOptions{listen: ":8080"},
+			opts:     cmdOptions{addr: ":8080"},
 			envVars:  map[string]string{"NETWORK": "tcp4"},
 			expected: "tcp4",
 		},
@@ -234,7 +233,7 @@ func TestGetNetwork(t *testing.T) {
 			for k, v := range tt.envVars {
 				t.Setenv(k, v)
 			}
-			network := agent.GetNetwork(tt.opts.listen)
+			network := tt.opts.getNetwork()
 			assert.Equal(t, tt.expected, network)
 		})
 	}
@@ -257,32 +256,32 @@ func TestParseFlags(t *testing.T) {
 			name: "no flags",
 			args: []string{"cmd"},
 			expected: cmdOptions{
-				key:    "",
-				listen: "",
+				key:  "",
+				addr: "",
 			},
 		},
 		{
 			name: "key flag only",
 			args: []string{"cmd", "-key", "testkey"},
 			expected: cmdOptions{
-				key:    "testkey",
-				listen: "",
+				key:  "testkey",
+				addr: "",
 			},
 		},
 		{
 			name: "addr flag only",
-			args: []string{"cmd", "-listen", ":8080"},
+			args: []string{"cmd", "-addr", ":8080"},
 			expected: cmdOptions{
-				key:    "",
-				listen: ":8080",
+				key:  "",
+				addr: ":8080",
 			},
 		},
 		{
 			name: "both flags",
-			args: []string{"cmd", "-key", "testkey", "-listen", ":8080"},
+			args: []string{"cmd", "-key", "testkey", "-addr", ":8080"},
 			expected: cmdOptions{
-				key:    "testkey",
-				listen: ":8080",
+				key:  "testkey",
+				addr: ":8080",
 			},
 		},
 	}
@@ -294,7 +293,7 @@ func TestParseFlags(t *testing.T) {
 			os.Args = tt.args
 
 			var opts cmdOptions
-			opts.parse()
+			opts.parseFlags()
 			flag.Parse()
 
 			assert.Equal(t, tt.expected, opts)

beszel/cmd/hub/hub.go

@@ -1,99 +1,10 @@
 package main
 
 import (
-	"beszel"
 	"beszel/internal/hub"
 	_ "beszel/migrations"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/pocketbase/pocketbase"
-	"github.com/pocketbase/pocketbase/plugins/migratecmd"
-	"github.com/spf13/cobra"
 )
 
 func main() {
-	// handle health check first to prevent unneeded execution
-	if len(os.Args) > 3 && os.Args[1] == "health" {
-		url := os.Args[3]
-		if err := checkHealth(url); err != nil {
-			log.Fatal(err)
-		}
-		fmt.Print("ok")
-		return
-	}
-
-	baseApp := getBaseApp()
-	h := hub.NewHub(baseApp)
-	if err := h.StartHub(); err != nil {
-		log.Fatal(err)
-	}
-}
-
-// getBaseApp creates a new PocketBase app with the default config
-func getBaseApp() *pocketbase.PocketBase {
-	isDev := os.Getenv("ENV") == "dev"
-
-	baseApp := pocketbase.NewWithConfig(pocketbase.Config{
-		DefaultDataDir: beszel.AppName + "_data",
-		DefaultDev:     isDev,
-	})
-	baseApp.RootCmd.Version = beszel.Version
-	baseApp.RootCmd.Use = beszel.AppName
-	baseApp.RootCmd.Short = ""
-	// add update command
-	baseApp.RootCmd.AddCommand(&cobra.Command{
-		Use:   "update",
-		Short: "Update " + beszel.AppName + " to the latest version",
-		Run:   hub.Update,
-	})
-	// add health command
-	baseApp.RootCmd.AddCommand(newHealthCmd())
-
-	// enable auto creation of migration files when making collection changes in the Admin UI
-	migratecmd.MustRegister(baseApp, baseApp.RootCmd, migratecmd.Config{
-		Automigrate: isDev,
-		Dir:         "../../migrations",
-	})
-
-	return baseApp
-}
-
-func newHealthCmd() *cobra.Command {
-	var baseURL string
-
-	healthCmd := &cobra.Command{
-		Use:   "health",
-		Short: "Check health of running hub",
-		Run: func(cmd *cobra.Command, args []string) {
-			if err := checkHealth(baseURL); err != nil {
-				log.Fatal(err)
-			}
-			os.Exit(0)
-		},
-	}
-	healthCmd.Flags().StringVar(&baseURL, "url", "", "base URL")
-	healthCmd.MarkFlagRequired("url")
-	return healthCmd
-}
-
-// checkHealth checks the health of the hub.
-func checkHealth(baseURL string) error {
-	client := &http.Client{
-		Timeout: time.Second * 3,
-	}
-	healthURL := baseURL + "/api/health"
-	resp, err := client.Get(healthURL)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return fmt.Errorf("%s returned status %d", healthURL, resp.StatusCode)
-	}
-	return nil
+	hub.NewHub().Run()
 }

beszel/go.mod

@@ -1,48 +1,65 @@
 module beszel
 
-go 1.24.2
-
-// lock shoutrrr to specific version to allow review before updating
-replace github.com/nicholas-fedor/shoutrrr => github.com/nicholas-fedor/shoutrrr v0.8.8
+go 1.24.0
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/containrrr/shoutrrr v0.8.0
 	github.com/gliderlabs/ssh v0.3.8
 	github.com/goccy/go-json v0.10.5
-	github.com/nicholas-fedor/shoutrrr v0.8.8
 	github.com/pocketbase/dbx v1.11.0
-	github.com/pocketbase/pocketbase v0.27.1
+	github.com/pocketbase/pocketbase v0.25.0
 	github.com/rhysd/go-github-selfupdate v1.2.3
-	github.com/shirou/gopsutil/v4 v4.25.3
+	github.com/shirou/gopsutil/v4 v4.25.1
 	github.com/spf13/cast v1.7.1
-	github.com/spf13/cobra v1.9.1
+	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/crypto v0.37.0
-	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
+	golang.org/x/crypto v0.32.0
+	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.29.6 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.59 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
+	github.com/aws/smithy-go v1.22.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/domodwyer/mailyak/v3 v3.6.2 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
-	github.com/ganigeorgiev/fexpr v0.5.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/ganigeorgiev/fexpr v0.4.1 // 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/golang-jwt/jwt/v5 v5.2.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/go-github/v30 v30.1.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
+	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
@@ -51,18 +68,26 @@ require (
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/tcnksm/go-gitconfig v0.1.2 // indirect
-	github.com/tklauser/go-sysconf v0.3.15 // indirect
-	github.com/tklauser/numcpus v0.10.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/image v0.26.0 // indirect
-	golang.org/x/net v0.39.0 // indirect
-	golang.org/x/oauth2 v0.29.0 // indirect
-	golang.org/x/sync v0.13.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
-	modernc.org/libc v1.64.0 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	gocloud.dev v0.40.0 // indirect
+	golang.org/x/image v0.24.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/oauth2 v0.26.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/term v0.29.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
+	google.golang.org/api v0.220.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.4 // indirect
+	modernc.org/libc v1.55.3 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.10.0 // indirect
-	modernc.org/sqlite v1.37.0 // indirect
+	modernc.org/memory v1.8.2 // indirect
+	modernc.org/sqlite v1.34.5 // indirect
 )

beszel/go.sum

@@ -1,14 +1,75 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14=
+cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU=
+cloud.google.com/go/auth v0.14.1 h1:AwoJbzUdxA/whv1qj3TLKwh3XX5sikny2fc40wUl+h0=
+cloud.google.com/go/auth v0.14.1/go.mod h1:4JHUxlGXisL0AW8kXPtUF6ztuOksyfUQNFjfsOCXkPM=
+cloud.google.com/go/auth/oauth2adapt v0.2.7 h1:/Lc7xODdqcEw8IrZ9SvwnlLX6j9FHQM74z6cBk9Rw6M=
+cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc=
+cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0=
+cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
+cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
+cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4=
+cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus=
+cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs=
+cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
+github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go-v2 v1.36.1 h1:iTDl5U6oAhkNPba0e1t1hrwAo02ZMqbrGq4k5JBWM5E=
+github.com/aws/aws-sdk-go-v2 v1.36.1/go.mod h1:5PMILGVKiW32oDzjj6RU52yrNrDPUHcbZQYr1sM7qmM=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 h1:zAxi9p3wsZMIaVCdoiQp2uZ9k1LsZvmAnoTBeZPXom0=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8/go.mod h1:3XkePX5dSaxveLAYY7nsbsZZrKxCyEuE5pM4ziFxyGg=
+github.com/aws/aws-sdk-go-v2/config v1.29.6 h1:fqgqEKK5HaZVWLQoLiC9Q+xDlSp+1LYidp6ybGE2OGg=
+github.com/aws/aws-sdk-go-v2/config v1.29.6/go.mod h1:Ft+WLODzDQmCTHDvqAH1JfC2xxbZ0MxpZAcJqmE1LTQ=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.59 h1:9btwmrt//Q6JcSdgJOLI98sdr5p7tssS9yAsGe8aKP4=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.59/go.mod h1:NM8fM6ovI3zak23UISdWidyZuI1ghNe2xjzUZAyT+08=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 h1:KwsodFKVQTlI5EyhRSugALzsV6mG/SGrdjlMXSZSdso=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28/go.mod h1:EY3APf9MzygVhKuPXAc5H+MkGb8k/DOSQjWS0LgkKqI=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.59 h1:5Vsrfdlf9KQP3leGX1dD7VwZq/3HAerEFoXAII4t6zo=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.59/go.mod h1:7XTNs3NYApJjkx6A2Fk9qq23qBuBnIU58k3fKC2Fr1I=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 h1:BjUcr3X3K0wZPGFg2bxOWW3VPN8rkE3/61zhP+IHviA=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32/go.mod h1:80+OGC/bgzzFFTUmcuwD0lb4YutwQeKLFpmt6hoWapU=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 h1:m1GeXHVMJsRsUAqG6HjZWx9dj7F5TR+cF1bjyfYyBd4=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32/go.mod h1:IitoQxGfaKdVLNg0hD8/DXmAqNy0H4K2H2Sf91ti8sI=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 h1:Pg9URiobXy85kgFev3og2CuOZ8JZUBENF+dcgWBaYNk=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 h1:OIHj/nAhVzIXGzbAE+4XmZ8FPvro3THr6NlqErJc3wY=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32/go.mod h1:LiBEsDo34OJXqdDlRGsilhlIiXR7DL+6Cx2f4p1EgzI=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 h1:D4oz8/CzT9bAEYtVhSBmFj2dNOtaHOtMKc2vHBwYizA=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2/go.mod h1:Za3IHqTQ+yNcRHxu1OFucBh0ACZT4j4VQFF0BqpZcLY=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.6 h1:cCBJaT7EeEojpJ4s7wTDbhZlHVJOgNHN7iw6qVurGaw=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.6/go.mod h1:WYH1ABybY7JK9TITPnk6ZlP7gQB8psI4c9qDmMsnLSA=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 h1:SYVGSFQHlchIcy6e7x12bsrxClCXSP5et8cqVhL8cuw=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13/go.mod h1:kizuDaLX37bG5WZaoxGPQR/LNFXpxp0vsUnqfkWXfNE=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 h1:OBsrtam3rk8NfBEq7OLOMm5HtQ9Yyw32X4UQMya/wjw=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13/go.mod h1:3U4gFA5pmoCOja7aq4nSaIAGbaOHv2Yl2ug018cmC+Q=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.75.4 h1:DJYjOvNgC30JAcDCRmtQHoYK4trc7XetDXRTEAReGKA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.75.4/go.mod h1:KuLNrwYJFaC2AVZ+CVVc12k9NyqwgWsoNNHjwqF6QNk=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 h1:/eE3DogBjYlvlbhd2ssWyeuovWunHLxfgw3s/OJa4GQ=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.15/go.mod h1:2PCJYpi7EKeA5SkStAmZlF6fi0uUABuhtF8ILHjGc3Y=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 h1:M/zwXiL2iXUrHputuXgmO94TVNmcenPHxgLXLutodKE=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14/go.mod h1:RVwIw3y/IqxC2YEXSIkAzRDdEU1iRabDPaYjpGCbCGQ=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 h1:TzeR06UCMUq+KA3bDkujxK1GVGy+G8qQN/QVYzGLkQE=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.14/go.mod h1:dspXf/oYWGWo6DEvj98wpaTeqt5+DMidZD0A9BYTizc=
+github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
+github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 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/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec=
+github.com/containrrr/shoutrrr v0.8.0/go.mod h1:ioyQAyu1LJY6sILuNyKaQaw+9Ttik5QePU8atnAdO2o=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
@@ -19,55 +80,94 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
 github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
-github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
-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/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
+github.com/ganigeorgiev/fexpr v0.4.1 h1:hpUgbUEEWIZhSDBtf4M9aUNfQQ0BZkGRaMePy7Gcx5k=
+github.com/ganigeorgiev/fexpr v0.4.1/go.mod h1:RyGiGqmeXhEQ6+mlGdnUleLHgtzzu/VGO2WtJkF5drE=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead57VkAEY4V+Es=
 github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtSb/iI=
-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/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
-github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-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/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo=
 github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
+github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
+github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
+github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
+github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q=
+github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg=
 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.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k=
-github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
+github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc=
+github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -75,32 +175,31 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 h1:PpXWgLPs+Fqr325bN2FD2ISlRRztXibcX6e8f5FR5Dc=
-github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
+github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/nicholas-fedor/shoutrrr v0.8.8 h1:F/oyoatWK5cbHPPgkjRZrA0262TP7KWuUQz9KskRtR8=
-github.com/nicholas-fedor/shoutrrr v0.8.8/go.mod h1:T30Y+eoZFEjDk4HtOItcHQioZSOe3Z6a6aNfSz6jc5c=
 github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
-github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
+github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
 github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
-github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 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.27.1 h1:KGCsS8idUVTC5QHxTj91qHDhIXOb5Yb50wwHhNvJRTQ=
-github.com/pocketbase/pocketbase v0.27.1/go.mod h1:aTpwwloVJzeJ7MlwTRrbI/x62QNR2/kkCrovmyrXpqs=
+github.com/pocketbase/pocketbase v0.25.0 h1:/4YQq1hd0muvhzbERyUTVNh88N0BCj5diqK0jtLN6k8=
+github.com/pocketbase/pocketbase v0.25.0/go.mod h1:tOtOv7f3vJhAiyUluIwV9JPuKeknZRQ9F6uJE3W/ntI=
 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rhysd/go-github-selfupdate v1.2.3 h1:iaa+J202f+Nc+A8zi75uccC8Wg3omaM7HDeimXA22Ag=
@@ -108,82 +207,156 @@ github.com/rhysd/go-github-selfupdate v1.2.3/go.mod h1:mp/N8zj6jFfBQy/XMYoWsmfzx
 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.3 h1:SeA68lsu8gLggyMbmCn8cmp97V1TI9ld9sVzAUcKcKE=
-github.com/shirou/gopsutil/v4 v4.25.3/go.mod h1:xbuxyoZj+UsgnZrENu3lQivsngRR5BdjbJwf2fv4szA=
+github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
+github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
 github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
 github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw=
 github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE=
-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/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo=
+github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 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.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+gocloud.dev v0.40.0 h1:f8LgP+4WDqOG/RXoUcyLpeIAGOcAbZrZbDQCUee10ng=
+gocloud.dev v0.40.0/go.mod h1:drz+VyYNBvrMTW0KZiBAYEdl8lbNZx+OQ7oQvdrFmSQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
-golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
+golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
-golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
+golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
-golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/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.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
-golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 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.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
+golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
-golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
+golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
+golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
+google.golang.org/api v0.220.0 h1:3oMI4gdBgB72WFVwE1nerDD8W3HUOS4kypK6rRLbGns=
+google.golang.org/api v0.220.0/go.mod h1:26ZAlY6aN/8WgpCzjPNy18QpYaz7Zgg1h0qe1GkZEmY=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phrYMtzX11k+XkzMGfRAet42PmoTATM=
+google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988/go.mod h1:7uvplUBj4RjHAxIZ//98LzOvrQ04JBkaixRmCMI29hc=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
+google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 h1:5bKytslY8ViY0Cj/ewmRtrWHW64bNF03cAatUUFCdFI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -191,29 +364,32 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/cc/v4 v4.26.0 h1:QMYvbVduUGH0rrO+5mqF/PSPPRZNpRtg2CLELy7vUpA=
-modernc.org/cc/v4 v4.26.0/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.26.0 h1:gVzXaDzGeBYJ2uXTOpR8FR7OlksDOe9jxnjhIKCsiTc=
-modernc.org/ccgo/v4 v4.26.0/go.mod h1:Sem8f7TFUtVXkG2fiaChQtyyfkqhJBg/zjEJBkmuAVY=
-modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
-modernc.org/fileutil v1.3.1/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/libc v1.64.0 h1:U0k8BD2d3cD3e9I8RLcZgJBHAcsJzbXx5mKGSb5pyJA=
-modernc.org/libc v1.64.0/go.mod h1:7m9VzGq7APssBTydds2zBcxGREwvIGpuUBaKTXdm2Qs=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
+modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
+modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y=
+modernc.org/ccgo/v4 v4.19.2/go.mod h1:ysS3mxiMV38XGRTTcgo0DQTeTmAO4oCmJl1nX9VFI3s=
+modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
+modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
+modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
+modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
+modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
+modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
 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.10.0 h1:fzumd51yQ1DxcOxSO+S6X7+QTuVU+n8/Aj7swYjFfC4=
-modernc.org/memory v1.10.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
-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.37.0 h1:s1TMe7T3Q3ovQiK2Ouz4Jwh7dw4ZDqbebSDTlSJdfjI=
-modernc.org/sqlite v1.37.0/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM=
-modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
-modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
+modernc.org/memory v1.8.2 h1:cL9L4bcoAObu4NkxOlKWBWtNHIsnnACGF/TbqQ6sbcI=
+modernc.org/memory v1.8.2/go.mod h1:ZbjSvMO5NQ1A2i3bWeDiVMxIorXwdClKE/0SZ+BMotU=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
+modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
+modernc.org/sqlite v1.34.5 h1:Bb6SR13/fjp15jt70CL4f18JIN7p7dnMExd+UFnF15g=
+modernc.org/sqlite v1.34.5/go.mod h1:YLuNmX9NKs8wRNK2ko1LW1NGYcc9FkBO69JOt1AR9JE=
+modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
+modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

beszel/internal/agent/agent.go

@@ -4,37 +4,37 @@ package agent
 import (
 	"beszel"
 	"beszel/internal/entities/system"
+	"context"
 	"log/slog"
 	"os"
 	"strings"
 	"sync"
-	"time"
+
+	"github.com/shirou/gopsutil/v4/common"
 )
 
 type Agent struct {
-	sync.Mutex                               // Used to lock agent while collecting data
-	debug         bool                       // true if LOG_LEVEL is set to debug
-	zfs           bool                       // true if system has arcstats
-	memCalc       string                     // Memory calculation formula
-	fsNames       []string                   // List of filesystem device names being monitored
-	fsStats       map[string]*system.FsStats // Keeps track of disk stats for each filesystem
-	netInterfaces map[string]struct{}        // Stores all valid network interfaces
-	netIoStats    system.NetIoStats          // Keeps track of bandwidth usage
-	dockerManager *dockerManager             // Manages Docker API requests
-	sensorConfig  *SensorConfig              // Sensors config
-	systemInfo    system.Info                // Host system info
-	gpuManager    *GPUManager                // Manages GPU data
-	cache         *SessionCache              // Cache for system stats based on primary session ID
-	smartManager     *SmartManager              // Manages SMART data
+	sync.Mutex                                  // Used to lock agent while collecting data
+	debug            bool                       // true if LOG_LEVEL is set to debug
+	zfs              bool                       // true if system has arcstats
+	memCalc          string                     // Memory calculation formula
+	fsNames          []string                   // List of filesystem device names being monitored
+	fsStats          map[string]*system.FsStats // Keeps track of disk stats for each filesystem
+	netInterfaces    map[string]struct{}        // Stores all valid network interfaces
+	netIoStats       system.NetIoStats          // Keeps track of bandwidth usage
+	dockerManager    *dockerManager             // Manages Docker API requests
+	sensorsContext   context.Context            // Sensors context to override sys location
+	sensorsWhitelist map[string]struct{}        // List of sensors to monitor
+	systemInfo       system.Info                // Host system info
+	gpuManager       *GPUManager                // Manages GPU data
 }
 
 func NewAgent() *Agent {
 	agent := &Agent{
 		fsStats: make(map[string]*system.FsStats),
-		cache:   NewSessionCache(69 * time.Second),
 	}
 	agent.memCalc, _ = GetEnv("MEM_CALC")
-	agent.sensorConfig = agent.newSensorConfig()
+
 	// 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) {
@@ -50,6 +50,26 @@ func NewAgent() *Agent {
 
 	slog.Debug(beszel.Version)
 
+	// Set sensors context (allows overriding sys location for sensors)
+	if sysSensors, exists := GetEnv("SYS_SENSORS"); exists {
+		slog.Info("SYS_SENSORS", "path", sysSensors)
+		agent.sensorsContext = context.WithValue(agent.sensorsContext,
+			common.EnvKey, common.EnvMap{common.HostSysEnvKey: sysSensors},
+		)
+	} else {
+		agent.sensorsContext = context.Background()
+	}
+
+	// Set sensors whitelist
+	if sensors, exists := GetEnv("SENSORS"); exists {
+		agent.sensorsWhitelist = make(map[string]struct{})
+		for _, sensor := range strings.Split(sensors, ",") {
+			if sensor != "" {
+				agent.sensorsWhitelist[sensor] = struct{}{}
+			}
+		}
+	}
+
 	// initialize system info / docker manager
 	agent.initializeSystemInfo()
 	agent.initializeDiskInfo()
@@ -63,15 +83,9 @@ func NewAgent() *Agent {
 		agent.gpuManager = gm
 	}
 
-	if sm, err := NewSmartManager(); err != nil {
-		slog.Debug("SMART", "err", err)
-	} else {
-		agent.smartManager = sm
-	}
-
 	// if debugging, print stats
 	if agent.debug {
-		slog.Debug("Stats", "data", agent.gatherStats(""))
+		slog.Debug("Stats", "data", agent.gatherStats())
 	}
 
 	return agent
@@ -86,39 +100,29 @@ func GetEnv(key string) (value string, exists bool) {
 	return os.LookupEnv(key)
 }
 
-func (a *Agent) gatherStats(sessionID string) *system.CombinedData {
+func (a *Agent) gatherStats() system.CombinedData {
 	a.Lock()
 	defer a.Unlock()
-
-	cachedData, ok := a.cache.Get(sessionID)
-	if ok {
-		slog.Debug("Cached stats", "session", sessionID)
-		return cachedData
-	}
-
-	*cachedData = system.CombinedData{
+	slog.Debug("Getting stats")
+	systemData := system.CombinedData{
 		Stats: a.getSystemStats(),
 		Info:  a.systemInfo,
 	}
-	slog.Debug("System stats", "data", cachedData)
-
-	if a.dockerManager != nil {
-		if containerStats, err := a.dockerManager.getDockerStats(); err == nil {
-			cachedData.Containers = containerStats
-			slog.Debug("Docker stats", "data", cachedData.Containers)
-		} else {
-			slog.Debug("Docker stats", "err", err)
-		}
+	slog.Debug("System stats", "data", systemData)
+	// add docker stats
+	if containerStats, err := a.dockerManager.getDockerStats(); err == nil {
+		systemData.Containers = containerStats
+		slog.Debug("Docker stats", "data", systemData.Containers)
+	} else {
+		slog.Debug("Error getting docker stats", "err", err)
 	}
-
-	cachedData.Stats.ExtraFs = make(map[string]*system.FsStats)
+	// add extra filesystems
+	systemData.Stats.ExtraFs = make(map[string]*system.FsStats)
 	for name, stats := range a.fsStats {
 		if !stats.Root && stats.DiskTotal > 0 {
-			cachedData.Stats.ExtraFs[name] = stats
+			systemData.Stats.ExtraFs[name] = stats
 		}
 	}
-	slog.Debug("Extra filesystems", "data", cachedData.Stats.ExtraFs)
-
-	a.cache.Set(sessionID, cachedData)
-	return cachedData
+	slog.Debug("Extra filesystems", "data", systemData.Stats.ExtraFs)
+	return systemData
 }

beszel/internal/agent/agent_cache.go

@@ -1,36 +0,0 @@
-package agent
-
-import (
-	"beszel/internal/entities/system"
-	"time"
-)
-
-// Not thread safe since we only access from gatherStats which is already locked
-type SessionCache struct {
-	data           *system.CombinedData
-	lastUpdate     time.Time
-	primarySession string
-	leaseTime      time.Duration
-}
-
-func NewSessionCache(leaseTime time.Duration) *SessionCache {
-	return &SessionCache{
-		leaseTime: leaseTime,
-		data:      &system.CombinedData{},
-	}
-}
-
-func (c *SessionCache) Get(sessionID string) (stats *system.CombinedData, isCached bool) {
-	if sessionID != c.primarySession && time.Since(c.lastUpdate) < c.leaseTime {
-		return c.data, true
-	}
-	return c.data, false
-}
-
-func (c *SessionCache) Set(sessionID string, data *system.CombinedData) {
-	if data != nil {
-		*c.data = *data
-	}
-	c.primarySession = sessionID
-	c.lastUpdate = time.Now()
-}

beszel/internal/agent/agent_cache_test.go

@@ -1,85 +0,0 @@
-package agent
-
-import (
-	"beszel/internal/entities/system"
-	"testing"
-	"testing/synctest"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSessionCache_GetSet(t *testing.T) {
-	synctest.Run(func() {
-		cache := NewSessionCache(69 * time.Second)
-
-		testData := &system.CombinedData{
-			Info: system.Info{
-				Hostname: "test-host",
-				Cores:    4,
-			},
-			Stats: system.Stats{
-				Cpu:     50.0,
-				MemPct:  30.0,
-				DiskPct: 40.0,
-			},
-		}
-
-		// Test initial state - should not be cached
-		data, isCached := cache.Get("session1")
-		assert.False(t, isCached, "Expected no cached data initially")
-		assert.NotNil(t, data, "Expected data to be initialized")
-		// Set data for session1
-		cache.Set("session1", testData)
-
-		time.Sleep(15 * time.Second)
-
-		// Get data for a different session - should be cached
-		data, isCached = cache.Get("session2")
-		assert.True(t, isCached, "Expected data to be cached for non-primary session")
-		require.NotNil(t, data, "Expected cached data to be returned")
-		assert.Equal(t, "test-host", data.Info.Hostname, "Hostname should match test data")
-		assert.Equal(t, 4, data.Info.Cores, "Cores should match test data")
-		assert.Equal(t, 50.0, data.Stats.Cpu, "CPU should match test data")
-		assert.Equal(t, 30.0, data.Stats.MemPct, "Memory percentage should match test data")
-		assert.Equal(t, 40.0, data.Stats.DiskPct, "Disk percentage should match test data")
-
-		time.Sleep(10 * time.Second)
-
-		// Get data for the primary session - should not be cached
-		data, isCached = cache.Get("session1")
-		assert.False(t, isCached, "Expected data not to be cached for primary session")
-		require.NotNil(t, data, "Expected data to be returned even if not cached")
-		assert.Equal(t, "test-host", data.Info.Hostname, "Hostname should match test data")
-		// if not cached, agent will update the data
-		cache.Set("session1", testData)
-
-		time.Sleep(45 * time.Second)
-
-		// Get data for a different session - should still be cached
-		_, isCached = cache.Get("session2")
-		assert.True(t, isCached, "Expected data to be cached for non-primary session")
-
-		// Wait for the lease to expire
-		time.Sleep(30 * time.Second)
-
-		// Get data for session2 - should not be cached
-		_, isCached = cache.Get("session2")
-		assert.False(t, isCached, "Expected data not to be cached after lease expiration")
-	})
-}
-
-func TestSessionCache_NilData(t *testing.T) {
-	// Create a new SessionCache
-	cache := NewSessionCache(30 * time.Second)
-
-	// Test setting nil data (should not panic)
-	assert.NotPanics(t, func() {
-		cache.Set("session1", nil)
-	}, "Setting nil data should not panic")
-
-	// Get data - should not be nil even though we set nil
-	data, _ := cache.Get("session2")
-	assert.NotNil(t, data, "Expected data to not be nil after setting nil data")
-}

beszel/internal/agent/disk.go

@@ -5,7 +5,6 @@ import (
 	"log/slog"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"time"
 
@@ -37,12 +36,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) {
-		var key string
-		if runtime.GOOS == "windows" {
-			key = device
-		} else {
-			key = filepath.Base(device)
-		}
+		key := filepath.Base(device)
 		var ioMatch bool
 		if _, exists := a.fsStats[key]; !exists {
 			if root {

beszel/internal/agent/docker.go

@@ -22,23 +22,10 @@ type dockerManager struct {
 	wg                  sync.WaitGroup              // WaitGroup to wait for all goroutines to finish
 	sem                 chan struct{}               // Semaphore to limit concurrent container requests
 	containerStatsMutex sync.RWMutex                // Mutex to prevent concurrent access to containerStatsMap
-	apiContainerList    []*container.ApiInfo        // List of containers from Docker API (no pointer)
+	apiContainerList    *[]container.ApiInfo        // List of containers from Docker API
 	containerStatsMap   map[string]*container.Stats // Keeps track of container stats
 	validIds            map[string]struct{}         // Map of valid container ids, used to prune invalid containers from containerStatsMap
 	goodDockerVersion   bool                        // Whether docker version is at least 25.0.0 (one-shot works correctly)
-	isWindows           bool                        // Whether the Docker Engine API is running on Windows
-}
-
-// userAgentRoundTripper is a custom http.RoundTripper that adds a User-Agent header to all requests
-type userAgentRoundTripper struct {
-	rt        http.RoundTripper
-	userAgent string
-}
-
-// RoundTrip implements the http.RoundTripper interface
-func (u *userAgentRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	req.Header.Set("User-Agent", u.userAgent)
-	return u.rt.RoundTrip(req)
 }
 
 // Add goroutine to the queue
@@ -65,14 +52,11 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 	}
 	defer resp.Body.Close()
 
-	dm.apiContainerList = dm.apiContainerList[:0]
 	if err := json.NewDecoder(resp.Body).Decode(&dm.apiContainerList); err != nil {
 		return nil, err
 	}
 
-	dm.isWindows = strings.Contains(resp.Header.Get("Server"), "windows")
-
-	containersLength := len(dm.apiContainerList)
+	containersLength := len(*dm.apiContainerList)
 
 	// store valid ids to clean up old container ids from map
 	if dm.validIds == nil {
@@ -81,9 +65,9 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 		clear(dm.validIds)
 	}
 
-	var failedContainers []*container.ApiInfo
+	var failedContainters []container.ApiInfo
 
-	for _, ctr := range dm.apiContainerList {
+	for _, ctr := range *dm.apiContainerList {
 		ctr.IdShort = ctr.Id[:12]
 		dm.validIds[ctr.IdShort] = struct{}{}
 		// check if container is less than 1 minute old (possible restart)
@@ -100,7 +84,7 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 			if err != nil {
 				dm.containerStatsMutex.Lock()
 				delete(dm.containerStatsMap, ctr.IdShort)
-				failedContainers = append(failedContainers, ctr)
+				failedContainters = append(failedContainters, ctr)
 				dm.containerStatsMutex.Unlock()
 			}
 		}()
@@ -109,9 +93,9 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 	dm.wg.Wait()
 
 	// retry failed containers separately so we can run them in parallel (docker 24 bug)
-	if len(failedContainers) > 0 {
-		slog.Debug("Retrying failed containers", "count", len(failedContainers))
-		for _, ctr := range failedContainers {
+	if len(failedContainters) > 0 {
+		slog.Debug("Retrying failed containers", "count", len(failedContainters))
+		for _, ctr := range failedContainters {
 			dm.queue()
 			go func() {
 				defer dm.dequeue()
@@ -138,7 +122,7 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 }
 
 // Updates stats for individual container
-func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo) error {
+func (dm *dockerManager) updateContainerStats(ctr container.ApiInfo) error {
 	name := ctr.Names[0][1:]
 
 	resp, err := dm.client.Get("http://localhost/containers/" + ctr.IdShort + "/stats?stream=0&one-shot=1")
@@ -169,27 +153,22 @@ func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo) error {
 		return err
 	}
 
-	// calculate cpu and memory stats
-	var usedMemory uint64
-	var cpuPct float64
-
-	if dm.isWindows {
-		usedMemory = res.MemoryStats.PrivateWorkingSet
-		cpuPct = res.CalculateCpuPercentWindows(stats.PrevCpu[0], stats.PrevRead)
-	} else {
-		// check if container has valid data, otherwise may be in restart loop (#103)
-		if res.MemoryStats.Usage == 0 {
-			return fmt.Errorf("%s - no memory stats - see https://github.com/henrygd/beszel/issues/144", name)
-		}
-		memCache := res.MemoryStats.Stats.InactiveFile
-		if memCache == 0 {
-			memCache = res.MemoryStats.Stats.Cache
-		}
-		usedMemory = res.MemoryStats.Usage - memCache
-
-		cpuPct = res.CalculateCpuPercentLinux(stats.PrevCpu)
+	// check if container has valid data, otherwise may be in restart loop (#103)
+	if res.MemoryStats.Usage == 0 {
+		return fmt.Errorf("%s - no memory stats - see https://github.com/henrygd/beszel/issues/144", name)
 	}
 
+	// memory (https://docs.docker.com/reference/cli/docker/container/stats/)
+	memCache := res.MemoryStats.Stats.InactiveFile
+	if memCache == 0 {
+		memCache = res.MemoryStats.Stats.Cache
+	}
+	usedMemory := res.MemoryStats.Usage - memCache
+
+	// cpu
+	cpuDelta := res.CPUStats.CPUUsage.TotalUsage - stats.PrevCpu[0]
+	systemDelta := res.CPUStats.SystemUsage - stats.PrevCpu[1]
+	cpuPct := float64(cpuDelta) / float64(systemDelta) * 100
 	if cpuPct > 100 {
 		return fmt.Errorf("%s cpu pct greater than 100: %+v", name, cpuPct)
 	}
@@ -204,18 +183,18 @@ func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo) error {
 	var sent_delta, recv_delta float64
 	// prevent first run from sending all prev sent/recv bytes
 	if initialized {
-		secondsElapsed := time.Since(stats.PrevRead).Seconds()
+		secondsElapsed := time.Since(stats.PrevNet.Time).Seconds()
 		sent_delta = float64(total_sent-stats.PrevNet.Sent) / secondsElapsed
 		recv_delta = float64(total_recv-stats.PrevNet.Recv) / secondsElapsed
 	}
 	stats.PrevNet.Sent = total_sent
 	stats.PrevNet.Recv = total_recv
+	stats.PrevNet.Time = time.Now()
 
 	stats.Cpu = twoDecimals(cpuPct)
 	stats.Mem = bytesToMegabytes(float64(usedMemory))
 	stats.NetworkSent = bytesToMegabytes(sent_delta)
 	stats.NetworkRecv = bytesToMegabytes(recv_delta)
-	stats.PrevRead = res.Read
 
 	return nil
 }
@@ -232,10 +211,6 @@ func newDockerManager(a *Agent) *dockerManager {
 	dockerHost, exists := GetEnv("DOCKER_HOST")
 	if exists {
 		slog.Info("DOCKER_HOST", "host", dockerHost)
-		// return nil if set to empty string
-		if dockerHost == "" {
-			return nil
-		}
 	} else {
 		dockerHost = getDockerHost()
 	}
@@ -276,27 +251,20 @@ func newDockerManager(a *Agent) *dockerManager {
 		slog.Info("DOCKER_TIMEOUT", "timeout", timeout)
 	}
 
-	// Custom user-agent to avoid docker bug: https://github.com/docker/for-mac/issues/7575
-	userAgentTransport := &userAgentRoundTripper{
-		rt:        transport,
-		userAgent: "Docker-Client/",
-	}
-
-	manager := &dockerManager{
+	dockerClient := &dockerManager{
 		client: &http.Client{
 			Timeout:   timeout,
-			Transport: userAgentTransport,
+			Transport: transport,
 		},
 		containerStatsMap: make(map[string]*container.Stats),
 		sem:               make(chan struct{}, 5),
-		apiContainerList:  []*container.ApiInfo{},
 	}
 
 	// If using podman, return client
 	if strings.Contains(dockerHost, "podman") {
 		a.systemInfo.Podman = true
-		manager.goodDockerVersion = true
-		return manager
+		dockerClient.goodDockerVersion = true
+		return dockerClient
 	}
 
 	// Check docker version
@@ -304,24 +272,23 @@ func newDockerManager(a *Agent) *dockerManager {
 	var versionInfo struct {
 		Version string `json:"Version"`
 	}
-	resp, err := manager.client.Get("http://localhost/version")
+	resp, err := dockerClient.client.Get("http://localhost/version")
 	if err != nil {
-		return manager
+		return dockerClient
 	}
-	defer resp.Body.Close()
 
 	if err := json.NewDecoder(resp.Body).Decode(&versionInfo); err != nil {
-		return manager
+		return dockerClient
 	}
 
 	// if version > 24, one-shot works correctly and we can limit concurrent operations
 	if dockerVersion, err := semver.Parse(versionInfo.Version); err == nil && dockerVersion.Major > 24 {
-		manager.goodDockerVersion = true
+		dockerClient.goodDockerVersion = true
 	} else {
 		slog.Info(fmt.Sprintf("Docker %s is outdated. Upgrade if possible. See https://github.com/henrygd/beszel/issues/58", versionInfo.Version))
 	}
 
-	return manager
+	return dockerClient
 }
 
 // Test docker / podman sockets and return if one exists

beszel/internal/agent/gpu.go

@@ -3,7 +3,6 @@ package agent
 import (
 	"beszel/internal/entities/system"
 	"bufio"
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"os/exec"
@@ -16,28 +15,6 @@ import (
 	"golang.org/x/exp/slog"
 )
 
-const (
-	// Commands
-	nvidiaSmiCmd  = "nvidia-smi"
-	rocmSmiCmd    = "rocm-smi"
-	tegraStatsCmd = "tegrastats"
-
-	// Polling intervals
-	nvidiaSmiInterval  = "4"    // in seconds
-	tegraStatsInterval = "3700" // in milliseconds
-	rocmSmiInterval    = 4300 * time.Millisecond
-
-	// Command retry and timeout constants
-	retryWaitTime     = 5 * time.Second
-	maxFailureRetries = 5
-
-	cmdBufferSize = 10 * 1024
-
-	// Unit Conversions
-	mebibytesInAMegabyte = 1.024  // nvidia-smi reports memory in MiB
-	milliwattsInAWatt    = 1000.0 // tegrastats reports power in mW
-)
-
 // GPUManager manages data collection for GPUs (either Nvidia or AMD)
 type GPUManager struct {
 	sync.Mutex
@@ -79,7 +56,7 @@ func (c *gpuCollector) start() {
 				break
 			}
 			slog.Warn(c.name+" failed, restarting", "err", err)
-			time.Sleep(retryWaitTime)
+			time.Sleep(time.Second * 5)
 			continue
 		}
 	}
@@ -98,7 +75,7 @@ func (c *gpuCollector) collect() error {
 
 	scanner := bufio.NewScanner(stdout)
 	if c.buf == nil {
-		c.buf = make([]byte, 0, cmdBufferSize)
+		c.buf = make([]byte, 0, 4*1024)
 	}
 	scanner.Buffer(c.buf, bufio.MaxScanTokenSize)
 
@@ -125,35 +102,36 @@ func (gm *GPUManager) getJetsonParser() func(output []byte) bool {
 	// TODO: Maybe use VDD_IN for Nano / NX and add a total system power chart
 	powerPattern := regexp.MustCompile(`(GPU_SOC|CPU_GPU_CV) (\d+)mW`)
 
-	// jetson devices have only one gpu so we'll just initialize here
-	gpuData := &system.GPUData{Name: "GPU"}
-	gm.GpuDataMap["0"] = gpuData
-
 	return func(output []byte) bool {
 		gm.Lock()
 		defer gm.Unlock()
+		// we get gpu name from the intitial run of nvidia-smi, so return if it hasn't been initialized
+		gpuData, ok := gm.GpuDataMap["0"]
+		if !ok {
+			return true
+		}
+		data := string(output)
 		// Parse RAM usage
-		ramMatches := ramPattern.FindSubmatch(output)
+		ramMatches := ramPattern.FindStringSubmatch(data)
 		if ramMatches != nil {
-			gpuData.MemoryUsed, _ = strconv.ParseFloat(string(ramMatches[1]), 64)
-			gpuData.MemoryTotal, _ = strconv.ParseFloat(string(ramMatches[2]), 64)
+			gpuData.MemoryUsed, _ = strconv.ParseFloat(ramMatches[1], 64)
+			gpuData.MemoryTotal, _ = strconv.ParseFloat(ramMatches[2], 64)
 		}
 		// Parse GR3D (GPU) usage
-		gr3dMatches := gr3dPattern.FindSubmatch(output)
+		gr3dMatches := gr3dPattern.FindStringSubmatch(data)
 		if gr3dMatches != nil {
-			gr3dUsage, _ := strconv.ParseFloat(string(gr3dMatches[1]), 64)
-			gpuData.Usage += gr3dUsage
+			gpuData.Usage, _ = strconv.ParseFloat(gr3dMatches[1], 64)
 		}
 		// Parse temperature
-		tempMatches := tempPattern.FindSubmatch(output)
+		tempMatches := tempPattern.FindStringSubmatch(data)
 		if tempMatches != nil {
-			gpuData.Temperature, _ = strconv.ParseFloat(string(tempMatches[1]), 64)
+			gpuData.Temperature, _ = strconv.ParseFloat(tempMatches[1], 64)
 		}
 		// Parse power usage
-		powerMatches := powerPattern.FindSubmatch(output)
+		powerMatches := powerPattern.FindStringSubmatch(data)
 		if powerMatches != nil {
-			power, _ := strconv.ParseFloat(string(powerMatches[2]), 64)
-			gpuData.Power += power / milliwattsInAWatt
+			power, _ := strconv.ParseFloat(powerMatches[2], 64)
+			gpuData.Power = power / 1000
 		}
 		gpuData.Count++
 		return true
@@ -164,10 +142,8 @@ func (gm *GPUManager) getJetsonParser() func(output []byte) bool {
 func (gm *GPUManager) parseNvidiaData(output []byte) bool {
 	gm.Lock()
 	defer gm.Unlock()
-	scanner := bufio.NewScanner(bytes.NewReader(output))
 	var valid bool
-	for scanner.Scan() {
-		line := scanner.Text() // Or use scanner.Bytes() for []byte
+	for line := range strings.Lines(string(output)) {
 		fields := strings.Split(strings.TrimSpace(line), ", ")
 		if len(fields) < 7 {
 			continue
@@ -183,12 +159,18 @@ func (gm *GPUManager) parseNvidiaData(output []byte) bool {
 		if _, ok := gm.GpuDataMap[id]; !ok {
 			name := strings.TrimPrefix(fields[1], "NVIDIA ")
 			gm.GpuDataMap[id] = &system.GPUData{Name: strings.TrimSuffix(name, " Laptop GPU")}
+			// check if tegrastats is active - if so we will only use nvidia-smi to get gpu name
+			// - nvidia-smi does not provide metrics for tegra / jetson devices
+			// this will end the nvidia-smi collector
+			if gm.tegrastats {
+				return false
+			}
 		}
 		// update gpu data
 		gpu := gm.GpuDataMap[id]
 		gpu.Temperature = temp
-		gpu.MemoryUsed = memoryUsage / mebibytesInAMegabyte
-		gpu.MemoryTotal = totalMemory / mebibytesInAMegabyte
+		gpu.MemoryUsed = memoryUsage / 1.024
+		gpu.MemoryTotal = totalMemory / 1.024
 		gpu.Usage += usage
 		gpu.Power += power
 		gpu.Count++
@@ -259,7 +241,6 @@ func (gm *GPUManager) GetCurrentData() map[string]system.GPUData {
 		}
 		gpuData[id] = gpuCopy
 	}
-	slog.Debug("GPU", "data", gpuData)
 	return gpuData
 }
 
@@ -268,15 +249,14 @@ func (gm *GPUManager) GetCurrentData() map[string]system.GPUData {
 // tools are found. If none of the tools are found, it returns an error indicating that no GPU
 // management tools are available.
 func (gm *GPUManager) detectGPUs() error {
-	if _, err := exec.LookPath(nvidiaSmiCmd); err == nil {
+	if _, err := exec.LookPath("nvidia-smi"); err == nil {
 		gm.nvidiaSmi = true
 	}
-	if _, err := exec.LookPath(rocmSmiCmd); err == nil {
+	if _, err := exec.LookPath("rocm-smi"); err == nil {
 		gm.rocmSmi = true
 	}
-	if _, err := exec.LookPath(tegraStatsCmd); err == nil {
+	if _, err := exec.LookPath("tegrastats"); err == nil {
 		gm.tegrastats = true
-		gm.nvidiaSmi = false
 	}
 	if gm.nvidiaSmi || gm.rocmSmi || gm.tegrastats {
 		return nil
@@ -290,19 +270,17 @@ func (gm *GPUManager) startCollector(command string) {
 		name: command,
 	}
 	switch command {
-	case nvidiaSmiCmd:
-		collector.cmdArgs = []string{
-			"-l", nvidiaSmiInterval,
+	case "nvidia-smi":
+		collector.cmdArgs = []string{"-l", "4",
 			"--query-gpu=index,name,temperature.gpu,memory.used,memory.total,utilization.gpu,power.draw",
-			"--format=csv,noheader,nounits",
-		}
+			"--format=csv,noheader,nounits"}
 		collector.parse = gm.parseNvidiaData
 		go collector.start()
-	case tegraStatsCmd:
-		collector.cmdArgs = []string{"--interval", tegraStatsInterval}
+	case "tegrastats":
+		collector.cmdArgs = []string{"--interval", "3000"}
 		collector.parse = gm.getJetsonParser()
 		go collector.start()
-	case rocmSmiCmd:
+	case "rocm-smi":
 		collector.cmdArgs = []string{"--showid", "--showtemp", "--showuse", "--showpower", "--showproductname", "--showmeminfo", "vram", "--json"}
 		collector.parse = gm.parseAmdData
 		go func() {
@@ -310,12 +288,12 @@ func (gm *GPUManager) startCollector(command string) {
 			for {
 				if err := collector.collect(); err != nil {
 					failures++
-					if failures > maxFailureRetries {
+					if failures > 5 {
 						break
 					}
 					slog.Warn("Error collecting AMD GPU data", "err", err)
 				}
-				time.Sleep(rocmSmiInterval)
+				time.Sleep(4300 * time.Millisecond)
 			}
 		}()
 	}
@@ -330,13 +308,13 @@ func NewGPUManager() (*GPUManager, error) {
 	gm.GpuDataMap = make(map[string]*system.GPUData)
 
 	if gm.nvidiaSmi {
-		gm.startCollector(nvidiaSmiCmd)
+		gm.startCollector("nvidia-smi")
 	}
 	if gm.rocmSmi {
-		gm.startCollector(rocmSmiCmd)
+		gm.startCollector("rocm-smi")
 	}
 	if gm.tegrastats {
-		gm.startCollector(tegraStatsCmd)
+		gm.startCollector("tegrastats")
 	}
 
 	return &gm, nil

beszel/internal/agent/gpu_test.go

@@ -1,6 +1,3 @@
-//go:build testing
-// +build testing
-
 package agent
 
 import (
@@ -46,52 +43,6 @@ func TestParseNvidiaData(t *testing.T) {
 			},
 			wantValid: true,
 		},
-		{
-			name: "more valid multi-gpu data",
-			input: `0, NVIDIA A10, 45, 19676, 23028, 0, 58.98
-1, NVIDIA A10, 45, 19638, 23028, 0, 62.35
-2, NVIDIA A10, 44, 21700, 23028, 0, 59.57
-3, NVIDIA A10, 45, 18222, 23028, 0, 61.76`,
-			wantData: map[string]system.GPUData{
-				"0": {
-					Name:        "A10",
-					Temperature: 45.0,
-					MemoryUsed:  19676.0 / 1.024,
-					MemoryTotal: 23028.0 / 1.024,
-					Usage:       0.0,
-					Power:       58.98,
-					Count:       1,
-				},
-				"1": {
-					Name:        "A10",
-					Temperature: 45.0,
-					MemoryUsed:  19638.0 / 1.024,
-					MemoryTotal: 23028.0 / 1.024,
-					Usage:       0.0,
-					Power:       62.35,
-					Count:       1,
-				},
-				"2": {
-					Name:        "A10",
-					Temperature: 44.0,
-					MemoryUsed:  21700.0 / 1.024,
-					MemoryTotal: 23028.0 / 1.024,
-					Usage:       0.0,
-					Power:       59.57,
-					Count:       1,
-				},
-				"3": {
-					Name:        "A10",
-					Temperature: 45.0,
-					MemoryUsed:  18222.0 / 1.024,
-					MemoryTotal: 23028.0 / 1.024,
-					Usage:       0.0,
-					Power:       61.76,
-					Count:       1,
-				},
-			},
-			wantValid: true,
-		},
 		{
 			name:      "empty input",
 			input:     "",
@@ -251,13 +202,14 @@ func TestParseJetsonData(t *testing.T) {
 	tests := []struct {
 		name        string
 		input       string
+		gm          *GPUManager
 		wantMetrics *system.GPUData
 	}{
 		{
 			name:  "valid data",
-			input: "11-14-2024 22:54:33 RAM 4300/30698MB GR3D_FREQ 45% tj@52.468C VDD_GPU_SOC 2171mW",
+			input: "RAM 4300/30698MB GR3D_FREQ 45% tj@52.468C VDD_GPU_SOC 2171mW",
 			wantMetrics: &system.GPUData{
-				Name:        "GPU",
+				Name:        "Jetson",
 				MemoryUsed:  4300.0,
 				MemoryTotal: 30698.0,
 				Usage:       45.0,
@@ -266,24 +218,11 @@ func TestParseJetsonData(t *testing.T) {
 				Count:       1,
 			},
 		},
-		{
-			name:  "more valid data",
-			input: "11-15-2024 08:38:09 RAM 6185/7620MB (lfb 8x2MB) SWAP 851/3810MB (cached 1MB) CPU [15%@729,11%@729,14%@729,13%@729,11%@729,8%@729] EMC_FREQ 43%@2133 GR3D_FREQ 63%@[621] NVDEC off NVJPG off NVJPG1 off VIC off OFA off APE 200 cpu@53.968C soc2@52.437C soc0@50.75C gpu@53.343C tj@53.968C soc1@51.656C VDD_IN 12479mW/12479mW VDD_CPU_GPU_CV 4667mW/4667mW VDD_SOC 2817mW/2817mW",
-			wantMetrics: &system.GPUData{
-				Name:        "GPU",
-				MemoryUsed:  6185.0,
-				MemoryTotal: 7620.0,
-				Usage:       63.0,
-				Temperature: 53.968,
-				Power:       4.667,
-				Count:       1,
-			},
-		},
 		{
 			name:  "missing temperature",
-			input: "11-14-2024 22:54:33 RAM 4300/30698MB GR3D_FREQ 45% VDD_GPU_SOC 2171mW",
+			input: "RAM 4300/30698MB GR3D_FREQ 45% VDD_GPU_SOC 2171mW",
 			wantMetrics: &system.GPUData{
-				Name:        "GPU",
+				Name:        "Jetson",
 				MemoryUsed:  4300.0,
 				MemoryTotal: 30698.0,
 				Usage:       45.0,
@@ -291,18 +230,32 @@ func TestParseJetsonData(t *testing.T) {
 				Count:       1,
 			},
 		},
+		{
+			name:  "no gpu defined by nvidia-smi",
+			input: "RAM 4300/30698MB GR3D_FREQ 45% VDD_GPU_SOC 2171mW",
+			gm: &GPUManager{
+				GpuDataMap: map[string]*system.GPUData{},
+			},
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			gm := &GPUManager{
-				GpuDataMap: make(map[string]*system.GPUData),
+			if tt.gm != nil {
+				// should return if no gpu set by nvidia-smi
+				assert.Empty(t, tt.gm.GpuDataMap)
+				return
 			}
-			parser := gm.getJetsonParser()
+			tt.gm = &GPUManager{
+				GpuDataMap: map[string]*system.GPUData{
+					"0": {Name: "Jetson"},
+				},
+			}
+			parser := tt.gm.getJetsonParser()
 			valid := parser([]byte(tt.input))
 			assert.Equal(t, true, valid)
 
-			got := gm.GpuDataMap["0"]
+			got := tt.gm.GpuDataMap["0"]
 			require.NotNil(t, got)
 			assert.Equal(t, tt.wantMetrics.Name, got.Name)
 			assert.InDelta(t, tt.wantMetrics.MemoryUsed, got.MemoryUsed, 0.01)
@@ -428,7 +381,7 @@ echo "test"`
 				}
 				return nil
 			},
-			wantNvidiaSmi:  false,
+			wantNvidiaSmi:  true,
 			wantRocmSmi:    true,
 			wantTegrastats: true,
 			wantErr:        false,
@@ -533,7 +486,7 @@ echo '{"card0": {"Temperature (Sensor edge) (C)": "49.0", "Current Socket Graphi
 			setup: func(t *testing.T) error {
 				path := filepath.Join(dir, "tegrastats")
 				script := `#!/bin/sh
-echo "11-14-2024 22:54:33 RAM 1024/4096MB GR3D_FREQ 80% tj@70C VDD_GPU_SOC 1000mW"`
+echo "RAM 1024/4096MB GR3D_FREQ 80% tj@70C VDD_GPU_SOC 1000mW"`
 				if err := os.WriteFile(path, []byte(script), 0755); err != nil {
 					return err
 				}
@@ -570,158 +523,3 @@ echo "11-14-2024 22:54:33 RAM 1024/4096MB GR3D_FREQ 80% tj@70C VDD_GPU_SOC 1000m
 		})
 	}
 }
-
-// TestAccumulationTableDriven tests the accumulation behavior for all three GPU types
-func TestAccumulation(t *testing.T) {
-	type expectedGPUValues struct {
-		temperature float64
-		memoryUsed  float64
-		memoryTotal float64
-		usage       float64
-		power       float64
-		count       float64
-		avgUsage    float64
-		avgPower    float64
-	}
-
-	tests := []struct {
-		name           string
-		initialGPUData map[string]*system.GPUData
-		dataSamples    [][]byte
-		parser         func(*GPUManager) func([]byte) bool
-		expectedValues map[string]expectedGPUValues
-	}{
-		{
-			name: "Jetson GPU accumulation",
-			initialGPUData: map[string]*system.GPUData{
-				"0": {
-					Name:        "Jetson",
-					Temperature: 0,
-					Usage:       0,
-					Power:       0,
-					Count:       0,
-				},
-			},
-			dataSamples: [][]byte{
-				[]byte("11-14-2024 22:54:33 RAM 1024/4096MB GR3D_FREQ 30% tj@50.5C VDD_GPU_SOC 1000mW"),
-				[]byte("11-14-2024 22:54:33 RAM 1024/4096MB GR3D_FREQ 40% tj@60.5C VDD_GPU_SOC 1200mW"),
-				[]byte("11-14-2024 22:54:33 RAM 1024/4096MB GR3D_FREQ 50% tj@70.5C VDD_GPU_SOC 1400mW"),
-			},
-			parser: func(gm *GPUManager) func([]byte) bool {
-				return gm.getJetsonParser()
-			},
-			expectedValues: map[string]expectedGPUValues{
-				"0": {
-					temperature: 70.5,  // Last value
-					memoryUsed:  1024,  // Last value
-					memoryTotal: 4096,  // Last value
-					usage:       120.0, // Accumulated: 30 + 40 + 50
-					power:       3.6,   // Accumulated: 1.0 + 1.2 + 1.4
-					count:       3,
-					avgUsage:    40.0, // 120 / 3
-					avgPower:    1.2,  // 3.6 / 3
-				},
-			},
-		},
-		{
-			name:           "NVIDIA GPU accumulation",
-			initialGPUData: map[string]*system.GPUData{
-				// NVIDIA parser will create the GPU data entries
-			},
-			dataSamples: [][]byte{
-				[]byte("0, NVIDIA GeForce RTX 3080, 50, 5000, 10000, 30, 200"),
-				[]byte("0, NVIDIA GeForce RTX 3080, 60, 6000, 10000, 40, 250"),
-				[]byte("0, NVIDIA GeForce RTX 3080, 70, 7000, 10000, 50, 300"),
-			},
-			parser: func(gm *GPUManager) func([]byte) bool {
-				return gm.parseNvidiaData
-			},
-			expectedValues: map[string]expectedGPUValues{
-				"0": {
-					temperature: 70.0,            // Last value
-					memoryUsed:  7000.0 / 1.024,  // Last value
-					memoryTotal: 10000.0 / 1.024, // Last value
-					usage:       120.0,           // Accumulated: 30 + 40 + 50
-					power:       750.0,           // Accumulated: 200 + 250 + 300
-					count:       3,
-					avgUsage:    40.0,  // 120 / 3
-					avgPower:    250.0, // 750 / 3
-				},
-			},
-		},
-		{
-			name:           "AMD GPU accumulation",
-			initialGPUData: map[string]*system.GPUData{
-				// AMD parser will create the GPU data entries
-			},
-			dataSamples: [][]byte{
-				[]byte(`{"card0": {"GUID": "34756", "Temperature (Sensor edge) (C)": "50.0", "Current Socket Graphics Package Power (W)": "100.0", "GPU use (%)": "30", "VRAM Total Memory (B)": "10737418240", "VRAM Total Used Memory (B)": "1073741824", "Card Series": "Radeon RX 6800"}}`),
-				[]byte(`{"card0": {"GUID": "34756", "Temperature (Sensor edge) (C)": "60.0", "Current Socket Graphics Package Power (W)": "150.0", "GPU use (%)": "40", "VRAM Total Memory (B)": "10737418240", "VRAM Total Used Memory (B)": "2147483648", "Card Series": "Radeon RX 6800"}}`),
-				[]byte(`{"card0": {"GUID": "34756", "Temperature (Sensor edge) (C)": "70.0", "Current Socket Graphics Package Power (W)": "200.0", "GPU use (%)": "50", "VRAM Total Memory (B)": "10737418240", "VRAM Total Used Memory (B)": "3221225472", "Card Series": "Radeon RX 6800"}}`),
-			},
-			parser: func(gm *GPUManager) func([]byte) bool {
-				return gm.parseAmdData
-			},
-			expectedValues: map[string]expectedGPUValues{
-				"34756": {
-					temperature: 70.0,                          // Last value
-					memoryUsed:  3221225472.0 / (1024 * 1024),  // Last value
-					memoryTotal: 10737418240.0 / (1024 * 1024), // Last value
-					usage:       120.0,                         // Accumulated: 30 + 40 + 50
-					power:       450.0,                         // Accumulated: 100 + 150 + 200
-					count:       3,
-					avgUsage:    40.0,  // 120 / 3
-					avgPower:    150.0, // 450 / 3
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Create a new GPUManager for each test
-			gm := &GPUManager{
-				GpuDataMap: tt.initialGPUData,
-			}
-
-			// Get the parser function
-			parser := tt.parser(gm)
-
-			// Process each data sample
-			for i, sample := range tt.dataSamples {
-				valid := parser(sample)
-				assert.True(t, valid, "Sample %d should be valid", i)
-			}
-
-			// Check accumulated values
-			for id, expected := range tt.expectedValues {
-				gpu, exists := gm.GpuDataMap[id]
-				assert.True(t, exists, "GPU with ID %s should exist", id)
-				if !exists {
-					continue
-				}
-
-				assert.InDelta(t, expected.temperature, gpu.Temperature, 0.01, "Temperature should match")
-				assert.InDelta(t, expected.memoryUsed, gpu.MemoryUsed, 0.01, "Memory used should match")
-				assert.InDelta(t, expected.memoryTotal, gpu.MemoryTotal, 0.01, "Memory total should match")
-				assert.InDelta(t, expected.usage, gpu.Usage, 0.01, "Usage should match")
-				assert.InDelta(t, expected.power, gpu.Power, 0.01, "Power should match")
-				assert.Equal(t, expected.count, gpu.Count, "Count should match")
-			}
-
-			// Verify average calculation in GetCurrentData
-			result := gm.GetCurrentData()
-			for id, expected := range tt.expectedValues {
-				gpu, exists := result[id]
-				assert.True(t, exists, "GPU with ID %s should exist in GetCurrentData result", id)
-				if !exists {
-					continue
-				}
-
-				assert.InDelta(t, expected.temperature, gpu.Temperature, 0.01, "Temperature in GetCurrentData should match")
-				assert.InDelta(t, expected.avgUsage, gpu.Usage, 0.01, "Average usage in GetCurrentData should match")
-				assert.InDelta(t, expected.avgPower, gpu.Power, 0.01, "Average power in GetCurrentData should match")
-			}
-		})
-	}
-}

beszel/internal/agent/health.go

@@ -1,18 +0,0 @@
-package agent
-
-import (
-	"net"
-	"time"
-)
-
-// Health checks if the agent's server is running by attempting to connect to it.
-//
-// If an error occurs when attempting to connect to the server, it returns the error.
-func Health(addr string, network string) error {
-	conn, err := net.DialTimeout(network, addr, 4*time.Second)
-	if err != nil {
-		return err
-	}
-	conn.Close()
-	return nil
-}

beszel/internal/agent/health_test.go

@@ -1,118 +0,0 @@
-//go:build testing
-// +build testing
-
-package agent_test
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"beszel/internal/agent"
-)
-
-// setupTestServer creates a temporary server for testing
-func setupTestServer(t *testing.T) (string, func()) {
-	// Create a temporary socket file for Unix socket testing
-	tempSockFile := os.TempDir() + "/beszel_health_test.sock"
-
-	// Clean up any existing socket file
-	os.Remove(tempSockFile)
-
-	// Create a listener
-	listener, err := net.Listen("unix", tempSockFile)
-	require.NoError(t, err, "Failed to create test listener")
-
-	// Start a simple server in a goroutine
-	go func() {
-		conn, err := listener.Accept()
-		if err != nil {
-			return // Listener closed
-		}
-		defer conn.Close()
-		// Just accept the connection and do nothing
-	}()
-
-	// Return the socket file path and a cleanup function
-	return tempSockFile, func() {
-		listener.Close()
-		os.Remove(tempSockFile)
-	}
-}
-
-// setupTCPTestServer creates a temporary TCP server for testing
-func setupTCPTestServer(t *testing.T) (string, func()) {
-	// Listen on a random available port
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	require.NoError(t, err, "Failed to create test listener")
-
-	// Get the port that was assigned
-	addr := listener.Addr().(*net.TCPAddr)
-	port := addr.Port
-
-	// Start a simple server in a goroutine
-	go func() {
-		conn, err := listener.Accept()
-		if err != nil {
-			return // Listener closed
-		}
-		defer conn.Close()
-		// Just accept the connection and do nothing
-	}()
-
-	// Return the address and a cleanup function
-	return fmt.Sprintf("127.0.0.1:%d", port), func() {
-		listener.Close()
-	}
-}
-
-func TestHealth(t *testing.T) {
-	t.Run("server is running (unix socket)", func(t *testing.T) {
-		// Setup a test server
-		sockFile, cleanup := setupTestServer(t)
-		defer cleanup()
-
-		// Run the health check with explicit parameters
-		err := agent.Health(sockFile, "unix")
-		require.NoError(t, err, "Failed to check health")
-	})
-
-	t.Run("server is running (tcp address)", func(t *testing.T) {
-		// Setup a test server
-		addr, cleanup := setupTCPTestServer(t)
-		defer cleanup()
-
-		// Run the health check with explicit parameters
-		err := agent.Health(addr, "tcp")
-		require.NoError(t, err, "Failed to check health")
-	})
-
-	t.Run("server is not running", func(t *testing.T) {
-		// Use an address that's likely not in use
-		addr := "127.0.0.1:65535"
-
-		// Run the health check with explicit parameters
-		err := agent.Health(addr, "tcp")
-		require.Error(t, err, "Health check should return an error when server is not running")
-	})
-
-	t.Run("invalid network", func(t *testing.T) {
-		// Use an invalid network type
-		err := agent.Health("127.0.0.1:8080", "invalid_network")
-		require.Error(t, err, "Health check should return an error with invalid network")
-	})
-
-	t.Run("unix socket not found", func(t *testing.T) {
-		// Use a non-existent unix socket
-		nonExistentSocket := os.TempDir() + "/non_existent_socket.sock"
-
-		// Make sure it really doesn't exist
-		os.Remove(nonExistentSocket)
-
-		err := agent.Health(nonExistentSocket, "unix")
-		require.Error(t, err, "Health check should return an error when socket doesn't exist")
-	})
-}

beszel/internal/agent/network.go

@@ -17,7 +17,7 @@ func (a *Agent) initializeNetIoStats() {
 	nics, nicsEnvExists := GetEnv("NICS")
 	if nicsEnvExists {
 		nicsMap = make(map[string]struct{}, 0)
-		for nic := range strings.SplitSeq(nics, ",") {
+		for _, nic := range strings.Split(nics, ",") {
 			nicsMap[nic] = struct{}{}
 		}
 	}

beszel/internal/agent/sensors.go

@@ -1,163 +0,0 @@
-package agent
-
-import (
-	"beszel/internal/entities/system"
-	"context"
-	"log/slog"
-	"path"
-	"strconv"
-	"strings"
-
-	"github.com/shirou/gopsutil/v4/common"
-	"github.com/shirou/gopsutil/v4/sensors"
-)
-
-type SensorConfig struct {
-	context        context.Context
-	sensors        map[string]struct{}
-	primarySensor  string
-	isBlacklist    bool
-	hasWildcards   bool
-	skipCollection bool
-}
-
-func (a *Agent) newSensorConfig() *SensorConfig {
-	primarySensor, _ := GetEnv("PRIMARY_SENSOR")
-	sysSensors, _ := GetEnv("SYS_SENSORS")
-	sensorsEnvVal, sensorsSet := GetEnv("SENSORS")
-	skipCollection := sensorsSet && sensorsEnvVal == ""
-
-	return a.newSensorConfigWithEnv(primarySensor, sysSensors, sensorsEnvVal, skipCollection)
-}
-
-// newSensorConfigWithEnv creates a SensorConfig with the provided environment variables
-// sensorsSet indicates if the SENSORS environment variable was explicitly set (even to empty string)
-func (a *Agent) newSensorConfigWithEnv(primarySensor, sysSensors, sensorsEnvVal string, skipCollection bool) *SensorConfig {
-	config := &SensorConfig{
-		context:        context.Background(),
-		primarySensor:  primarySensor,
-		skipCollection: skipCollection,
-		sensors:        make(map[string]struct{}),
-	}
-
-	// Set sensors context (allows overriding sys location for sensors)
-	if sysSensors != "" {
-		slog.Info("SYS_SENSORS", "path", sysSensors)
-		config.context = context.WithValue(config.context,
-			common.EnvKey, common.EnvMap{common.HostSysEnvKey: sysSensors},
-		)
-	}
-
-	// handle blacklist
-	if strings.HasPrefix(sensorsEnvVal, "-") {
-		config.isBlacklist = true
-		sensorsEnvVal = sensorsEnvVal[1:]
-	}
-
-	for sensor := range strings.SplitSeq(sensorsEnvVal, ",") {
-		sensor = strings.TrimSpace(sensor)
-		if sensor != "" {
-			config.sensors[sensor] = struct{}{}
-			if strings.Contains(sensor, "*") {
-				config.hasWildcards = true
-			}
-		}
-	}
-
-	return config
-}
-
-// updateTemperatures updates the agent with the latest sensor temperatures
-func (a *Agent) updateTemperatures(systemStats *system.Stats) {
-	// skip if sensors whitelist is set to empty string
-	if a.sensorConfig.skipCollection {
-		slog.Debug("Skipping temperature collection")
-		return
-	}
-
-	// reset high temp
-	a.systemInfo.DashboardTemp = 0
-
-	// get sensor data
-	temps, _ := sensors.TemperaturesWithContext(a.sensorConfig.context)
-	slog.Debug("Temperature", "sensors", temps)
-
-	// return if no sensors
-	if len(temps) == 0 {
-		return
-	}
-
-	systemStats.Temperatures = make(map[string]float64, len(temps))
-	for i, sensor := range temps {
-		// scale temperature
-		if sensor.Temperature != 0 && sensor.Temperature < 1 {
-			sensor.Temperature = scaleTemperature(sensor.Temperature)
-		}
-		// skip if temperature is unreasonable
-		if sensor.Temperature <= 0 || sensor.Temperature >= 200 {
-			continue
-		}
-		sensorName := sensor.SensorKey
-		if _, ok := systemStats.Temperatures[sensorName]; ok {
-			// if key already exists, append int to key
-			sensorName = sensorName + "_" + strconv.Itoa(i)
-		}
-		// skip if not in whitelist or blacklist
-		if !isValidSensor(sensorName, a.sensorConfig) {
-			continue
-		}
-		// set dashboard temperature
-		if a.sensorConfig.primarySensor == "" {
-			a.systemInfo.DashboardTemp = max(a.systemInfo.DashboardTemp, sensor.Temperature)
-		} else if a.sensorConfig.primarySensor == sensorName {
-			a.systemInfo.DashboardTemp = sensor.Temperature
-		}
-		systemStats.Temperatures[sensorName] = twoDecimals(sensor.Temperature)
-	}
-}
-
-// isValidSensor checks if a sensor is valid based on the sensor name and the sensor config
-func isValidSensor(sensorName string, config *SensorConfig) bool {
-	// if no sensors configured, everything is valid
-	if len(config.sensors) == 0 {
-		return true
-	}
-
-	// Exact match - return true if whitelist, false if blacklist
-	if _, exactMatch := config.sensors[sensorName]; exactMatch {
-		return !config.isBlacklist
-	}
-
-	// If no wildcards, return true if blacklist, false if whitelist
-	if !config.hasWildcards {
-		return config.isBlacklist
-	}
-
-	// Check for wildcard patterns
-	for pattern := range config.sensors {
-		if !strings.Contains(pattern, "*") {
-			continue
-		}
-		if match, _ := path.Match(pattern, sensorName); match {
-			return !config.isBlacklist
-		}
-	}
-
-	return config.isBlacklist
-}
-
-// scaleTemperature scales temperatures in fractional values to reasonable Celsius values
-func scaleTemperature(temp float64) float64 {
-	if temp > 1 {
-		return temp
-	}
-	scaled100 := temp * 100
-	scaled1000 := temp * 1000
-
-	if scaled100 >= 15 && scaled100 <= 95 {
-		return scaled100
-	} else if scaled1000 >= 15 && scaled1000 <= 95 {
-		return scaled1000
-	}
-	return scaled100
-}

beszel/internal/agent/sensors_test.go

@@ -1,456 +0,0 @@
-//go:build testing
-// +build testing
-
-package agent
-
-import (
-	"context"
-	"os"
-	"testing"
-
-	"github.com/shirou/gopsutil/v4/common"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestIsValidSensor(t *testing.T) {
-	tests := []struct {
-		name          string
-		sensorName    string
-		config        *SensorConfig
-		expectedValid bool
-	}{
-		{
-			name:       "Whitelist - sensor in list",
-			sensorName: "cpu_temp",
-			config: &SensorConfig{
-				sensors:     map[string]struct{}{"cpu_temp": {}},
-				isBlacklist: false,
-			},
-			expectedValid: true,
-		},
-		{
-			name:       "Whitelist - sensor not in list",
-			sensorName: "gpu_temp",
-			config: &SensorConfig{
-				sensors:     map[string]struct{}{"cpu_temp": {}},
-				isBlacklist: false,
-			},
-			expectedValid: false,
-		},
-		{
-			name:       "Blacklist - sensor in list",
-			sensorName: "cpu_temp",
-			config: &SensorConfig{
-				sensors:     map[string]struct{}{"cpu_temp": {}},
-				isBlacklist: true,
-			},
-			expectedValid: false,
-		},
-		{
-			name:       "Blacklist - sensor not in list",
-			sensorName: "gpu_temp",
-			config: &SensorConfig{
-				sensors:     map[string]struct{}{"cpu_temp": {}},
-				isBlacklist: true,
-			},
-			expectedValid: true,
-		},
-		{
-			name:       "Whitelist with wildcard - matching pattern",
-			sensorName: "core_0_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"core_*_temp": {}},
-				isBlacklist:  false,
-				hasWildcards: true,
-			},
-			expectedValid: true,
-		},
-		{
-			name:       "Whitelist with wildcard - non-matching pattern",
-			sensorName: "gpu_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"core_*_temp": {}},
-				isBlacklist:  false,
-				hasWildcards: true,
-			},
-			expectedValid: false,
-		},
-		{
-			name:       "Blacklist with wildcard - matching pattern",
-			sensorName: "core_0_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"core_*_temp": {}},
-				isBlacklist:  true,
-				hasWildcards: true,
-			},
-			expectedValid: false,
-		},
-		{
-			name:       "Blacklist with wildcard - non-matching pattern",
-			sensorName: "gpu_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"core_*_temp": {}},
-				isBlacklist:  true,
-				hasWildcards: true,
-			},
-			expectedValid: true,
-		},
-		{
-			name:       "No sensors configured",
-			sensorName: "any_temp",
-			config: &SensorConfig{
-				sensors:        map[string]struct{}{},
-				isBlacklist:    false,
-				hasWildcards:   false,
-				skipCollection: false,
-			},
-			expectedValid: true,
-		},
-		{
-			name:       "Mixed patterns in whitelist - exact match",
-			sensorName: "cpu_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"cpu_temp": {}, "core_*_temp": {}},
-				isBlacklist:  false,
-				hasWildcards: true,
-			},
-			expectedValid: true,
-		},
-		{
-			name:       "Mixed patterns in whitelist - wildcard match",
-			sensorName: "core_1_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"cpu_temp": {}, "core_*_temp": {}},
-				isBlacklist:  false,
-				hasWildcards: true,
-			},
-			expectedValid: true,
-		},
-		{
-			name:       "Mixed patterns in blacklist - exact match",
-			sensorName: "cpu_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"cpu_temp": {}, "core_*_temp": {}},
-				isBlacklist:  true,
-				hasWildcards: true,
-			},
-			expectedValid: false,
-		},
-		{
-			name:       "Mixed patterns in blacklist - wildcard match",
-			sensorName: "core_1_temp",
-			config: &SensorConfig{
-				sensors:      map[string]struct{}{"cpu_temp": {}, "core_*_temp": {}},
-				isBlacklist:  true,
-				hasWildcards: true,
-			},
-			expectedValid: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := isValidSensor(tt.sensorName, tt.config)
-			assert.Equal(t, tt.expectedValid, result, "isValidSensor(%q, config) returned unexpected result", tt.sensorName)
-		})
-	}
-}
-
-func TestNewSensorConfigWithEnv(t *testing.T) {
-	agent := &Agent{}
-
-	tests := []struct {
-		name           string
-		primarySensor  string
-		sysSensors     string
-		sensors        string
-		skipCollection bool
-		expectedConfig *SensorConfig
-	}{
-		{
-			name:          "Empty configuration",
-			primarySensor: "",
-			sysSensors:    "",
-			sensors:       "",
-			expectedConfig: &SensorConfig{
-				context:        context.Background(),
-				primarySensor:  "",
-				sensors:        map[string]struct{}{},
-				isBlacklist:    false,
-				hasWildcards:   false,
-				skipCollection: false,
-			},
-		},
-		{
-			name:           "Explicitly set to empty string",
-			primarySensor:  "",
-			sysSensors:     "",
-			sensors:        "",
-			skipCollection: true,
-			expectedConfig: &SensorConfig{
-				context:        context.Background(),
-				primarySensor:  "",
-				sensors:        map[string]struct{}{},
-				isBlacklist:    false,
-				hasWildcards:   false,
-				skipCollection: true,
-			},
-		},
-		{
-			name:          "Primary sensor only - should create sensor map",
-			primarySensor: "cpu_temp",
-			sysSensors:    "",
-			sensors:       "",
-			expectedConfig: &SensorConfig{
-				context:       context.Background(),
-				primarySensor: "cpu_temp",
-				sensors:       map[string]struct{}{},
-				isBlacklist:   false,
-				hasWildcards:  false,
-			},
-		},
-		{
-			name:          "Whitelist sensors",
-			primarySensor: "cpu_temp",
-			sysSensors:    "",
-			sensors:       "cpu_temp,gpu_temp",
-			expectedConfig: &SensorConfig{
-				context:       context.Background(),
-				primarySensor: "cpu_temp",
-				sensors: map[string]struct{}{
-					"cpu_temp": {},
-					"gpu_temp": {},
-				},
-				isBlacklist:  false,
-				hasWildcards: false,
-			},
-		},
-		{
-			name:          "Blacklist sensors",
-			primarySensor: "cpu_temp",
-			sysSensors:    "",
-			sensors:       "-cpu_temp,gpu_temp",
-			expectedConfig: &SensorConfig{
-				context:       context.Background(),
-				primarySensor: "cpu_temp",
-				sensors: map[string]struct{}{
-					"cpu_temp": {},
-					"gpu_temp": {},
-				},
-				isBlacklist:  true,
-				hasWildcards: false,
-			},
-		},
-		{
-			name:          "Sensors with wildcard",
-			primarySensor: "cpu_temp",
-			sysSensors:    "",
-			sensors:       "cpu_*,gpu_temp",
-			expectedConfig: &SensorConfig{
-				context:       context.Background(),
-				primarySensor: "cpu_temp",
-				sensors: map[string]struct{}{
-					"cpu_*":    {},
-					"gpu_temp": {},
-				},
-				isBlacklist:  false,
-				hasWildcards: true,
-			},
-		},
-		{
-			name:          "Sensors with whitespace",
-			primarySensor: "cpu_temp",
-			sysSensors:    "",
-			sensors:       "cpu_*, gpu_temp",
-			expectedConfig: &SensorConfig{
-				context:       context.Background(),
-				primarySensor: "cpu_temp",
-				sensors: map[string]struct{}{
-					"cpu_*":    {},
-					"gpu_temp": {},
-				},
-				isBlacklist:  false,
-				hasWildcards: true,
-			},
-		},
-		{
-			name:          "With SYS_SENSORS path",
-			primarySensor: "cpu_temp",
-			sysSensors:    "/custom/path",
-			sensors:       "cpu_temp",
-			expectedConfig: &SensorConfig{
-				primarySensor: "cpu_temp",
-				sensors: map[string]struct{}{
-					"cpu_temp": {},
-				},
-				isBlacklist:  false,
-				hasWildcards: false,
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := agent.newSensorConfigWithEnv(tt.primarySensor, tt.sysSensors, tt.sensors, tt.skipCollection)
-
-			// Check primary sensor
-			assert.Equal(t, tt.expectedConfig.primarySensor, result.primarySensor)
-
-			// Check sensor map
-			if tt.expectedConfig.sensors == nil {
-				assert.Nil(t, result.sensors)
-			} else {
-				assert.Equal(t, len(tt.expectedConfig.sensors), len(result.sensors))
-				for sensor := range tt.expectedConfig.sensors {
-					_, exists := result.sensors[sensor]
-					assert.True(t, exists, "Sensor %s should exist in the result", sensor)
-				}
-			}
-
-			// Check flags
-			assert.Equal(t, tt.expectedConfig.isBlacklist, result.isBlacklist)
-			assert.Equal(t, tt.expectedConfig.hasWildcards, result.hasWildcards)
-
-			// Check context
-			if tt.sysSensors != "" {
-				// Verify context contains correct values
-				envMap, ok := result.context.Value(common.EnvKey).(common.EnvMap)
-				require.True(t, ok, "Context should contain EnvMap")
-				sysPath, ok := envMap[common.HostSysEnvKey]
-				require.True(t, ok, "EnvMap should contain HostSysEnvKey")
-				assert.Equal(t, tt.sysSensors, sysPath)
-			}
-		})
-	}
-}
-
-func TestNewSensorConfig(t *testing.T) {
-	// Save original environment variables
-	originalPrimary, hasPrimary := os.LookupEnv("BESZEL_AGENT_PRIMARY_SENSOR")
-	originalSys, hasSys := os.LookupEnv("BESZEL_AGENT_SYS_SENSORS")
-	originalSensors, hasSensors := os.LookupEnv("BESZEL_AGENT_SENSORS")
-
-	// Restore environment variables after the test
-	defer func() {
-		// Clean up test environment variables
-		os.Unsetenv("BESZEL_AGENT_PRIMARY_SENSOR")
-		os.Unsetenv("BESZEL_AGENT_SYS_SENSORS")
-		os.Unsetenv("BESZEL_AGENT_SENSORS")
-
-		// Restore original values if they existed
-		if hasPrimary {
-			os.Setenv("BESZEL_AGENT_PRIMARY_SENSOR", originalPrimary)
-		}
-		if hasSys {
-			os.Setenv("BESZEL_AGENT_SYS_SENSORS", originalSys)
-		}
-		if hasSensors {
-			os.Setenv("BESZEL_AGENT_SENSORS", originalSensors)
-		}
-	}()
-
-	// Set test environment variables
-	os.Setenv("BESZEL_AGENT_PRIMARY_SENSOR", "test_primary")
-	os.Setenv("BESZEL_AGENT_SYS_SENSORS", "/test/path")
-	os.Setenv("BESZEL_AGENT_SENSORS", "test_sensor1,test_*,test_sensor3")
-
-	agent := &Agent{}
-	result := agent.newSensorConfig()
-
-	// Verify results
-	assert.Equal(t, "test_primary", result.primarySensor)
-	assert.NotNil(t, result.sensors)
-	assert.Equal(t, 3, len(result.sensors))
-	assert.True(t, result.hasWildcards)
-	assert.False(t, result.isBlacklist)
-
-	// Check that sys sensors path is in context
-	envMap, ok := result.context.Value(common.EnvKey).(common.EnvMap)
-	require.True(t, ok, "Context should contain EnvMap")
-	sysPath, ok := envMap[common.HostSysEnvKey]
-	require.True(t, ok, "EnvMap should contain HostSysEnvKey")
-	assert.Equal(t, "/test/path", sysPath)
-}
-
-func TestScaleTemperature(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    float64
-		expected float64
-		desc     string
-	}{
-		// Normal temperatures (no scaling needed)
-		{"normal_cpu_temp", 45.0, 45.0, "Normal CPU temperature"},
-		{"normal_room_temp", 25.0, 25.0, "Normal room temperature"},
-		{"high_cpu_temp", 85.0, 85.0, "High CPU temperature"},
-		// Zero temperature
-		{"zero_temp", 0.0, 0.0, "Zero temperature"},
-		// Fractional values that should use 100x scaling
-		{"fractional_45c", 0.45, 45.0, "0.45 should become 45°C (100x)"},
-		{"fractional_25c", 0.25, 25.0, "0.25 should become 25°C (100x)"},
-		{"fractional_60c", 0.60, 60.0, "0.60 should become 60°C (100x)"},
-		{"fractional_75c", 0.75, 75.0, "0.75 should become 75°C (100x)"},
-		{"fractional_30c", 0.30, 30.0, "0.30 should become 30°C (100x)"},
-		// Fractional values that should use 1000x scaling
-		{"millifractional_45c", 0.045, 45.0, "0.045 should become 45°C (1000x)"},
-		{"millifractional_25c", 0.025, 25.0, "0.025 should become 25°C (1000x)"},
-		{"millifractional_60c", 0.060, 60.0, "0.060 should become 60°C (1000x)"},
-		{"millifractional_75c", 0.075, 75.0, "0.075 should become 75°C (1000x)"},
-		{"millifractional_35c", 0.035, 35.0, "0.035 should become 35°C (1000x)"},
-		// Edge cases - values outside reasonable range
-		{"very_low_fractional", 0.01, 1.0, "0.01 should default to 100x scaling (1°C)"},
-		{"very_high_fractional", 0.99, 99.0, "0.99 should default to 100x scaling (99°C)"},
-		{"extremely_low", 0.001, 0.1, "0.001 should default to 100x scaling (0.1°C)"},
-		// Boundary cases around the reasonable range (15-95°C)
-		{"boundary_low_100x", 0.15, 15.0, "0.15 should use 100x scaling (15°C)"},
-		{"boundary_high_100x", 0.95, 95.0, "0.95 should use 100x scaling (95°C)"},
-		{"boundary_low_1000x", 0.015, 15.0, "0.015 should use 1000x scaling (15°C)"},
-		{"boundary_high_1000x", 0.095, 95.0, "0.095 should use 1000x scaling (95°C)"},
-		// Values just outside reasonable range
-		{"just_below_range_100x", 0.14, 14.0, "0.14 should default to 100x (14°C)"},
-		{"just_above_range_100x", 0.96, 96.0, "0.96 should default to 100x (96°C)"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := scaleTemperature(tt.input)
-			assert.InDelta(t, tt.expected, result, 0.001,
-				"scaleTemperature(%v) = %v, expected %v (%s)",
-				tt.input, result, tt.expected, tt.desc)
-		})
-	}
-}
-
-func TestScaleTemperatureLogic(t *testing.T) {
-	// Test the logic flow for ambiguous cases
-	t.Run("prefers_100x_when_both_valid", func(t *testing.T) {
-		// 0.5 could be 50°C (100x) or 500°C (1000x)
-		// Should prefer 100x since it's tried first and is in range
-		result := scaleTemperature(0.5)
-		expected := 50.0
-		assert.InDelta(t, expected, result, 0.001,
-			"scaleTemperature(0.5) = %v, expected %v (should prefer 100x scaling)",
-			result, expected)
-	})
-
-	t.Run("uses_1000x_when_100x_too_low", func(t *testing.T) {
-		// 0.05 -> 5°C (100x, too low) or 50°C (1000x, in range)
-		// Should use 1000x since 100x is below reasonable range
-		result := scaleTemperature(0.05)
-		expected := 50.0
-		assert.InDelta(t, expected, result, 0.001,
-			"scaleTemperature(0.05) = %v, expected %v (should use 1000x scaling)",
-			result, expected)
-	})
-
-	t.Run("defaults_to_100x_when_both_invalid", func(t *testing.T) {
-		// 0.005 -> 0.5°C (100x, too low) or 5°C (1000x, too low)
-		// Should default to 100x scaling
-		result := scaleTemperature(0.005)
-		expected := 0.5
-		assert.InDelta(t, expected, result, 0.001,
-			"scaleTemperature(0.005) = %v, expected %v (should default to 100x)",
-			result, expected)
-	})
-}

beszel/internal/agent/server.go

@@ -1,7 +1,6 @@
 package agent
 
 import (
-	"beszel/internal/common"
 	"encoding/json"
 	"fmt"
 	"log/slog"
@@ -9,126 +8,90 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gliderlabs/ssh"
-	gossh "golang.org/x/crypto/ssh"
+	sshServer "github.com/gliderlabs/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
 type ServerOptions struct {
 	Addr    string
 	Network string
-	Keys    []gossh.PublicKey
+	Keys    []ssh.PublicKey
 }
 
 func (a *Agent) StartServer(opts ServerOptions) error {
+	sshServer.Handle(a.handleSession)
+
 	slog.Info("Starting SSH server", "addr", opts.Addr, "network", opts.Network)
 
-	if opts.Network == "unix" {
+	switch opts.Network {
+	case "unix":
 		// remove existing socket file if it exists
 		if err := os.Remove(opts.Addr); err != nil && !os.IsNotExist(err) {
 			return err
 		}
+	default:
+		// prefix with : if only port was provided
+		if !strings.Contains(opts.Addr, ":") {
+			opts.Addr = ":" + opts.Addr
+		}
 	}
 
-	// start listening on the address
+	// Listen on the address
 	ln, err := net.Listen(opts.Network, opts.Addr)
 	if err != nil {
 		return err
 	}
 	defer ln.Close()
 
-	// base config (limit to allowed algorithms)
-	config := &gossh.ServerConfig{}
-	config.KeyExchanges = common.DefaultKeyExchanges
-	config.MACs = common.DefaultMACs
-	config.Ciphers = common.DefaultCiphers
-
-	// set default handler
-	ssh.Handle(a.handleSession)
-
-	server := ssh.Server{
-		ServerConfigCallback: func(ctx ssh.Context) *gossh.ServerConfig {
-			return config
-		},
-		// check public key(s)
-		PublicKeyHandler: func(ctx ssh.Context, key ssh.PublicKey) bool {
+	// Start SSH server on the listener
+	err = sshServer.Serve(ln, nil, sshServer.NoPty(),
+		sshServer.PublicKeyAuth(func(ctx sshServer.Context, key sshServer.PublicKey) bool {
 			for _, pubKey := range opts.Keys {
-				if ssh.KeysEqual(key, pubKey) {
+				if sshServer.KeysEqual(key, pubKey) {
 					return true
 				}
 			}
 			return false
-		},
-		// disable pty
-		PtyCallback: func(ctx ssh.Context, pty ssh.Pty) bool {
-			return false
-		},
-		// log failed connections
-		ConnectionFailedCallback: func(conn net.Conn, err error) {
-			slog.Warn("Failed connection attempt", "addr", conn.RemoteAddr().String(), "err", err)
-		},
+		}),
+	)
+	if err != nil {
+		return err
 	}
-
-	// Start SSH server on the listener
-	return server.Serve(ln)
+	return nil
 }
 
-func (a *Agent) handleSession(s ssh.Session) {
-	slog.Debug("New session", "client", s.RemoteAddr())
-	stats := a.gatherStats(s.Context().SessionID())
+func (a *Agent) handleSession(s sshServer.Session) {
+	// slog.Debug("connection", "remoteaddr", s.RemoteAddr(), "user", s.User())
+	stats := a.gatherStats()
 	if err := json.NewEncoder(s).Encode(stats); err != nil {
 		slog.Error("Error encoding stats", "err", err, "stats", stats)
 		s.Exit(1)
-		return
 	}
 	s.Exit(0)
 }
 
 // ParseKeys parses a string containing SSH public keys in authorized_keys format.
 // It returns a slice of ssh.PublicKey and an error if any key fails to parse.
-func ParseKeys(input string) ([]gossh.PublicKey, error) {
-	var parsedKeys []gossh.PublicKey
+func ParseKeys(input string) ([]ssh.PublicKey, error) {
+	var parsedKeys []ssh.PublicKey
+
 	for line := range strings.Lines(input) {
 		line = strings.TrimSpace(line)
+
 		// Skip empty lines or comments
 		if len(line) == 0 || strings.HasPrefix(line, "#") {
 			continue
 		}
+
 		// Parse the key
-		parsedKey, _, _, _, err := gossh.ParseAuthorizedKey([]byte(line))
+		parsedKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(line))
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse key: %s, error: %w", line, err)
 		}
+
+		// Append the parsed key to the list
 		parsedKeys = append(parsedKeys, parsedKey)
 	}
+
 	return parsedKeys, nil
 }
-
-// GetAddress gets the address to listen on or connect to from environment variables or default value.
-func GetAddress(addr string) string {
-	if addr == "" {
-		addr, _ = GetEnv("LISTEN")
-	}
-	if addr == "" {
-		// Legacy PORT environment variable support
-		addr, _ = GetEnv("PORT")
-	}
-	if addr == "" {
-		return ":45876"
-	}
-	// prefix with : if only port was provided
-	if GetNetwork(addr) != "unix" && !strings.Contains(addr, ":") {
-		addr = ":" + addr
-	}
-	return addr
-}
-
-// GetNetwork returns the network type to use based on the address
-func GetNetwork(addr string) string {
-	if network, ok := GetEnv("NETWORK"); ok && network != "" {
-		return network
-	}
-	if strings.HasPrefix(addr, "/") {
-		return "unix"
-	}
-	return "tcp"
-}

beszel/internal/agent/server_test.go

@@ -45,7 +45,7 @@ func TestStartServer(t *testing.T) {
 			name: "tcp port only",
 			config: ServerOptions{
 				Network: "tcp",
-				Addr:    ":45987",
+				Addr:    "45987",
 				Keys:    []ssh.PublicKey{sshPubKey},
 			},
 		},
@@ -88,7 +88,7 @@ func TestStartServer(t *testing.T) {
 			name: "bad key should fail",
 			config: ServerOptions{
 				Network: "tcp",
-				Addr:    ":45987",
+				Addr:    "45987",
 				Keys:    []ssh.PublicKey{sshBadPubKey},
 			},
 			wantErr:     true,
@@ -98,7 +98,7 @@ func TestStartServer(t *testing.T) {
 			name: "good key still good",
 			config: ServerOptions{
 				Network: "tcp",
-				Addr:    ":45987",
+				Addr:    "45987",
 				Keys:    []ssh.PublicKey{sshPubKey},
 			},
 		},

beszel/internal/agent/smart.go

@@ -1,304 +0,0 @@
-package agent
-
-import (
-	"beszel/internal/entities/smart"
-	"beszel/internal/entities/system"
-	"context"
-	"encoding/json"
-	"fmt"
-	"os/exec"
-	"reflect"
-	"sync"
-	"time"
-
-	"golang.org/x/exp/slog"
-)
-
-// SmartManager manages data collection for SMART devices
-// TODO: add retry argument
-// TODO: add timeout argument
-type SmartManager struct {
-	SmartDataMap map[string]*system.SmartData
-	SmartDevices []*DeviceInfo
-	mutex        sync.Mutex
-}
-
-type scanOutput struct {
-	Devices []struct {
-		Name     string `json:"name"`
-		Type     string `json:"type"`
-		InfoName string `json:"info_name"`
-		Protocol string `json:"protocol"`
-	} `json:"devices"`
-}
-
-type DeviceInfo struct {
-	Name     string `json:"name"`
-	Type     string `json:"type"`
-	InfoName string `json:"info_name"`
-	Protocol string `json:"protocol"`
-}
-
-var errNoValidSmartData = fmt.Errorf("no valid GPU data found") // Error for missing data
-
-// Starts the SmartManager
-func (sm *SmartManager) Start() {
-	sm.SmartDataMap = make(map[string]*system.SmartData)
-	for {
-		err := sm.ScanDevices()
-		if err != nil {
-			slog.Warn("smartctl scan failed, stopping", "err", err)
-			return
-		}
-		// TODO: add retry logic
-		for _, deviceInfo := range sm.SmartDevices {
-			err := sm.CollectSmart(deviceInfo)
-			if err != nil {
-				slog.Warn("smartctl collect failed, stopping", "err", err)
-				return
-			}
-		}
-		// Sleep for 10 seconds before next scan
-		time.Sleep(10 * time.Second)
-	}
-}
-
-// GetCurrentData returns the current SMART data
-func (sm *SmartManager) GetCurrentData() map[string]system.SmartData {
-	sm.mutex.Lock()
-	defer sm.mutex.Unlock()
-	result := make(map[string]system.SmartData)
-	for key, value := range sm.SmartDataMap {
-		result[key] = *value
-	}
-	return result
-}
-
-// ScanDevices scans for SMART devices
-// Scan devices using `smartctl --scan -j`
-// If scan fails, return error
-// If scan succeeds, parse the output and update the SmartDevices slice
-func (sm *SmartManager) ScanDevices() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, "smartctl", "--scan", "-j")
-	output, err := cmd.Output()
-
-	if err != nil {
-		return err
-	}
-
-	hasValidData := sm.parseScan(output)
-	if !hasValidData {
-		return errNoValidSmartData
-	}
-	return nil
-}
-
-// CollectSmart collects SMART data for a device
-// Collect data using `smartctl --all -j /dev/sdX` or `smartctl --all -j /dev/nvmeX`
-// If collect fails, return error
-// If collect succeeds, parse the output and update the SmartDataMap
-func (sm *SmartManager) CollectSmart(deviceInfo *DeviceInfo) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, "smartctl", "--all", "-j", deviceInfo.Name)
-
-	output, err := cmd.Output()
-
-	if err != nil {
-		return err
-	}
-	
-	hasValidData := false
-	if deviceInfo.Type == "scsi" {
-		// parse scsi devices
-		hasValidData = sm.parseSmartForScsi(output)
-	} else if deviceInfo.Type == "nvme" {
-		// parse nvme devices
-		hasValidData = sm.parseSmartForNvme(output)
-	}
-
-	if !hasValidData {
-		return errNoValidSmartData
-	}
-	return nil
-}
-
-// parseScan parses the output of smartctl --scan -j and updates the SmartDevices slice
-func (sm *SmartManager) parseScan(output []byte) bool {
-	sm.mutex.Lock()
-	defer sm.mutex.Unlock()
-
-	sm.SmartDevices = make([]*DeviceInfo, 0)
-	scan := &scanOutput{}
-
-	if err := json.Unmarshal(output, scan); err != nil {
-		fmt.Printf("Failed to parse JSON: %v\n", err)
-		return false
-	}
-
-	scannedDeviceNameMap := make(map[string]bool)
-
-	for _, device := range scan.Devices {
-		deviceInfo := &DeviceInfo{
-			Name:     device.Name,
-			Type:     device.Type,
-			InfoName: device.InfoName,
-			Protocol: device.Protocol,
-		}
-		sm.SmartDevices = append(sm.SmartDevices, deviceInfo)
-		scannedDeviceNameMap[device.Name] = true
-	}
-	// remove devices that are not in the scan
-	for key := range sm.SmartDataMap {
-		if _, ok := scannedDeviceNameMap[key]; !ok {
-			delete(sm.SmartDataMap, key)
-		}
-	}
-	devicesString := ""
-	for _, device := range sm.SmartDevices {
-		devicesString += device.Name + " "
-	}
-
-	return true
-}
-
-// parseSmartForScsi parses the output of smartctl --all -j /dev/sdX and updates the SmartDataMap
-func (sm *SmartManager) parseSmartForScsi(output []byte) bool {
-	data := &smart.SmartInfoForSata{}
-
-	if err := json.Unmarshal(output, &data); err != nil {
-		return false
-	}
-
-	sm.mutex.Lock()
-	defer sm.mutex.Unlock()
-
-	// get device name (e.g. /dev/sda)
-	keyName := data.SerialNumber
-
-	// if device does not exist in SmartDataMap, initialize it
-	if _, ok := sm.SmartDataMap[keyName]; !ok {
-		sm.SmartDataMap[keyName] = &system.SmartData{}
-	}
-
-	// update SmartData
-	smartData := sm.SmartDataMap[keyName]
-	smartData.ModelFamily = data.ModelFamily
-	smartData.ModelName = data.ModelName
-	smartData.SerialNumber = data.SerialNumber
-	smartData.FirmwareVersion = data.FirmwareVersion
-	smartData.Capacity = data.UserCapacity.Bytes
-	if data.SmartStatus.Passed {
-		smartData.SmartStatus = "PASSED"
-	} else {
-		smartData.SmartStatus = "FAILED"
-	}
-	smartData.DiskName = data.Device.Name
-	smartData.DiskType = data.Device.Type
-
-	// update SmartAttributes
-	smartData.Attributes = make([]*system.SmartAttribute, 0, len(data.AtaSmartAttributes.Table))
-	for _, attr := range data.AtaSmartAttributes.Table {
-		smartAttr := &system.SmartAttribute{
-			Id:         attr.ID,
-			Name:       attr.Name,
-			Value:      attr.Value,
-			Worst:      attr.Worst,
-			Threshold:  attr.Thresh,
-			RawValue:   attr.Raw.Value,
-			RawString:  attr.Raw.String,
-			Flags:      attr.Flags.String,
-			WhenFailed: attr.WhenFailed,
-		}
-		smartData.Attributes = append(smartData.Attributes, smartAttr)
-	}
-	smartData.Temperature = data.Temperature.Current
-	sm.SmartDataMap[keyName] = smartData
-
-	return true
-}
-
-// parseSmartForNvme parses the output of smartctl --all -j /dev/nvmeX and updates the SmartDataMap
-func (sm *SmartManager) parseSmartForNvme(output []byte) bool {
-	data := &smart.SmartInfoForNvme{}
-
-	if err := json.Unmarshal(output, &data); err != nil {
-		return false
-	}
-
-	sm.mutex.Lock()
-	defer sm.mutex.Unlock()
-
-	// get device name (e.g. /dev/nvme0)
-	keyName := data.SerialNumber
-
-	// if device does not exist in SmartDataMap, initialize it
-	if _, ok := sm.SmartDataMap[keyName]; !ok {
-		sm.SmartDataMap[keyName] = &system.SmartData{}
-	}
-
-	// update SmartData
-	smartData := sm.SmartDataMap[keyName]
-	smartData.ModelName = data.ModelName
-	smartData.SerialNumber = data.SerialNumber
-	smartData.FirmwareVersion = data.FirmwareVersion
-	smartData.Capacity = data.UserCapacity.Bytes
-	if data.SmartStatus.Passed {
-		smartData.SmartStatus = "PASSED"
-	} else {
-		smartData.SmartStatus = "FAILED"
-	}
-	smartData.DiskName = data.Device.Name
-	smartData.DiskType = data.Device.Type
-
-	v := reflect.ValueOf(data.NVMeSmartHealthInformationLog)
-	t := v.Type()
-	smartData.Attributes = make([]*system.SmartAttribute, 0, v.NumField())
-
-	// nvme attributes does not follow the same format as ata attributes,
-	// so we have to manually iterate over the fields and update SmartAttributes
-	for i := 0; i < v.NumField(); i++ {
-		field := t.Field(i)
-		value := v.Field(i)
-		key := field.Name
-		val := value.Interface()
-		// drop non int values
-		if _, ok := val.(int); !ok {
-			continue
-		}
-		smartAttr := &system.SmartAttribute{
-			Name:  key,
-			RawValue: val.(int),
-		}
-		smartData.Attributes = append(smartData.Attributes, smartAttr)
-	}
-	smartData.Temperature = data.NVMeSmartHealthInformationLog.Temperature
-
-	sm.SmartDataMap[keyName] = smartData
-
-	return true
-}
-
-// detectSmartctl checks if smartctl is installed, returns an error if not
-func (sm *SmartManager) detectSmartctl() error {
-	if _, err := exec.LookPath("smartctl"); err == nil {
-		return nil
-	}
-	return fmt.Errorf("no smartctl found - install smartctl")
-}
-
-// NewGPUManager creates and initializes a new GPUManager
-func NewSmartManager() (*SmartManager, error) {
-	var sm SmartManager
-	if err := sm.detectSmartctl(); err != nil {
-		return nil, err
-	}
-
-	go sm.Start()
-
-	return &sm, nil
-}

beszel/internal/agent/system.go

@@ -16,31 +16,14 @@ import (
 	"github.com/shirou/gopsutil/v4/host"
 	"github.com/shirou/gopsutil/v4/mem"
 	psutilNet "github.com/shirou/gopsutil/v4/net"
+	"github.com/shirou/gopsutil/v4/sensors"
 )
 
 // Sets initial / non-changing values about the host system
 func (a *Agent) initializeSystemInfo() {
 	a.systemInfo.AgentVersion = beszel.Version
 	a.systemInfo.Hostname, _ = os.Hostname()
-
-	platform, _, version, _ := host.PlatformInformation()
-
-	if platform == "darwin" {
-		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.Os = system.Windows
-	} else if platform == "freebsd" {
-		a.systemInfo.Os = system.Freebsd
-		a.systemInfo.KernelVersion = version
-	} else {
-		a.systemInfo.Os = system.Linux
-	}
-
-	if a.systemInfo.KernelVersion == "" {
-		a.systemInfo.KernelVersion, _ = host.KernelVersion()
-	}
+	a.systemInfo.KernelVersion, _ = host.KernelVersion()
 
 	// cpu model
 	if info, err := cpu.Info(); err == nil && len(info) > 0 {
@@ -201,9 +184,11 @@ func (a *Agent) getSystemStats() system.Stats {
 		}
 	}
 
-	// temperatures
-	// TODO: maybe refactor to methods on systemStats
-	a.updateTemperatures(&systemStats)
+	// temperatures (skip if sensors whitelist is set to empty string)
+	err = a.updateTemperatures(&systemStats)
+	if err != nil {
+		slog.Error("Error getting temperatures", "err", err)
+	}
 
 	// GPU data
 	if a.gpuManager != nil {
@@ -217,35 +202,13 @@ func (a *Agent) getSystemStats() system.Stats {
 			if systemStats.Temperatures == nil {
 				systemStats.Temperatures = make(map[string]float64, len(gpuData))
 			}
-			highestTemp := 0.0
 			for _, gpu := range gpuData {
 				if gpu.Temperature > 0 {
 					systemStats.Temperatures[gpu.Name] = gpu.Temperature
-					if a.sensorConfig.primarySensor == gpu.Name {
-						a.systemInfo.DashboardTemp = gpu.Temperature
-					}
-					if gpu.Temperature > highestTemp {
-						highestTemp = gpu.Temperature
-					}
 				}
 				// update high gpu percent for dashboard
 				a.systemInfo.GpuPct = max(a.systemInfo.GpuPct, gpu.Usage)
 			}
-			// use highest temp for dashboard temp if dashboard temp is unset
-			if a.systemInfo.DashboardTemp == 0 {
-				a.systemInfo.DashboardTemp = highestTemp
-			}
-		}
-	}
-	if a.smartManager != nil {
-		if smartData := a.smartManager.GetCurrentData(); len(smartData) > 0 {
-			systemStats.SmartData = smartData
-			if systemStats.Temperatures == nil {
-				systemStats.Temperatures = make(map[string]float64, len(a.smartManager.SmartDataMap))
-			}
-			for key, value := range a.smartManager.SmartDataMap {
-				systemStats.Temperatures[key] = float64(value.Temperature)
-			}
 		}
 	}
 
@@ -260,6 +223,60 @@ func (a *Agent) getSystemStats() system.Stats {
 	return systemStats
 }
 
+func (a *Agent) updateTemperatures(systemStats *system.Stats) error {
+	// skip if sensors whitelist is set to empty string
+	if a.sensorsWhitelist != nil && len(a.sensorsWhitelist) == 0 {
+		slog.Debug("Skipping temperature collection")
+		return nil
+	}
+
+	primarySensor, primarySensorIsDefined := GetEnv("PRIMARY_SENSOR")
+
+	// reset high temp
+	a.systemInfo.DashboardTemp = 0
+
+	// get sensor data
+	temps, err := sensors.TemperaturesWithContext(a.sensorsContext)
+	if err != nil {
+		return err
+	}
+	slog.Debug("Temperature", "sensors", temps)
+
+	// return if no sensors
+	if len(temps) == 0 {
+		return nil
+	}
+
+	systemStats.Temperatures = make(map[string]float64, len(temps))
+	for i, sensor := range temps {
+		// skip if temperature is unreasonable
+		if sensor.Temperature <= 0 || sensor.Temperature >= 200 {
+			continue
+		}
+		sensorName := sensor.SensorKey
+		if _, ok := systemStats.Temperatures[sensorName]; ok {
+			// if key already exists, append int to key
+			sensorName = sensorName + "_" + strconv.Itoa(i)
+		}
+		// skip if not in whitelist
+		if a.sensorsWhitelist != nil {
+			if _, nameInWhitelist := a.sensorsWhitelist[sensorName]; !nameInWhitelist {
+				continue
+			}
+		}
+		// set dashboard temperature
+		if primarySensorIsDefined {
+			if sensorName == primarySensor {
+				a.systemInfo.DashboardTemp = sensor.Temperature
+			}
+		} else {
+			a.systemInfo.DashboardTemp = max(a.systemInfo.DashboardTemp, sensor.Temperature)
+		}
+		systemStats.Temperatures[sensorName] = twoDecimals(sensor.Temperature)
+	}
+	return nil
+}
+
 // Returns the size of the ZFS ARC memory cache in bytes
 func getARCSize() (uint64, error) {
 	file, err := os.Open("/proc/spl/kstat/zfs/arcstats")

beszel/internal/alerts/alerts.go

@@ -8,20 +8,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nicholas-fedor/shoutrrr"
+	"github.com/containrrr/shoutrrr"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
 	"github.com/pocketbase/pocketbase/tools/mailer"
 )
 
-type hubLike interface {
-	core.App
-	MakeLink(parts ...string) string
-}
-
 type AlertManager struct {
-	hub           hubLike
+	app           core.App
 	alertQueue    chan alertTask
 	stopChan      chan struct{}
 	pendingAlerts sync.Map
@@ -71,7 +66,6 @@ var supportsTitle = map[string]struct{}{
 	"gotify":     {},
 	"ifttt":      {},
 	"join":       {},
-	"lark":       {},
 	"matrix":     {},
 	"ntfy":       {},
 	"opsgenie":   {},
@@ -84,9 +78,9 @@ var supportsTitle = map[string]struct{}{
 }
 
 // NewAlertManager creates a new AlertManager instance.
-func NewAlertManager(app hubLike) *AlertManager {
+func NewAlertManager(app core.App) *AlertManager {
 	am := &AlertManager{
-		hub:        app,
+		app:        app,
 		alertQueue: make(chan alertTask),
 		stopChan:   make(chan struct{}),
 	}
@@ -96,7 +90,7 @@ func NewAlertManager(app hubLike) *AlertManager {
 
 func (am *AlertManager) SendAlert(data AlertMessageData) error {
 	// get user settings
-	record, err := am.hub.FindFirstRecordByFilter(
+	record, err := am.app.FindFirstRecordByFilter(
 		"user_settings", "user={:user}",
 		dbx.Params{"user": data.UserID},
 	)
@@ -109,12 +103,12 @@ func (am *AlertManager) SendAlert(data AlertMessageData) error {
 		Webhooks: []string{},
 	}
 	if err := record.UnmarshalJSONField("settings", &userAlertSettings); err != nil {
-		am.hub.Logger().Error("Failed to unmarshal user settings", "err", err)
+		am.app.Logger().Error("Failed to unmarshal user settings", "err", err.Error())
 	}
 	// send alerts via webhooks
 	for _, webhook := range userAlertSettings.Webhooks {
 		if err := am.SendShoutrrrAlert(webhook, data.Title, data.Message, data.Link, data.LinkText); err != nil {
-			am.hub.Logger().Error("Failed to send shoutrrr alert", "err", err)
+			am.app.Logger().Error("Failed to send shoutrrr alert", "err", err.Error())
 		}
 	}
 	// send alerts via email
@@ -130,15 +124,15 @@ func (am *AlertManager) SendAlert(data AlertMessageData) error {
 		Subject: data.Title,
 		Text:    data.Message + fmt.Sprintf("\n\n%s", data.Link),
 		From: mail.Address{
-			Address: am.hub.Settings().Meta.SenderAddress,
-			Name:    am.hub.Settings().Meta.SenderName,
+			Address: am.app.Settings().Meta.SenderAddress,
+			Name:    am.app.Settings().Meta.SenderName,
 		},
 	}
-	err = am.hub.NewMailClient().Send(&message)
+	err = am.app.NewMailClient().Send(&message)
 	if err != nil {
 		return err
 	}
-	am.hub.Logger().Info("Sent email alert", "to", message.To, "subj", message.Subject)
+	am.app.Logger().Info("Sent email alert", "to", message.To, "subj", message.Subject)
 	return nil
 }
 
@@ -172,12 +166,10 @@ func (am *AlertManager) SendShoutrrrAlert(notificationUrl, title, message, link,
 
 	// Add link
 	if scheme == "ntfy" {
+		// if ntfy, add link to actions
 		queryParams.Add("Actions", fmt.Sprintf("view, %s, %s", linkText, link))
-	} else if scheme == "lark" {
-		queryParams.Add("link", link)
-	} else if scheme == "bark" {
-		queryParams.Add("url", link)
 	} else {
+		// else add link directly to the message
 		message += "\n\n" + link
 	}
 
@@ -188,9 +180,9 @@ func (am *AlertManager) SendShoutrrrAlert(notificationUrl, title, message, link,
 	err = shoutrrr.Send(parsedURL.String(), message)
 
 	if err == nil {
-		am.hub.Logger().Info("Sent shoutrrr alert", "title", title)
+		am.app.Logger().Info("Sent shoutrrr alert", "title", title)
 	} else {
-		am.hub.Logger().Error("Error sending shoutrrr alert", "err", err)
+		am.app.Logger().Error("Error sending shoutrrr alert", "err", err.Error())
 		return err
 	}
 	return nil
@@ -206,7 +198,7 @@ func (am *AlertManager) SendTestNotification(e *core.RequestEvent) error {
 	if url == "" {
 		return e.JSON(200, map[string]string{"err": "URL is required"})
 	}
-	err := am.SendShoutrrrAlert(url, "Test Alert", "This is a notification from Beszel.", am.hub.Settings().Meta.AppURL, "View Beszel")
+	err := am.SendShoutrrrAlert(url, "Test Alert", "This is a notification from Beszel.", am.app.Settings().Meta.AppURL, "View Beszel")
 	if err != nil {
 		return e.JSON(200, map[string]string{"err": err.Error()})
 	}

beszel/internal/alerts/alerts_status.go

@@ -2,6 +2,7 @@ package alerts
 
 import (
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
@@ -25,7 +26,8 @@ type alertInfo struct {
 // startWorker is a long-running goroutine that processes alert tasks
 // every x seconds. It must be running to process status alerts.
 func (am *AlertManager) startWorker() {
-	tick := time.Tick(15 * time.Second)
+	// no special reason for 13 seconds
+	tick := time.Tick(13 * time.Second)
 	for {
 		select {
 		case <-am.stopChan:
@@ -62,12 +64,21 @@ func (am *AlertManager) StopWorker() {
 }
 
 // HandleStatusAlerts manages the logic when system status changes.
-func (am *AlertManager) HandleStatusAlerts(newStatus string, systemRecord *core.Record) error {
-	if newStatus != "up" && newStatus != "down" {
+func (am *AlertManager) HandleStatusAlerts(newStatus string, oldSystemRecord *core.Record) error {
+	switch newStatus {
+	case "up":
+		if oldSystemRecord.GetString("status") != "down" {
+			return nil
+		}
+	case "down":
+		if oldSystemRecord.GetString("status") != "up" {
+			return nil
+		}
+	default:
 		return nil
 	}
 
-	alertRecords, err := am.getSystemStatusAlerts(systemRecord.Id)
+	alertRecords, err := am.getSystemStatusAlerts(oldSystemRecord.Id)
 	if err != nil {
 		return err
 	}
@@ -75,7 +86,7 @@ func (am *AlertManager) HandleStatusAlerts(newStatus string, systemRecord *core.
 		return nil
 	}
 
-	systemName := systemRecord.GetString("name")
+	systemName := oldSystemRecord.GetString("name")
 	if newStatus == "down" {
 		am.handleSystemDown(systemName, alertRecords)
 	} else {
@@ -86,7 +97,7 @@ func (am *AlertManager) HandleStatusAlerts(newStatus string, systemRecord *core.
 
 // getSystemStatusAlerts retrieves all "Status" alert records for a given system ID.
 func (am *AlertManager) getSystemStatusAlerts(systemID string) ([]*core.Record, error) {
-	alertRecords, err := am.hub.FindAllRecords("alerts", dbx.HashExp{
+	alertRecords, err := am.app.FindAllRecords("alerts", dbx.HashExp{
 		"system": systemID,
 		"name":   "Status",
 	})
@@ -129,7 +140,7 @@ func (am *AlertManager) handleSystemUp(systemName string, alertRecords []*core.R
 		}
 		// No alert scheduled for this record, send "up" alert
 		if err := am.sendStatusAlert("up", systemName, alertRecord); err != nil {
-			am.hub.Logger().Error("Failed to send alert", "err", err)
+			am.app.Logger().Error("Failed to send alert", "err", err.Error())
 		}
 	}
 }
@@ -146,7 +157,7 @@ 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)
 
-	if errs := am.hub.ExpandRecord(alertRecord, []string{"user"}, nil); len(errs) > 0 {
+	if errs := am.app.ExpandRecord(alertRecord, []string{"user"}, nil); len(errs) > 0 {
 		return errs["user"]
 	}
 	user := alertRecord.ExpandedOne("user")
@@ -158,7 +169,7 @@ func (am *AlertManager) sendStatusAlert(alertStatus string, systemName string, a
 		UserID:   user.Id,
 		Title:    title,
 		Message:  message,
-		Link:     am.hub.MakeLink("system", systemName),
+		Link:     am.app.Settings().Meta.AppURL + "/system/" + url.PathEscape(systemName),
 		LinkText: "View " + systemName,
 	})
 }

beszel/internal/alerts/alerts_system.go

@@ -3,6 +3,8 @@ package alerts
 import (
 	"beszel/internal/entities/system"
 	"fmt"
+	"net/url"
+	"slices"
 	"strings"
 	"time"
 
@@ -13,8 +15,8 @@ import (
 	"github.com/spf13/cast"
 )
 
-func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *system.CombinedData) error {
-	alertRecords, err := am.hub.FindAllRecords("alerts",
+func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, systemInfo system.Info, temperatures map[string]float64, extraFs map[string]*system.FsStats) error {
+	alertRecords, err := am.app.FindAllRecords("alerts",
 		dbx.NewExp("system={:system}", dbx.Params{"system": systemRecord.Id}),
 	)
 	if err != nil || len(alertRecords) == 0 {
@@ -33,15 +35,15 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 
 		switch name {
 		case "CPU":
-			val = data.Info.Cpu
+			val = systemInfo.Cpu
 		case "Memory":
-			val = data.Info.MemPct
+			val = systemInfo.MemPct
 		case "Bandwidth":
-			val = data.Info.Bandwidth
+			val = systemInfo.Bandwidth
 			unit = " MB/s"
 		case "Disk":
-			maxUsedPct := data.Info.DiskPct
-			for _, fs := range data.Stats.ExtraFs {
+			maxUsedPct := systemInfo.DiskPct
+			for _, fs := range extraFs {
 				usedPct := fs.DiskUsed / fs.DiskTotal * 100
 				if usedPct > maxUsedPct {
 					maxUsedPct = usedPct
@@ -49,10 +51,14 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 			}
 			val = maxUsedPct
 		case "Temperature":
-			if data.Info.DashboardTemp < 1 {
+			if temperatures == nil {
 				continue
 			}
-			val = data.Info.DashboardTemp
+			for _, temp := range temperatures {
+				if temp > val {
+					val = temp
+				}
+			}
 			unit = "°C"
 		}
 
@@ -68,8 +74,13 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 		}
 
 		min := max(1, cast.ToUint8(alertRecord.Get("min")))
+		// add time to alert time to make sure it's slighty after record creation
+		time := now.Add(-time.Duration(min) * time.Minute)
+		if time.Before(oldestTime) {
+			oldestTime = time
+		}
 
-		alert := SystemAlertData{
+		validAlerts = append(validAlerts, SystemAlertData{
 			systemRecord: systemRecord,
 			alertRecord:  alertRecord,
 			name:         name,
@@ -77,22 +88,9 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 			val:          val,
 			threshold:    threshold,
 			triggered:    triggered,
+			time:         time,
 			min:          min,
-		}
-
-		// send alert immediately if min is 1 - no need to sum up values.
-		if min == 1 {
-			alert.triggered = val > threshold
-			go am.sendSystemAlert(alert)
-			continue
-		}
-
-		alert.time = now.Add(-time.Duration(min) * time.Minute)
-		if alert.time.Before(oldestTime) {
-			oldestTime = alert.time
-		}
-
-		validAlerts = append(validAlerts, alert)
+		})
 	}
 
 	systemStats := []struct {
@@ -100,7 +98,7 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 		Created types.DateTime `db:"created"`
 	}{}
 
-	err = am.hub.DB().
+	err = am.app.DB().
 		Select("stats", "created").
 		From("system_stats").
 		Where(dbx.NewExp(
@@ -113,7 +111,7 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 		)).
 		OrderBy("created").
 		All(&systemStats)
-	if err != nil || len(systemStats) == 0 {
+	if err != nil {
 		return err
 	}
 
@@ -121,14 +119,13 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 	oldestRecordTime := systemStats[0].Created.Time()
 	// log.Println("oldestRecordTime", oldestRecordTime.String())
 
-	// Filter validAlerts to keep only those with time newer than oldestRecord
-	filteredAlerts := make([]SystemAlertData, 0, len(validAlerts))
-	for _, alert := range validAlerts {
-		if alert.time.After(oldestRecordTime) {
-			filteredAlerts = append(filteredAlerts, alert)
+	// delete from validAlerts if time is older than oldestRecord
+	for i := range validAlerts {
+		if validAlerts[i].time.Before(oldestRecordTime) {
+			// log.Println("deleting alert - time is older than oldestRecord", validAlerts[i].name, oldestRecordTime, validAlerts[i].time)
+			validAlerts = slices.Delete(validAlerts, i, i+1)
 		}
 	}
-	validAlerts = filteredAlerts
 
 	if len(validAlerts) == 0 {
 		// log.Println("no valid alerts found")
@@ -166,7 +163,7 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 				alert.val += stats.NetSent + stats.NetRecv
 			case "Disk":
 				if alert.mapSums == nil {
-					alert.mapSums = make(map[string]float32, len(data.Stats.ExtraFs)+1)
+					alert.mapSums = make(map[string]float32, len(extraFs)+1)
 				}
 				// add root disk
 				if _, ok := alert.mapSums["root"]; !ok {
@@ -174,7 +171,7 @@ func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *syst
 				}
 				alert.mapSums["root"] += float32(stats.Disk)
 				// add extra disks
-				for key, fs := range data.Stats.ExtraFs {
+				for key, fs := range extraFs {
 					if _, ok := alert.mapSums[key]; !ok {
 						alert.mapSums[key] = 0.0
 					}
@@ -270,12 +267,12 @@ func (am *AlertManager) sendSystemAlert(alert SystemAlertData) {
 	body := fmt.Sprintf("%s averaged %.2f%s for the previous %v %s.", alert.descriptor, alert.val, alert.unit, alert.min, minutesLabel)
 
 	alert.alertRecord.Set("triggered", alert.triggered)
-	if err := am.hub.Save(alert.alertRecord); err != nil {
-		// app.Logger().Error("failed to save alert record", "err", err)
+	if err := am.app.Save(alert.alertRecord); err != nil {
+		// app.Logger().Error("failed to save alert record", "err", err.Error())
 		return
 	}
 	// expand the user relation and send the alert
-	if errs := am.hub.ExpandRecord(alert.alertRecord, []string{"user"}, nil); len(errs) > 0 {
+	if errs := am.app.ExpandRecord(alert.alertRecord, []string{"user"}, nil); len(errs) > 0 {
 		// app.Logger().Error("failed to expand user relation", "errs", errs)
 		return
 	}
@@ -284,7 +281,7 @@ func (am *AlertManager) sendSystemAlert(alert SystemAlertData) {
 			UserID:   user.Id,
 			Title:    subject,
 			Message:  body,
-			Link:     am.hub.MakeLink("system", systemName),
+			Link:     am.app.Settings().Meta.AppURL + "/system/" + url.PathEscape(systemName),
 			LinkText: "View " + systemName,
 		})
 	}

beszel/internal/common/common.go

@@ -1,7 +0,0 @@
-package common
-
-var (
-	DefaultKeyExchanges = []string{"curve25519-sha256"}
-	DefaultMACs         = []string{"hmac-sha2-256-etm@openssh.com"}
-	DefaultCiphers      = []string{"chacha20-poly1305@openssh.com"}
-)

beszel/internal/entities/container/container.go

@@ -27,41 +27,38 @@ type ApiInfo struct {
 
 // Docker container resources from /containers/{id}/stats
 type ApiStats struct {
-	Read        time.Time `json:"read"`               // Time of stats generation
-	NumProcs    uint32    `json:"num_procs,omitzero"` // Windows specific, not populated on Linux.
-	Networks    map[string]NetworkStats
-	CPUStats    CPUStats    `json:"cpu_stats"`
-	MemoryStats MemoryStats `json:"memory_stats"`
-}
+	// Common stats
+	// Read    time.Time `json:"read"`
+	// PreRead time.Time `json:"preread"`
 
-func (s *ApiStats) CalculateCpuPercentLinux(prevCpuUsage [2]uint64) float64 {
-	cpuDelta := s.CPUStats.CPUUsage.TotalUsage - prevCpuUsage[0]
-	systemDelta := s.CPUStats.SystemUsage - prevCpuUsage[1]
-	return float64(cpuDelta) / float64(systemDelta) * 100
-}
+	// Linux specific stats, not populated on Windows.
+	// PidsStats  PidsStats  `json:"pids_stats,omitempty"`
+	// BlkioStats BlkioStats `json:"blkio_stats,omitempty"`
 
-// from: https://github.com/docker/cli/blob/master/cli/command/container/stats_helpers.go#L185
-func (s *ApiStats) CalculateCpuPercentWindows(prevCpuUsage uint64, prevRead time.Time) float64 {
-	// Max number of 100ns intervals between the previous time read and now
-	possIntervals := uint64(s.Read.Sub(prevRead).Nanoseconds())
-	possIntervals /= 100                // Convert to number of 100ns intervals
-	possIntervals *= uint64(s.NumProcs) // Multiple by the number of processors
+	// Windows specific stats, not populated on Linux.
+	// NumProcs uint32 `json:"num_procs"`
+	// StorageStats StorageStats `json:"storage_stats,omitempty"`
+	// Networks request version >=1.21
+	Networks map[string]NetworkStats
 
-	// Intervals used
-	intervalsUsed := s.CPUStats.CPUUsage.TotalUsage - prevCpuUsage
-
-	// Percentage avoiding divide-by-zero
-	if possIntervals > 0 {
-		return float64(intervalsUsed) / float64(possIntervals) * 100.0
-	}
-	return 0.00
+	// Shared stats
+	CPUStats CPUStats `json:"cpu_stats,omitempty"`
+	// PreCPUStats CPUStats    `json:"precpu_stats,omitempty"` // "Pre"="Previous"
+	MemoryStats MemoryStats `json:"memory_stats,omitempty"`
 }
 
 type CPUStats struct {
 	// CPU Usage. Linux and Windows.
 	CPUUsage CPUUsage `json:"cpu_usage"`
+
 	// System Usage. Linux only.
 	SystemUsage uint64 `json:"system_cpu_usage,omitempty"`
+
+	// Online CPUs. Linux only.
+	// OnlineCPUs uint32 `json:"online_cpus,omitempty"`
+
+	// Throttling Data. Linux only.
+	// ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`
 }
 
 type CPUUsage struct {
@@ -69,15 +66,42 @@ type CPUUsage struct {
 	// Units: nanoseconds (Linux)
 	// Units: 100's of nanoseconds (Windows)
 	TotalUsage uint64 `json:"total_usage"`
+
+	// Total CPU time consumed per core (Linux). Not used on Windows.
+	// Units: nanoseconds.
+	// PercpuUsage []uint64 `json:"percpu_usage,omitempty"`
+
+	// Time spent by tasks of the cgroup in kernel mode (Linux).
+	// Time spent by all container processes in kernel mode (Windows).
+	// Units: nanoseconds (Linux).
+	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers.
+	// UsageInKernelmode uint64 `json:"usage_in_kernelmode"`
+
+	// Time spent by tasks of the cgroup in user mode (Linux).
+	// Time spent by all container processes in user mode (Windows).
+	// Units: nanoseconds (Linux).
+	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers
+	// UsageInUsermode uint64 `json:"usage_in_usermode"`
 }
 
 type MemoryStats struct {
 	// current res_counter usage for memory
 	Usage uint64 `json:"usage,omitempty"`
 	// all the stats exported via memory.stat.
-	Stats MemoryStatsStats `json:"stats"`
-	// private working set (Windows only)
-	PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`
+	Stats MemoryStatsStats `json:"stats,omitempty"`
+	// maximum usage ever recorded.
+	// MaxUsage uint64 `json:"max_usage,omitempty"`
+	// TODO(vishh): Export these as stronger types.
+	// number of times memory usage hits limits.
+	// Failcnt uint64 `json:"failcnt,omitempty"`
+	// Limit   uint64 `json:"limit,omitempty"`
+
+	// // committed bytes
+	// Commit uint64 `json:"commitbytes,omitempty"`
+	// // peak committed bytes
+	// CommitPeak uint64 `json:"commitpeakbytes,omitempty"`
+	// // private working set
+	// PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`
 }
 
 type MemoryStatsStats struct {
@@ -95,6 +119,7 @@ type NetworkStats struct {
 type prevNetStats struct {
 	Sent uint64
 	Recv uint64
+	Time time.Time
 }
 
 // Docker container stats
@@ -106,5 +131,4 @@ type Stats struct {
 	NetworkRecv float64      `json:"nr"`
 	PrevCpu     [2]uint64    `json:"-"`
 	PrevNet     prevNetStats `json:"-"`
-	PrevRead    time.Time    `json:"-"`
 }

beszel/internal/entities/smart/smart.go

@@ -1,269 +0,0 @@
-package smart
-
-type SmartInfoForSata struct {
-	JSONFormatVersion []int `json:"json_format_version"`
-	Smartctl         struct {
-		Version      []int  `json:"version"`
-		SvnRevision  string `json:"svn_revision"`
-		PlatformInfo string `json:"platform_info"`
-		BuildInfo    string `json:"build_info"`
-		Argv         []string `json:"argv"`
-		ExitStatus   int    `json:"exit_status"`
-	} `json:"smartctl"`
-	Device struct {
-		Name     string `json:"name"`
-		InfoName string `json:"info_name"`
-		Type     string `json:"type"`
-		Protocol string `json:"protocol"`
-	} `json:"device"`
-	ModelFamily       string `json:"model_family"`
-	ModelName         string `json:"model_name"`
-	SerialNumber      string `json:"serial_number"`
-	Wwn               struct {
-		Naa int `json:"naa"`
-		Oui int `json:"oui"`
-		ID  int `json:"id"`
-	} `json:"wwn"`
-	FirmwareVersion string `json:"firmware_version"`
-	UserCapacity    struct {
-		Blocks uint64 `json:"blocks"`
-		Bytes  uint64 `json:"bytes"`
-	} `json:"user_capacity"`
-	LogicalBlockSize  int `json:"logical_block_size"`
-	PhysicalBlockSize int `json:"physical_block_size"`
-	RotationRate      int `json:"rotation_rate"`
-	FormFactor        struct {
-		AtaValue int    `json:"ata_value"`
-		Name     string `json:"name"`
-	} `json:"form_factor"`
-	Trim struct {
-		Supported bool `json:"supported"`
-	} `json:"trim"`
-	InSmartctlDatabase bool `json:"in_smartctl_database"`
-	AtaVersion         struct {
-		String     string `json:"string"`
-		MajorValue int    `json:"major_value"`
-		MinorValue int    `json:"minor_value"`
-	} `json:"ata_version"`
-	SataVersion struct {
-		String string `json:"string"`
-		Value  int    `json:"value"`
-	} `json:"sata_version"`
-	InterfaceSpeed struct {
-		Max struct {
-			SataValue       int    `json:"sata_value"`
-			String          string `json:"string"`
-			UnitsPerSecond  int    `json:"units_per_second"`
-			BitsPerUnit     int    `json:"bits_per_unit"`
-		} `json:"max"`
-		Current struct {
-			SataValue       int    `json:"sata_value"`
-			String          string `json:"string"`
-			UnitsPerSecond  int    `json:"units_per_second"`
-			BitsPerUnit     int    `json:"bits_per_unit"`
-		} `json:"current"`
-	} `json:"interface_speed"`
-	LocalTime struct {
-		TimeT   int    `json:"time_t"`
-		Asctime string `json:"asctime"`
-	} `json:"local_time"`
-	SmartStatus struct {
-		Passed bool `json:"passed"`
-	} `json:"smart_status"`
-	AtaSmartData struct {
-		OfflineDataCollection struct {
-			Status struct {
-				Value  int    `json:"value"`
-				String string `json:"string"`
-				Passed bool   `json:"passed"`
-			} `json:"status"`
-			CompletionSeconds int `json:"completion_seconds"`
-		} `json:"offline_data_collection"`
-		SelfTest struct {
-			Status struct {
-				Value  int    `json:"value"`
-				String string `json:"string"`
-				Passed bool   `json:"passed"`
-			} `json:"status"`
-			PollingMinutes struct {
-				Short    int `json:"short"`
-				Extended int `json:"extended"`
-			} `json:"polling_minutes"`
-		} `json:"self_test"`
-		Capabilities struct {
-			Values                             []int `json:"values"`
-			ExecOfflineImmediateSupported      bool  `json:"exec_offline_immediate_supported"`
-			OfflineIsAbortedUponNewCmd         bool  `json:"offline_is_aborted_upon_new_cmd"`
-			OfflineSurfaceScanSupported        bool  `json:"offline_surface_scan_supported"`
-			SelfTestsSupported                 bool  `json:"self_tests_supported"`
-			ConveyanceSelfTestSupported        bool  `json:"conveyance_self_test_supported"`
-			SelectiveSelfTestSupported         bool  `json:"selective_self_test_supported"`
-			AttributeAutosaveEnabled           bool  `json:"attribute_autosave_enabled"`
-			ErrorLoggingSupported              bool  `json:"error_logging_supported"`
-			GpLoggingSupported                 bool  `json:"gp_logging_supported"`
-		} `json:"capabilities"`
-	} `json:"ata_smart_data"`
-	AtaSctCapabilities struct {
-		Value                        int  `json:"value"`
-		ErrorRecoveryControlSupported bool `json:"error_recovery_control_supported"`
-		FeatureControlSupported       bool `json:"feature_control_supported"`
-		DataTableSupported            bool `json:"data_table_supported"`
-	} `json:"ata_sct_capabilities"`
-	AtaSmartAttributes struct {
-		Revision int `json:"revision"`
-		Table    []struct {
-			ID         int    `json:"id"`
-			Name       string `json:"name"`
-			Value      int    `json:"value"`
-			Worst      int    `json:"worst"`
-			Thresh     int    `json:"thresh"`
-			WhenFailed string `json:"when_failed"`
-			Flags      struct {
-				Value          int    `json:"value"`
-				String         string `json:"string"`
-				Prefailure     bool   `json:"prefailure"`
-				UpdatedOnline  bool   `json:"updated_online"`
-				Performance    bool   `json:"performance"`
-				ErrorRate      bool   `json:"error_rate"`
-				EventCount     bool   `json:"event_count"`
-				AutoKeep       bool   `json:"auto_keep"`
-			} `json:"flags"`
-			Raw struct {
-				Value  int    `json:"value"`
-				String string `json:"string"`
-			} `json:"raw"`
-		} `json:"table"`
-	} `json:"ata_smart_attributes"`
-	PowerOnTime struct {
-		Hours int `json:"hours"`
-	} `json:"power_on_time"`
-	PowerCycleCount int `json:"power_cycle_count"`
-	Temperature     struct {
-		Current int `json:"current"`
-	} `json:"temperature"`
-	AtaSmartErrorLog struct {
-		Summary struct {
-			Revision int `json:"revision"`
-			Count    int `json:"count"`
-		} `json:"summary"`
-	} `json:"ata_smart_error_log"`
-	AtaSmartSelfTestLog struct {
-		Standard struct {
-			Revision int `json:"revision"`
-			Count    int `json:"count"`
-		} `json:"standard"`
-	} `json:"ata_smart_self_test_log"`
-	AtaSmartSelectiveSelfTestLog struct {
-		Revision               int `json:"revision"`
-		Table                  []struct {
-			LbaMin  int `json:"lba_min"`
-			LbaMax  int `json:"lba_max"`
-			Status  struct {
-				Value  int    `json:"value"`
-				String string `json:"string"`
-			} `json:"status"`
-		} `json:"table"`
-		Flags struct {
-			Value                  int  `json:"value"`
-			RemainderScanEnabled   bool `json:"remainder_scan_enabled"`
-		} `json:"flags"`
-		PowerUpScanResumeMinutes int `json:"power_up_scan_resume_minutes"`
-	} `json:"ata_smart_selective_self_test_log"`
-}
-
-
-type SmartInfoForNvme struct {
-	JSONFormatVersion              [2]int                           `json:"json_format_version"`
-	Smartctl                       struct {
-		Version      [2]int  `json:"version"`
-		SVNRevision  string  `json:"svn_revision"`
-		PlatformInfo string  `json:"platform_info"`
-		BuildInfo    string  `json:"build_info"`
-		Argv         []string `json:"argv"`
-		ExitStatus   int     `json:"exit_status"`
-	} `json:"smartctl"`
-	Device struct {
-		Name     string `json:"name"`
-		InfoName string `json:"info_name"`
-		Type     string `json:"type"`
-		Protocol string `json:"protocol"`
-	} `json:"device"`
-	ModelName               string `json:"model_name"`
-	SerialNumber            string `json:"serial_number"`
-	FirmwareVersion         string `json:"firmware_version"`
-	NVMePCIVendor           struct {
-		ID          int `json:"id"`
-		SubsystemID int `json:"subsystem_id"`
-	} `json:"nvme_pci_vendor"`
-	NVMeIEEEOUIIdentifier   int    `json:"nvme_ieee_oui_identifier"`
-	NVMeTotalCapacity       int    `json:"nvme_total_capacity"`
-	NVMeUnallocatedCapacity int    `json:"nvme_unallocated_capacity"`
-	NVMeControllerID        int    `json:"nvme_controller_id"`
-	NVMeVersion             struct {
-		String string `json:"string"`
-		Value  int    `json:"value"`
-	} `json:"nvme_version"`
-	NVMeNumberOfNamespaces  int `json:"nvme_number_of_namespaces"`
-	NVMeNamespaces          []struct {
-		ID              int `json:"id"`
-		Size            struct {
-			Blocks int `json:"blocks"`
-			Bytes  int `json:"bytes"`
-		} `json:"size"`
-		Capacity      struct {
-			Blocks int `json:"blocks"`
-			Bytes  int `json:"bytes"`
-		} `json:"capacity"`
-		Utilization   struct {
-			Blocks int `json:"blocks"`
-			Bytes  int `json:"bytes"`
-		} `json:"utilization"`
-		FormattedLBASize int `json:"formatted_lba_size"`
-		EUI64           struct {
-			OUI    int `json:"oui"`
-			ExtID  int `json:"ext_id"`
-		} `json:"eui64"`
-	} `json:"nvme_namespaces"`
-	UserCapacity     struct {
-		Blocks uint64 `json:"blocks"`
-		Bytes  uint64 `json:"bytes"`
-	} `json:"user_capacity"`
-	LogicalBlockSize int `json:"logical_block_size"`
-	LocalTime        struct {
-		TimeT  int64  `json:"time_t"`
-		Asctime string `json:"asctime"`
-	} `json:"local_time"`
-	SmartStatus struct {
-		Passed bool `json:"passed"`
-		NVMe   struct {
-			Value int `json:"value"`
-		} `json:"nvme"`
-	} `json:"smart_status"`
-	NVMeSmartHealthInformationLog struct {
-		CriticalWarning           int   `json:"critical_warning"`
-		Temperature               int   `json:"temperature"`
-		AvailableSpare            int   `json:"available_spare"`
-		AvailableSpareThreshold   int   `json:"available_spare_threshold"`
-		PercentageUsed            int   `json:"percentage_used"`
-		DataUnitsRead             int   `json:"data_units_read"`
-		DataUnitsWritten          int   `json:"data_units_written"`
-		HostReads                 int   `json:"host_reads"`
-		HostWrites                int   `json:"host_writes"`
-		ControllerBusyTime        int   `json:"controller_busy_time"`
-		PowerCycles               int   `json:"power_cycles"`
-		PowerOnHours              int   `json:"power_on_hours"`
-		UnsafeShutdowns           int   `json:"unsafe_shutdowns"`
-		MediaErrors               int   `json:"media_errors"`
-		NumErrLogEntries          int   `json:"num_err_log_entries"`
-		WarningTempTime           int   `json:"warning_temp_time"`
-		CriticalCompTime          int   `json:"critical_comp_time"`
-		TemperatureSensors       []int `json:"temperature_sensors"`
-	} `json:"nvme_smart_health_information_log"`
-	Temperature struct {
-		Current int `json:"current"`
-	} `json:"temperature"`
-	PowerCycleCount int `json:"power_cycle_count"`
-	PowerOnTime     struct {
-		Hours int `json:"hours"`
-	} `json:"power_on_time"`
-}

beszel/internal/entities/system/system.go

@@ -1,37 +1,34 @@
 package system
 
-// TODO: this is confusing, make common package with common/types common/helpers etc
-
 import (
 	"beszel/internal/entities/container"
 	"time"
 )
 
 type Stats struct {
-	Cpu            float64              `json:"cpu"`
-	MaxCpu         float64              `json:"cpum,omitempty"`
-	Mem            float64              `json:"m"`
-	MemUsed        float64              `json:"mu"`
-	MemPct         float64              `json:"mp"`
-	MemBuffCache   float64              `json:"mb"`
-	MemZfsArc      float64              `json:"mz,omitempty"` // ZFS ARC memory
-	Swap           float64              `json:"s,omitempty"`
-	SwapUsed       float64              `json:"su,omitempty"`
-	DiskTotal      float64              `json:"d"`
-	DiskUsed       float64              `json:"du"`
-	DiskPct        float64              `json:"dp"`
-	DiskReadPs     float64              `json:"dr"`
-	DiskWritePs    float64              `json:"dw"`
-	MaxDiskReadPs  float64              `json:"drm,omitempty"`
-	MaxDiskWritePs float64              `json:"dwm,omitempty"`
-	NetworkSent    float64              `json:"ns"`
-	NetworkRecv    float64              `json:"nr"`
-	MaxNetworkSent float64              `json:"nsm,omitempty"`
-	MaxNetworkRecv float64              `json:"nrm,omitempty"`
-	Temperatures   map[string]float64   `json:"t,omitempty"`
-	ExtraFs        map[string]*FsStats  `json:"efs,omitempty"`
-	GPUData        map[string]GPUData   `json:"g,omitempty"`
-	SmartData      map[string]SmartData `json:"sm,omitempty"`
+	Cpu            float64             `json:"cpu"`
+	MaxCpu         float64             `json:"cpum,omitempty"`
+	Mem            float64             `json:"m"`
+	MemUsed        float64             `json:"mu"`
+	MemPct         float64             `json:"mp"`
+	MemBuffCache   float64             `json:"mb"`
+	MemZfsArc      float64             `json:"mz,omitempty"` // ZFS ARC memory
+	Swap           float64             `json:"s,omitempty"`
+	SwapUsed       float64             `json:"su,omitempty"`
+	DiskTotal      float64             `json:"d"`
+	DiskUsed       float64             `json:"du"`
+	DiskPct        float64             `json:"dp"`
+	DiskReadPs     float64             `json:"dr"`
+	DiskWritePs    float64             `json:"dw"`
+	MaxDiskReadPs  float64             `json:"drm,omitempty"`
+	MaxDiskWritePs float64             `json:"dwm,omitempty"`
+	NetworkSent    float64             `json:"ns"`
+	NetworkRecv    float64             `json:"nr"`
+	MaxNetworkSent float64             `json:"nsm,omitempty"`
+	MaxNetworkRecv float64             `json:"nrm,omitempty"`
+	Temperatures   map[string]float64  `json:"t,omitempty"`
+	ExtraFs        map[string]*FsStats `json:"efs,omitempty"`
+	GPUData        map[string]GPUData  `json:"g,omitempty"`
 }
 
 type GPUData struct {
@@ -65,40 +62,6 @@ type NetIoStats struct {
 	Name      string
 }
 
-type Os uint8
-
-const (
-	Linux Os = iota
-	Darwin
-	Windows
-	Freebsd
-)
-
-type SmartData struct {
-	ModelFamily     string            `json:"mf,omitempty"`
-	ModelName       string            `json:"mn,omitempty"`
-	SerialNumber    string            `json:"sn,omitempty"`
-	FirmwareVersion string            `json:"fv,omitempty"`
-	Capacity        uint64            `json:"c,omitempty"`
-	SmartStatus     string            `json:"s,omitempty"`
-	DiskName        string            `json:"dn,omitempty"` // something like /dev/sda
-	DiskType        string            `json:"dt,omitempty"`
-	Temperature	    int               `json:"t,omitempty"`
-	Attributes      []*SmartAttribute `json:"a,omitempty"`
-}
-
-type SmartAttribute struct {
-	Id         int    `json:"id,omitempty"`
-	Name       string `json:"n"`
-	Value      int    `json:"v,omitempty"`
-	Worst      int    `json:"w,omitempty"`
-	Threshold  int    `json:"t,omitempty"`
-	RawValue   int    `json:"rv"`
-	RawString  string `json:"rs,omitempty"`
-	Flags      string `json:"f,omitempty"`
-	WhenFailed string `json:"wf,omitempty"`
-}
-
 type Info struct {
 	Hostname      string  `json:"h"`
 	KernelVersion string  `json:"k,omitempty"`
@@ -114,7 +77,6 @@ type Info struct {
 	Podman        bool    `json:"p,omitempty"`
 	GpuPct        float64 `json:"g,omitempty"`
 	DashboardTemp float64 `json:"dt,omitempty"`
-	Os            Os      `json:"os"`
 }
 
 // Final data structure to return to the hub

beszel/internal/hub/config.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strconv"
 
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/apis"
@@ -21,13 +22,12 @@ type Config struct {
 type SystemConfig struct {
 	Name  string   `yaml:"name"`
 	Host  string   `yaml:"host"`
-	Port  uint16   `yaml:"port,omitempty"`
+	Port  uint16   `yaml:"port"`
 	Users []string `yaml:"users"`
 }
 
 // Syncs systems with the config.yml file
-func syncSystemsWithConfig(e *core.ServeEvent) error {
-	h := e.App
+func (h *Hub) syncSystemsWithConfig() error {
 	configPath := filepath.Join(h.DataDir(), "config.yml")
 	configData, err := os.ReadFile(configPath)
 	if err != nil {
@@ -89,16 +89,16 @@ func syncSystemsWithConfig(e *core.ServeEvent) error {
 		return err
 	}
 
-	// Create a map of existing systems
+	// Create a map of existing systems for easy lookup
 	existingSystemsMap := make(map[string]*core.Record)
 	for _, system := range existingSystems {
-		key := system.GetString("name") + system.GetString("host") + system.GetString("port")
+		key := system.GetString("host") + ":" + system.GetString("port")
 		existingSystemsMap[key] = system
 	}
 
 	// Process systems from config
 	for _, sysConfig := range config.Systems {
-		key := sysConfig.Name + sysConfig.Host + cast.ToString(sysConfig.Port)
+		key := sysConfig.Host + ":" + strconv.Itoa(int(sysConfig.Port))
 		if existingSystem, ok := existingSystemsMap[key]; ok {
 			// Update existing system
 			existingSystem.Set("name", sysConfig.Name)

beszel/internal/hub/hub.go

@@ -4,48 +4,67 @@ package hub
 import (
 	"beszel"
 	"beszel/internal/alerts"
-	"beszel/internal/hub/systems"
+	"beszel/internal/entities/system"
 	"beszel/internal/records"
 	"beszel/internal/users"
 	"beszel/site"
+	"context"
 	"crypto/ed25519"
 	"encoding/pem"
 	"fmt"
 	"io/fs"
+	"log"
+	"net"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
 	"os"
-	"path"
 	"strings"
+	"time"
 
+	"github.com/goccy/go-json"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/plugins/migratecmd"
+	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh"
 )
 
 type Hub struct {
-	core.App
-	*alerts.AlertManager
-	um     *users.UserManager
-	rm     *records.RecordManager
-	sm     *systems.SystemManager
-	pubKey string
-	appURL string
+	*pocketbase.PocketBase
+	sshClientConfig *ssh.ClientConfig
+	pubKey          string
+	am              *alerts.AlertManager
+	um              *users.UserManager
+	rm              *records.RecordManager
+	systemStats     *core.Collection
+	containerStats  *core.Collection
+	appURL          string
 }
 
 // NewHub creates a new Hub instance with default configuration
-func NewHub(app core.App) *Hub {
-	hub := &Hub{}
-	hub.App = app
+func NewHub() *Hub {
+	var hub Hub
+	hub.PocketBase = pocketbase.NewWithConfig(pocketbase.Config{
+		DefaultDataDir: beszel.AppName + "_data",
+	})
 
-	hub.AlertManager = alerts.NewAlertManager(hub)
+	hub.RootCmd.Version = beszel.Version
+	hub.RootCmd.Use = beszel.AppName
+	hub.RootCmd.Short = ""
+	// add update command
+	hub.RootCmd.AddCommand(&cobra.Command{
+		Use:   "update",
+		Short: "Update " + beszel.AppName + " to the latest version",
+		Run:   Update,
+	})
+
+	hub.am = alerts.NewAlertManager(hub)
 	hub.um = users.NewUserManager(hub)
 	hub.rm = records.NewRecordManager(hub)
-	hub.sm = systems.NewSystemManager(hub)
 	hub.appURL, _ = GetEnv("APP_URL")
-	return hub
+	return &hub
 }
 
 // GetEnv retrieves an environment variable with a "BESZEL_HUB_" prefix, or falls back to the unprefixed key.
@@ -57,246 +76,509 @@ func GetEnv(key string) (value string, exists bool) {
 	return os.LookupEnv(key)
 }
 
-func (h *Hub) StartHub() error {
-	h.App.OnServe().BindFunc(func(e *core.ServeEvent) error {
-		// initialize settings / collections
-		if err := h.initialize(e); err != nil {
+func (h *Hub) Run() {
+	isDev := os.Getenv("ENV") == "dev"
+
+	// enable auto creation of migration files when making collection changes in the Admin UI
+	migratecmd.MustRegister(h, h.RootCmd, migratecmd.Config{
+		// (the isDev check is to enable it only during development)
+		Automigrate: isDev,
+		Dir:         "../../migrations",
+	})
+
+	// initial setup
+	h.OnServe().BindFunc(func(se *core.ServeEvent) error {
+		// create ssh client config
+		err := h.createSSHClientConfig()
+		if err != nil {
+			log.Fatal(err)
+		}
+		// set general settings
+		settings := h.Settings()
+		// batch requests (for global alerts)
+		settings.Batch.Enabled = true
+		// set URL if BASE_URL env is set
+		if h.appURL != "" {
+			settings.Meta.AppURL = h.appURL
+		}
+		// set auth settings
+		usersCollection, err := h.FindCollectionByNameOrId("users")
+		if err != nil {
+			return err
+		}
+		// disable email auth if DISABLE_PASSWORD_AUTH env var is set
+		disablePasswordAuth, _ := GetEnv("DISABLE_PASSWORD_AUTH")
+		usersCollection.PasswordAuth.Enabled = disablePasswordAuth != "true"
+		usersCollection.PasswordAuth.IdentityFields = []string{"email"}
+		// disable oauth if no providers are configured (todo: remove this in post 0.9.0 release)
+		if usersCollection.OAuth2.Enabled {
+			usersCollection.OAuth2.Enabled = len(usersCollection.OAuth2.Providers) > 0
+		}
+		// allow oauth user creation if USER_CREATION is set
+		if userCreation, _ := GetEnv("USER_CREATION"); userCreation == "true" {
+			cr := "@request.context = 'oauth2'"
+			usersCollection.CreateRule = &cr
+		} else {
+			usersCollection.CreateRule = nil
+		}
+		if err := h.Save(usersCollection); err != nil {
 			return err
 		}
 		// sync systems with config
-		if err := syncSystemsWithConfig(e); err != nil {
-			return err
+		h.syncSystemsWithConfig()
+		return se.Next()
+	})
+
+	// serve web ui
+	h.OnServe().BindFunc(func(se *core.ServeEvent) error {
+		switch isDev {
+		case true:
+			proxy := httputil.NewSingleHostReverseProxy(&url.URL{
+				Scheme: "http",
+				Host:   "localhost:5173",
+			})
+			se.Router.GET("/{path...}", func(e *core.RequestEvent) error {
+				proxy.ServeHTTP(e.Response, e.Request)
+				return nil
+			})
+		default:
+			// parse app url
+			parsedURL, err := url.Parse(h.appURL)
+			if err != nil {
+				return err
+			}
+			// fix base paths in html if using subpath
+			basePath := strings.TrimSuffix(parsedURL.Path, "/") + "/"
+			indexFile, _ := fs.ReadFile(site.DistDirFS, "index.html")
+			indexContent := strings.ReplaceAll(string(indexFile), "./", basePath)
+			// set up static asset serving
+			staticPaths := [2]string{"/static/", "/assets/"}
+			serveStatic := apis.Static(site.DistDirFS, false)
+			// get CSP configuration
+			csp, cspExists := GetEnv("CSP")
+			// add route
+			se.Router.GET("/{path...}", func(e *core.RequestEvent) error {
+				// serve static assets if path is in staticPaths
+				for i := range staticPaths {
+					if strings.Contains(e.Request.URL.Path, staticPaths[i]) {
+						e.Response.Header().Set("Cache-Control", "public, max-age=2592000")
+						return serveStatic(e)
+					}
+				}
+				if cspExists {
+					e.Response.Header().Del("X-Frame-Options")
+					e.Response.Header().Set("Content-Security-Policy", csp)
+				}
+				return e.HTML(http.StatusOK, indexContent)
+			})
 		}
-		// register api routes
-		if err := h.registerApiRoutes(e); err != nil {
-			return err
+		return se.Next()
+	})
+
+	// set up scheduled jobs / ticker for system updates
+	h.OnServe().BindFunc(func(se *core.ServeEvent) error {
+		// 15 second ticker for system updates
+		go h.startSystemUpdateTicker()
+		// set up cron jobs
+		// delete old records once every hour
+		h.Cron().MustAdd("delete old records", "8 * * * *", h.rm.DeleteOldRecords)
+		// create longer records every 10 minutes
+		h.Cron().MustAdd("create longer records", "*/10 * * * *", func() {
+			if systemStats, containerStats, err := h.getCollections(); err == nil {
+				h.rm.CreateLongerRecords([]*core.Collection{systemStats, containerStats})
+			}
+		})
+		return se.Next()
+	})
+
+	// custom api routes
+	h.OnServe().BindFunc(func(se *core.ServeEvent) error {
+		// returns public key
+		se.Router.GET("/api/beszel/getkey", func(e *core.RequestEvent) error {
+			info, _ := e.RequestInfo()
+			if info.Auth == nil {
+				return apis.NewForbiddenError("Forbidden", nil)
+			}
+			return e.JSON(http.StatusOK, map[string]string{"key": h.pubKey, "v": beszel.Version})
+		})
+		// check if first time setup on login page
+		se.Router.GET("/api/beszel/first-run", func(e *core.RequestEvent) error {
+			total, err := h.CountRecords("users")
+			return e.JSON(http.StatusOK, map[string]bool{"firstRun": err == nil && total == 0})
+		})
+		// send test notification
+		se.Router.GET("/api/beszel/send-test-notification", h.am.SendTestNotification)
+		// API endpoint to get config.yml content
+		se.Router.GET("/api/beszel/config-yaml", h.getYamlConfig)
+		// create first user endpoint only needed if no users exist
+		if totalUsers, _ := h.CountRecords("users"); totalUsers == 0 {
+			se.Router.POST("/api/beszel/create-user", h.um.CreateFirstUser)
 		}
-		// register cron jobs
-		if err := h.registerCronJobs(e); err != nil {
-			return err
-		}
-		// start server
-		if err := h.startServer(e); err != nil {
-			return err
-		}
-		// start system updates
-		if err := h.sm.Initialize(); err != nil {
-			return err
+		return se.Next()
+	})
+
+	// system creation defaults
+	h.OnRecordCreate("systems").BindFunc(func(e *core.RecordEvent) error {
+		e.Record.Set("info", system.Info{})
+		e.Record.Set("status", "pending")
+		return e.Next()
+	})
+
+	// immediately create connection for new systems
+	h.OnRecordAfterCreateSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
+		go h.updateSystem(e.Record)
+		return e.Next()
+	})
+
+	// handle default values for user / user_settings creation
+	h.OnRecordCreate("users").BindFunc(h.um.InitializeUserRole)
+	h.OnRecordCreate("user_settings").BindFunc(h.um.InitializeUserSettings)
+
+	// empty info for systems that are paused
+	h.OnRecordUpdate("systems").BindFunc(func(e *core.RecordEvent) error {
+		if e.Record.GetString("status") == "paused" {
+			e.Record.Set("info", system.Info{})
 		}
 		return e.Next()
 	})
 
-	// TODO: move to users package
-	// handle default values for user / user_settings creation
-	h.App.OnRecordCreate("users").BindFunc(h.um.InitializeUserRole)
-	h.App.OnRecordCreate("user_settings").BindFunc(h.um.InitializeUserSettings)
+	// do things after a systems record is updated
+	h.OnRecordAfterUpdateSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
+		newRecord := e.Record.Fresh()
+		oldRecord := newRecord.Original()
+		newStatus := newRecord.GetString("status")
 
-	if pb, ok := h.App.(*pocketbase.PocketBase); ok {
-		// log.Println("Starting pocketbase")
-		err := pb.Start()
-		if err != nil {
-			return err
+		// if system is not up and connection exists, remove it
+		if newStatus != "up" {
+			h.deleteSystemConnection(newRecord)
 		}
-	}
 
-	return nil
+		// if system is set to pending (unpause), try to connect immediately
+		if newStatus == "pending" {
+			go h.updateSystem(newRecord)
+		} else {
+			h.am.HandleStatusAlerts(newStatus, oldRecord)
+		}
+		return e.Next()
+	})
+
+	// if system is deleted, close connection
+	h.OnRecordAfterDeleteSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
+		h.deleteSystemConnection(e.Record)
+		return e.Next()
+	})
+
+	if err := h.Start(); err != nil {
+		log.Fatal(err)
+	}
 }
 
-// initialize sets up initial configuration (collections, settings, etc.)
-func (h *Hub) initialize(e *core.ServeEvent) error {
-	// set general settings
-	settings := e.App.Settings()
-	// batch requests (for global alerts)
-	settings.Batch.Enabled = true
-	// set URL if BASE_URL env is set
-	if h.appURL != "" {
-		settings.Meta.AppURL = h.appURL
+func (h *Hub) startSystemUpdateTicker() {
+	c := time.Tick(15 * time.Second)
+	for range c {
+		h.updateSystems()
 	}
-	// set auth settings
-	usersCollection, err := e.App.FindCollectionByNameOrId("users")
-	if err != nil {
-		return err
+}
+
+func (h *Hub) updateSystems() {
+	records, err := h.FindRecordsByFilter(
+		"2hz5ncl8tizk5nx",    // systems collection
+		"status != 'paused'", // filter
+		"updated",            // sort
+		-1,                   // limit
+		0,                    // offset
+	)
+	// log.Println("records", len(records))
+	if err != nil || len(records) == 0 {
+		// h.Logger().Error("Failed to query systems")
+		return
 	}
-	// disable email auth if DISABLE_PASSWORD_AUTH env var is set
-	disablePasswordAuth, _ := GetEnv("DISABLE_PASSWORD_AUTH")
-	usersCollection.PasswordAuth.Enabled = disablePasswordAuth != "true"
-	usersCollection.PasswordAuth.IdentityFields = []string{"email"}
-	// disable oauth if no providers are configured (todo: remove this in post 0.9.0 release)
-	if usersCollection.OAuth2.Enabled {
-		usersCollection.OAuth2.Enabled = len(usersCollection.OAuth2.Providers) > 0
+	fiftySecondsAgo := time.Now().UTC().Add(-50 * time.Second)
+	batchSize := len(records)/4 + 1
+	done := 0
+	for _, record := range records {
+		// break if batch size reached or if the system was updated less than 50 seconds ago
+		if done >= batchSize || record.GetDateTime("updated").Time().After(fiftySecondsAgo) {
+			break
+		}
+		// don't increment for down systems to avoid them jamming the queue
+		// because they're always first when sorted by least recently updated
+		if record.GetString("status") != "down" {
+			done++
+		}
+		go h.updateSystem(record)
 	}
-	// allow oauth user creation if USER_CREATION is set
-	if userCreation, _ := GetEnv("USER_CREATION"); userCreation == "true" {
-		cr := "@request.context = 'oauth2'"
-		usersCollection.CreateRule = &cr
+}
+
+func (h *Hub) updateSystem(record *core.Record) {
+	var client *ssh.Client
+	var err error
+
+	// check if system connection exists
+	if existingClient, ok := h.Store().GetOk(record.Id); ok {
+		client = existingClient.(*ssh.Client)
 	} else {
-		usersCollection.CreateRule = nil
+		// create system connection
+		client, err = h.createSystemConnection(record)
+		if err != nil {
+			if record.GetString("status") != "down" {
+				h.Logger().Error("Failed to connect:", "err", err.Error(), "system", record.GetString("host"), "port", record.GetString("port"))
+				h.updateSystemStatus(record, "down")
+			}
+			return
+		}
+		h.Store().Set(record.Id, client)
 	}
-	if err := e.App.Save(usersCollection); err != nil {
+	// get system stats from agent
+	var systemData system.CombinedData
+	if err := h.requestJsonFromAgent(client, &systemData); err != nil {
+		if err.Error() == "bad client" {
+			// if previous connection was closed, try again
+			h.Logger().Error("Existing SSH connection closed. Retrying...", "host", record.GetString("host"), "port", record.GetString("port"))
+			h.deleteSystemConnection(record)
+			time.Sleep(time.Millisecond * 100)
+			h.updateSystem(record)
+			return
+		}
+		h.Logger().Error("Failed to get system stats: ", "err", err.Error())
+		h.updateSystemStatus(record, "down")
+		return
+	}
+	// update system record
+	record.Set("status", "up")
+	record.Set("info", systemData.Info)
+	if err := h.SaveNoValidate(record); err != nil {
+		h.Logger().Error("Failed to update record: ", "err", err.Error())
+	}
+	// add system_stats and container_stats records
+	if systemStats, containerStats, err := h.getCollections(); err != nil {
+		h.Logger().Error("Failed to get collections: ", "err", err.Error())
+	} else {
+		// add new system_stats record
+		systemStatsRecord := core.NewRecord(systemStats)
+		systemStatsRecord.Set("system", record.Id)
+		systemStatsRecord.Set("stats", systemData.Stats)
+		systemStatsRecord.Set("type", "1m")
+		if err := h.SaveNoValidate(systemStatsRecord); err != nil {
+			h.Logger().Error("Failed to save record: ", "err", err.Error())
+		}
+		// add new container_stats record
+		if len(systemData.Containers) > 0 {
+			containerStatsRecord := core.NewRecord(containerStats)
+			containerStatsRecord.Set("system", record.Id)
+			containerStatsRecord.Set("stats", systemData.Containers)
+			containerStatsRecord.Set("type", "1m")
+			if err := h.SaveNoValidate(containerStatsRecord); err != nil {
+				h.Logger().Error("Failed to save record: ", "err", err.Error())
+			}
+		}
+	}
+
+	// system info alerts
+	if err := h.am.HandleSystemAlerts(record, systemData.Info, systemData.Stats.Temperatures, systemData.Stats.ExtraFs); err != nil {
+		h.Logger().Error("System alerts error", "err", err.Error())
+	}
+}
+
+// return system_stats and container_stats collections
+func (h *Hub) getCollections() (*core.Collection, *core.Collection, error) {
+	if h.systemStats == nil {
+		systemStats, err := h.FindCollectionByNameOrId("system_stats")
+		if err != nil {
+			return nil, nil, err
+		}
+		h.systemStats = systemStats
+	}
+	if h.containerStats == nil {
+		containerStats, err := h.FindCollectionByNameOrId("container_stats")
+		if err != nil {
+			return nil, nil, err
+		}
+		h.containerStats = containerStats
+	}
+	return h.systemStats, h.containerStats, nil
+}
+
+// set system to specified status and save record
+func (h *Hub) updateSystemStatus(record *core.Record, status string) {
+	if record.Fresh().GetString("status") != status {
+		record.Set("status", status)
+		if err := h.SaveNoValidate(record); err != nil {
+			h.Logger().Error("Failed to update record: ", "err", err.Error())
+		}
+	}
+}
+
+// delete system connection from map and close connection
+func (h *Hub) deleteSystemConnection(record *core.Record) {
+	if client, ok := h.Store().GetOk(record.Id); ok {
+		if sshClient := client.(*ssh.Client); sshClient != nil {
+			sshClient.Close()
+		}
+		h.Store().Remove(record.Id)
+	}
+}
+
+func (h *Hub) createSystemConnection(record *core.Record) (*ssh.Client, error) {
+	network := "tcp"
+	host := record.GetString("host")
+	if strings.HasPrefix(host, "/") {
+		network = "unix"
+	} else {
+		host = net.JoinHostPort(host, record.GetString("port"))
+	}
+	client, err := ssh.Dial(network, host, h.sshClientConfig)
+	if err != nil {
+		return nil, err
+	}
+	return client, nil
+}
+
+func (h *Hub) createSSHClientConfig() error {
+	key, err := h.getSSHKey()
+	if err != nil {
+		h.Logger().Error("Failed to get SSH key: ", "err", err.Error())
 		return err
 	}
-	// allow all users to access systems if SHARE_ALL_SYSTEMS is set
-	systemsCollection, err := e.App.FindCachedCollectionByNameOrId("systems")
+
+	// Create the Signer for this private key.
+	signer, err := ssh.ParsePrivateKey(key)
 	if err != nil {
 		return err
 	}
-	shareAllSystems, _ := GetEnv("SHARE_ALL_SYSTEMS")
-	systemsReadRule := "@request.auth.id != \"\""
-	if shareAllSystems != "true" {
-		// default is to only show systems that the user id is assigned to
-		systemsReadRule += " && users.id ?= @request.auth.id"
+
+	h.sshClientConfig = &ssh.ClientConfig{
+		User: "u",
+		Auth: []ssh.AuthMethod{
+			ssh.PublicKeys(signer),
+		},
+		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+		Timeout:         4 * time.Second,
 	}
-	updateDeleteRule := systemsReadRule + " && @request.auth.role != \"readonly\""
-	systemsCollection.ListRule = &systemsReadRule
-	systemsCollection.ViewRule = &systemsReadRule
-	systemsCollection.UpdateRule = &updateDeleteRule
-	systemsCollection.DeleteRule = &updateDeleteRule
-	if err := e.App.Save(systemsCollection); err != nil {
+	return nil
+}
+
+// Fetches system stats from the agent and decodes the json data into the provided struct
+func (h *Hub) requestJsonFromAgent(client *ssh.Client, systemData *system.CombinedData) error {
+	session, err := newSessionWithTimeout(client, 4*time.Second)
+	if err != nil {
+		return fmt.Errorf("bad client")
+	}
+	defer session.Close()
+
+	stdout, err := session.StdoutPipe()
+	if err != nil {
 		return err
 	}
-	return nil
-}
 
-// startServer sets up the server for Beszel
-func (h *Hub) startServer(se *core.ServeEvent) error {
-	// TODO: exclude dev server from production binary
-	switch h.IsDev() {
-	case true:
-		proxy := httputil.NewSingleHostReverseProxy(&url.URL{
-			Scheme: "http",
-			Host:   "localhost:5173",
-		})
-		se.Router.GET("/{path...}", func(e *core.RequestEvent) error {
-			proxy.ServeHTTP(e.Response, e.Request)
-			return nil
-		})
-	default:
-		// parse app url
-		parsedURL, err := url.Parse(h.appURL)
-		if err != nil {
-			return err
-		}
-		// fix base paths in html if using subpath
-		basePath := strings.TrimSuffix(parsedURL.Path, "/") + "/"
-		indexFile, _ := fs.ReadFile(site.DistDirFS, "index.html")
-		indexContent := strings.ReplaceAll(string(indexFile), "./", basePath)
-		indexContent = strings.Replace(indexContent, "{{V}}", beszel.Version, 1)
-		// set up static asset serving
-		staticPaths := [2]string{"/static/", "/assets/"}
-		serveStatic := apis.Static(site.DistDirFS, false)
-		// get CSP configuration
-		csp, cspExists := GetEnv("CSP")
-		// add route
-		se.Router.GET("/{path...}", func(e *core.RequestEvent) error {
-			// serve static assets if path is in staticPaths
-			for i := range staticPaths {
-				if strings.Contains(e.Request.URL.Path, staticPaths[i]) {
-					e.Response.Header().Set("Cache-Control", "public, max-age=2592000")
-					return serveStatic(e)
-				}
-			}
-			if cspExists {
-				e.Response.Header().Del("X-Frame-Options")
-				e.Response.Header().Set("Content-Security-Policy", csp)
-			}
-			return e.HTML(http.StatusOK, indexContent)
-		})
+	if err := session.Shell(); err != nil {
+		return err
 	}
-	return nil
-}
 
-// registerCronJobs sets up scheduled tasks
-func (h *Hub) registerCronJobs(_ *core.ServeEvent) error {
-	// delete old records once every hour
-	h.Cron().MustAdd("delete old records", "8 * * * *", h.rm.DeleteOldRecords)
-	// create longer records every 10 minutes
-	h.Cron().MustAdd("create longer records", "*/10 * * * *", h.rm.CreateLongerRecords)
-	return nil
-}
-
-// custom api routes
-func (h *Hub) registerApiRoutes(se *core.ServeEvent) error {
-	// returns public key and version
-	se.Router.GET("/api/beszel/getkey", func(e *core.RequestEvent) error {
-		info, _ := e.RequestInfo()
-		if info.Auth == nil {
-			return apis.NewForbiddenError("Forbidden", nil)
-		}
-		return e.JSON(http.StatusOK, map[string]string{"key": h.pubKey, "v": beszel.Version})
-	})
-	// check if first time setup on login page
-	se.Router.GET("/api/beszel/first-run", func(e *core.RequestEvent) error {
-		total, err := h.CountRecords("users")
-		return e.JSON(http.StatusOK, map[string]bool{"firstRun": err == nil && total == 0})
-	})
-	// send test notification
-	se.Router.GET("/api/beszel/send-test-notification", h.SendTestNotification)
-	// API endpoint to get config.yml content
-	se.Router.GET("/api/beszel/config-yaml", h.getYamlConfig)
-	// create first user endpoint only needed if no users exist
-	if totalUsers, _ := h.CountRecords("users"); totalUsers == 0 {
-		se.Router.POST("/api/beszel/create-user", h.um.CreateFirstUser)
+	if err := json.NewDecoder(stdout).Decode(systemData); err != nil {
+		return err
 	}
+
+	// wait for the session to complete
+	if err := session.Wait(); err != nil {
+		return err
+	}
+
 	return nil
 }
 
-// generates key pair if it doesn't exist and returns signer
-func (h *Hub) GetSSHKey(dataDir string) (ssh.Signer, error) {
-	privateKeyPath := path.Join(dataDir, "id_ed25519")
+// Adds timeout to SSH session creation to avoid hanging in case of network issues
+func newSessionWithTimeout(client *ssh.Client, timeout time.Duration) (*ssh.Session, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
 
+	// use goroutine to create the session
+	sessionChan := make(chan *ssh.Session, 1)
+	errChan := make(chan error, 1)
+	go func() {
+		if session, err := client.NewSession(); err != nil {
+			errChan <- err
+		} else {
+			sessionChan <- session
+		}
+	}()
+
+	select {
+	case session := <-sessionChan:
+		return session, nil
+	case err := <-errChan:
+		return nil, err
+	case <-ctx.Done():
+		return nil, fmt.Errorf("session creation timed out")
+	}
+}
+
+func (h *Hub) getSSHKey() ([]byte, error) {
+	dataDir := h.DataDir()
 	// check if the key pair already exists
-	existingKey, err := os.ReadFile(privateKeyPath)
+	existingKey, err := os.ReadFile(dataDir + "/id_ed25519")
 	if err == nil {
-		private, err := ssh.ParsePrivateKey(existingKey)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse private key: %s", err)
+		if pubKey, err := os.ReadFile(h.DataDir() + "/id_ed25519.pub"); err == nil {
+			h.pubKey = strings.TrimSuffix(string(pubKey), "\n")
 		}
-		pubKeyBytes := ssh.MarshalAuthorizedKey(private.PublicKey())
-		h.pubKey = strings.TrimSuffix(string(pubKeyBytes), "\n")
-		return private, nil
-	} else if !os.IsNotExist(err) {
-		// File exists but couldn't be read for some other reason
-		return nil, fmt.Errorf("failed to read %s: %w", privateKeyPath, err)
+		// return existing private key
+		return existingKey, nil
 	}
 
 	// Generate the Ed25519 key pair
 	pubKey, privKey, err := ed25519.GenerateKey(nil)
 	if err != nil {
+		// h.Logger().Error("Error generating key pair:", "err", err.Error())
 		return nil, err
 	}
 
 	// Get the private key in OpenSSH format
-	privKeyPem, err := ssh.MarshalPrivateKey(privKey, "")
+	privKeyBytes, err := ssh.MarshalPrivateKey(privKey, "")
+	if err != nil {
+		// h.Logger().Error("Error marshaling private key:", "err", err.Error())
+		return nil, err
+	}
+
+	// Save the private key to a file
+	privateFile, err := os.Create(dataDir + "/id_ed25519")
+	if err != nil {
+		// h.Logger().Error("Error creating private key file:", "err", err.Error())
+		return nil, err
+	}
+	defer privateFile.Close()
+
+	if err := pem.Encode(privateFile, privKeyBytes); err != nil {
+		// h.Logger().Error("Error writing private key to file:", "err", err.Error())
+		return nil, err
+	}
+
+	// Generate the public key in OpenSSH format
+	publicKey, err := ssh.NewPublicKey(pubKey)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := os.WriteFile(privateKeyPath, pem.EncodeToMemory(privKeyPem), 0600); err != nil {
-		return nil, fmt.Errorf("failed to write private key to %q: err: %w", privateKeyPath, err)
-	}
-
-	// These are fine to ignore the errors on, as we've literally just created a crypto.PublicKey | crypto.Signer
-	sshPubKey, _ := ssh.NewPublicKey(pubKey)
-	sshPrivate, _ := ssh.NewSignerFromSigner(privKey)
-
-	pubKeyBytes := ssh.MarshalAuthorizedKey(sshPubKey)
+	pubKeyBytes := ssh.MarshalAuthorizedKey(publicKey)
 	h.pubKey = strings.TrimSuffix(string(pubKeyBytes), "\n")
 
-	h.Logger().Info("ed25519 SSH key pair generated successfully.")
-	h.Logger().Info("Saved to: " + privateKeyPath)
-
-	return sshPrivate, err
-}
-
-// MakeLink formats a link with the app URL and path segments.
-// Only path segments should be provided.
-func (h *Hub) MakeLink(parts ...string) string {
-	base := strings.TrimSuffix(h.Settings().Meta.AppURL, "/")
-	for _, part := range parts {
-		if part == "" {
-			continue
-		}
-		base = fmt.Sprintf("%s/%s", base, url.PathEscape(part))
+	// Save the public key to a file
+	publicFile, err := os.Create(dataDir + "/id_ed25519.pub")
+	if err != nil {
+		return nil, err
 	}
-	return base
+	defer publicFile.Close()
+
+	if _, err := publicFile.Write(pubKeyBytes); err != nil {
+		return nil, err
+	}
+
+	h.Logger().Info("ed25519 SSH key pair generated successfully.")
+	h.Logger().Info("Private key saved to: " + dataDir + "/id_ed25519")
+	h.Logger().Info("Public key saved to: " + dataDir + "/id_ed25519.pub")
+
+	existingKey, err = os.ReadFile(dataDir + "/id_ed25519")
+	if err == nil {
+		return existingKey, nil
+	}
+	return nil, err
 }

beszel/internal/hub/hub_test.go

@@ -1,257 +0,0 @@
-//go:build testing
-// +build testing
-
-package hub
-
-import (
-	"testing"
-
-	"crypto/ed25519"
-	"encoding/pem"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/pocketbase/pocketbase"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/ssh"
-)
-
-func getTestHub() *Hub {
-	app := pocketbase.New()
-	return NewHub(app)
-}
-
-func TestMakeLink(t *testing.T) {
-	hub := getTestHub()
-
-	tests := []struct {
-		name     string
-		appURL   string
-		parts    []string
-		expected string
-	}{
-		{
-			name:     "no parts, no trailing slash in AppURL",
-			appURL:   "http://localhost:8090",
-			parts:    []string{},
-			expected: "http://localhost:8090",
-		},
-		{
-			name:     "no parts, with trailing slash in AppURL",
-			appURL:   "http://localhost:8090/",
-			parts:    []string{},
-			expected: "http://localhost:8090", // TrimSuffix should handle the trailing slash
-		},
-		{
-			name:     "one part",
-			appURL:   "http://example.com",
-			parts:    []string{"one"},
-			expected: "http://example.com/one",
-		},
-		{
-			name:     "multiple parts",
-			appURL:   "http://example.com",
-			parts:    []string{"alpha", "beta", "gamma"},
-			expected: "http://example.com/alpha/beta/gamma",
-		},
-		{
-			name:     "parts with spaces needing escaping",
-			appURL:   "http://example.com",
-			parts:    []string{"path with spaces", "another part"},
-			expected: "http://example.com/path%20with%20spaces/another%20part",
-		},
-		{
-			name:     "parts with slashes needing escaping",
-			appURL:   "http://example.com",
-			parts:    []string{"a/b", "c"},
-			expected: "http://example.com/a%2Fb/c", // url.PathEscape escapes '/'
-		},
-		{
-			name:     "AppURL with subpath, no trailing slash",
-			appURL:   "http://localhost/sub",
-			parts:    []string{"resource"},
-			expected: "http://localhost/sub/resource",
-		},
-		{
-			name:     "AppURL with subpath, with trailing slash",
-			appURL:   "http://localhost/sub/",
-			parts:    []string{"item"},
-			expected: "http://localhost/sub/item",
-		},
-		{
-			name:     "empty parts in the middle",
-			appURL:   "http://localhost",
-			parts:    []string{"first", "", "third"},
-			expected: "http://localhost/first/third",
-		},
-		{
-			name:     "leading and trailing empty parts",
-			appURL:   "http://localhost",
-			parts:    []string{"", "path", ""},
-			expected: "http://localhost/path",
-		},
-		{
-			name:     "parts with various special characters",
-			appURL:   "https://test.dev/",
-			parts:    []string{"p@th?", "key=value&"},
-			expected: "https://test.dev/p@th%3F/key=value&",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Store original app URL and restore it after the test
-			originalAppURL := hub.Settings().Meta.AppURL
-			hub.Settings().Meta.AppURL = tt.appURL
-			defer func() { hub.Settings().Meta.AppURL = originalAppURL }()
-
-			got := hub.MakeLink(tt.parts...)
-			assert.Equal(t, tt.expected, got, "MakeLink generated URL does not match expected")
-		})
-	}
-}
-
-func TestGetSSHKey(t *testing.T) {
-	hub := getTestHub()
-
-	// Test Case 1: Key generation (no existing key)
-	t.Run("KeyGeneration", func(t *testing.T) {
-		tempDir := t.TempDir()
-
-		// Ensure pubKey is initially empty or different to ensure GetSSHKey sets it
-		hub.pubKey = ""
-
-		signer, err := hub.GetSSHKey(tempDir)
-		assert.NoError(t, err, "GetSSHKey should not error when generating a new key")
-		assert.NotNil(t, signer, "GetSSHKey should return a non-nil signer")
-
-		// Check if private key file was created
-		privateKeyPath := filepath.Join(tempDir, "id_ed25519")
-		info, err := os.Stat(privateKeyPath)
-		assert.NoError(t, err, "Private key file should be created")
-		assert.False(t, info.IsDir(), "Private key path should be a file, not a directory")
-
-		// Check if h.pubKey was set
-		assert.NotEmpty(t, hub.pubKey, "h.pubKey should be set after key generation")
-		assert.True(t, strings.HasPrefix(hub.pubKey, "ssh-ed25519 "), "h.pubKey should start with 'ssh-ed25519 '")
-
-		// Verify the generated private key is parsable
-		keyData, err := os.ReadFile(privateKeyPath)
-		require.NoError(t, err)
-		_, err = ssh.ParsePrivateKey(keyData)
-		assert.NoError(t, err, "Generated private key should be parsable by ssh.ParsePrivateKey")
-	})
-
-	// Test Case 2: Existing key
-	t.Run("ExistingKey", func(t *testing.T) {
-		tempDir := t.TempDir()
-
-		// Manually create a valid key pair for the test
-		rawPubKey, rawPrivKey, err := ed25519.GenerateKey(nil)
-		require.NoError(t, err, "Failed to generate raw ed25519 key pair for pre-existing key test")
-
-		// Marshal the private key into OpenSSH PEM format
-		pemBlock, err := ssh.MarshalPrivateKey(rawPrivKey, "")
-		require.NoError(t, err, "Failed to marshal private key to PEM block for pre-existing key test")
-
-		privateKeyBytes := pem.EncodeToMemory(pemBlock)
-		require.NotNil(t, privateKeyBytes, "PEM encoded private key bytes should not be nil")
-
-		privateKeyPath := filepath.Join(tempDir, "id_ed25519")
-		err = os.WriteFile(privateKeyPath, privateKeyBytes, 0600)
-		require.NoError(t, err, "Failed to write pre-existing private key")
-
-		// Determine the expected public key string
-		sshPubKey, err := ssh.NewPublicKey(rawPubKey)
-		require.NoError(t, err)
-		expectedPubKeyStr := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(sshPubKey)))
-
-		// Reset h.pubKey to ensure it's set by GetSSHKey from the file
-		hub.pubKey = ""
-
-		signer, err := hub.GetSSHKey(tempDir)
-		assert.NoError(t, err, "GetSSHKey should not error when reading an existing key")
-		assert.NotNil(t, signer, "GetSSHKey should return a non-nil signer for an existing key")
-
-		// Check if h.pubKey was set correctly to the public key from the file
-		assert.Equal(t, expectedPubKeyStr, hub.pubKey, "h.pubKey should match the existing public key")
-
-		// Verify the signer's public key matches the original public key
-		signerPubKey := signer.PublicKey()
-		marshaledSignerPubKey := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(signerPubKey)))
-		assert.Equal(t, expectedPubKeyStr, marshaledSignerPubKey, "Signer's public key should match the existing public key")
-	})
-
-	// Test Case 3: Error cases
-	t.Run("ErrorCases", func(t *testing.T) {
-		tests := []struct {
-			name       string
-			setupFunc  func(dir string) error
-			errorCheck func(t *testing.T, err error)
-		}{
-			{
-				name: "CorruptedKey",
-				setupFunc: func(dir string) error {
-					return os.WriteFile(filepath.Join(dir, "id_ed25519"), []byte("this is not a valid SSH key"), 0600)
-				},
-				errorCheck: func(t *testing.T, err error) {
-					assert.Error(t, err)
-					assert.Contains(t, err.Error(), "ssh: no key found")
-				},
-			},
-			{
-				name: "PermissionDenied",
-				setupFunc: func(dir string) error {
-					// Create the key file
-					keyPath := filepath.Join(dir, "id_ed25519")
-					if err := os.WriteFile(keyPath, []byte("dummy content"), 0600); err != nil {
-						return err
-					}
-					// Make it read-only (can't be opened for writing in case a new key needs to be written)
-					return os.Chmod(keyPath, 0400)
-				},
-				errorCheck: func(t *testing.T, err error) {
-					// On read-only key, the parser will attempt to parse it and fail with "ssh: no key found"
-					assert.Error(t, err)
-				},
-			},
-			{
-				name: "EmptyFile",
-				setupFunc: func(dir string) error {
-					// Create an empty file
-					return os.WriteFile(filepath.Join(dir, "id_ed25519"), []byte{}, 0600)
-				},
-				errorCheck: func(t *testing.T, err error) {
-					assert.Error(t, err)
-					// The error from attempting to parse an empty file
-					assert.Contains(t, err.Error(), "ssh: no key found")
-				},
-			},
-		}
-
-		for _, tc := range tests {
-			t.Run(tc.name, func(t *testing.T) {
-				tempDir := t.TempDir()
-
-				// Setup the test case
-				err := tc.setupFunc(tempDir)
-				require.NoError(t, err, "Setup failed")
-
-				// Reset h.pubKey before each test case
-				hub.pubKey = ""
-
-				// Attempt to get SSH key
-				_, err = hub.GetSSHKey(tempDir)
-
-				// Verify the error
-				tc.errorCheck(t, err)
-
-				// Check that pubKey was not set in error cases
-				assert.Empty(t, hub.pubKey, "h.pubKey should not be set if there was an error")
-			})
-		}
-	})
-}

beszel/internal/hub/systems/systems.go

@@ -1,457 +0,0 @@
-package systems
-
-import (
-	"beszel/internal/common"
-	"beszel/internal/entities/system"
-	"context"
-	"fmt"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/goccy/go-json"
-	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tools/store"
-	"golang.org/x/crypto/ssh"
-)
-
-const (
-	up      string = "up"
-	down    string = "down"
-	paused  string = "paused"
-	pending string = "pending"
-
-	interval int = 60_000
-
-	sessionTimeout = 4 * time.Second
-)
-
-type SystemManager struct {
-	hub       hubLike
-	systems   *store.Store[string, *System]
-	sshConfig *ssh.ClientConfig
-}
-
-type System struct {
-	Id      string `db:"id"`
-	Host    string `db:"host"`
-	Port    string `db:"port"`
-	Status  string `db:"status"`
-	manager *SystemManager
-	client  *ssh.Client
-	data    *system.CombinedData
-	ctx     context.Context
-	cancel  context.CancelFunc
-}
-
-type hubLike interface {
-	core.App
-	GetSSHKey(dataDir string) (ssh.Signer, error)
-	HandleSystemAlerts(systemRecord *core.Record, data *system.CombinedData) error
-	HandleStatusAlerts(status string, systemRecord *core.Record) error
-}
-
-func NewSystemManager(hub hubLike) *SystemManager {
-	return &SystemManager{
-		systems: store.New(map[string]*System{}),
-		hub:     hub,
-	}
-}
-
-// Initialize initializes the system manager.
-// It binds the event hooks and starts updating existing systems.
-func (sm *SystemManager) Initialize() error {
-	sm.bindEventHooks()
-	// ssh setup
-	err := sm.createSSHClientConfig()
-	if err != nil {
-		return err
-	}
-	// start updating existing systems
-	var systems []*System
-	err = sm.hub.DB().NewQuery("SELECT id, host, port, status FROM systems WHERE status != 'paused'").All(&systems)
-	if err != nil || len(systems) == 0 {
-		return err
-	}
-	go func() {
-		// time between initial system updates
-		delta := interval / max(1, len(systems))
-		delta = min(delta, 2_000)
-		sleepTime := time.Duration(delta) * time.Millisecond
-		for _, system := range systems {
-			time.Sleep(sleepTime)
-			_ = sm.AddSystem(system)
-		}
-	}()
-	return nil
-}
-
-func (sm *SystemManager) bindEventHooks() {
-	sm.hub.OnRecordCreate("systems").BindFunc(sm.onRecordCreate)
-	sm.hub.OnRecordAfterCreateSuccess("systems").BindFunc(sm.onRecordAfterCreateSuccess)
-	sm.hub.OnRecordUpdate("systems").BindFunc(sm.onRecordUpdate)
-	sm.hub.OnRecordAfterUpdateSuccess("systems").BindFunc(sm.onRecordAfterUpdateSuccess)
-	sm.hub.OnRecordAfterDeleteSuccess("systems").BindFunc(sm.onRecordAfterDeleteSuccess)
-}
-
-// Runs before the record is committed to the database
-func (sm *SystemManager) onRecordCreate(e *core.RecordEvent) error {
-	e.Record.Set("info", system.Info{})
-	e.Record.Set("status", pending)
-	return e.Next()
-}
-
-// Runs after the record is committed to the database
-func (sm *SystemManager) onRecordAfterCreateSuccess(e *core.RecordEvent) error {
-	if err := sm.AddRecord(e.Record); err != nil {
-		e.App.Logger().Error("Error adding record", "err", err)
-	}
-	return e.Next()
-}
-
-// Runs before the record is updated
-func (sm *SystemManager) onRecordUpdate(e *core.RecordEvent) error {
-	if e.Record.GetString("status") == paused {
-		e.Record.Set("info", system.Info{})
-	}
-	return e.Next()
-}
-
-// Runs after the record is updated
-func (sm *SystemManager) onRecordAfterUpdateSuccess(e *core.RecordEvent) error {
-	newStatus := e.Record.GetString("status")
-	switch newStatus {
-	case paused:
-		_ = sm.RemoveSystem(e.Record.Id)
-		_ = deactivateAlerts(e.App, e.Record.Id)
-		return e.Next()
-	case pending:
-		if err := sm.AddRecord(e.Record); err != nil {
-			e.App.Logger().Error("Error adding record", "err", err)
-		}
-		return e.Next()
-	}
-	system, ok := sm.systems.GetOk(e.Record.Id)
-	if !ok {
-		return sm.AddRecord(e.Record)
-	}
-	prevStatus := system.Status
-	system.Status = newStatus
-	// system alerts if system is up
-	if system.Status == up {
-		if err := sm.hub.HandleSystemAlerts(e.Record, system.data); err != nil {
-			e.App.Logger().Error("Error handling system alerts", "err", err)
-		}
-	}
-	if (system.Status == down && prevStatus == up) || (system.Status == up && prevStatus == down) {
-		if err := sm.hub.HandleStatusAlerts(system.Status, e.Record); err != nil {
-			e.App.Logger().Error("Error handling status alerts", "err", err)
-		}
-	}
-	return e.Next()
-}
-
-// Runs after the record is deleted
-func (sm *SystemManager) onRecordAfterDeleteSuccess(e *core.RecordEvent) error {
-	sm.RemoveSystem(e.Record.Id)
-	return e.Next()
-}
-
-// AddSystem adds a system to the manager
-func (sm *SystemManager) AddSystem(sys *System) error {
-	if sm.systems.Has(sys.Id) {
-		return fmt.Errorf("system exists")
-	}
-	if sys.Id == "" || sys.Host == "" {
-		return fmt.Errorf("system is missing required fields")
-	}
-	sys.manager = sm
-	sys.ctx, sys.cancel = context.WithCancel(context.Background())
-	sys.data = &system.CombinedData{}
-	sm.systems.Set(sys.Id, sys)
-	go sys.StartUpdater()
-	return nil
-}
-
-// RemoveSystem removes a system from the manager
-func (sm *SystemManager) RemoveSystem(systemID string) error {
-	system, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return fmt.Errorf("system not found")
-	}
-	// cancel the context to signal stop
-	if system.cancel != nil {
-		system.cancel()
-	}
-	system.resetSSHClient()
-	sm.systems.Remove(systemID)
-	return nil
-}
-
-// AddRecord adds a record to the system manager.
-// It first removes any existing system with the same ID, then creates a new System
-// instance from the record data and adds it to the manager.
-// This function is typically called when a new system is created or when an existing
-// system's status changes to pending.
-func (sm *SystemManager) AddRecord(record *core.Record) (err error) {
-	_ = sm.RemoveSystem(record.Id)
-	system := &System{
-		Id:     record.Id,
-		Status: record.GetString("status"),
-		Host:   record.GetString("host"),
-		Port:   record.GetString("port"),
-	}
-	return sm.AddSystem(system)
-}
-
-// StartUpdater starts the system updater.
-// It first fetches the data from the agent then updates the records.
-// If the data is not found or the system is down, it sets the system down.
-func (sys *System) StartUpdater() {
-	if sys.data == nil {
-		sys.data = &system.CombinedData{}
-	}
-	if err := sys.update(); err != nil {
-		_ = sys.setDown(err)
-	}
-
-	c := time.Tick(time.Duration(interval) * time.Millisecond)
-
-	for {
-		select {
-		case <-sys.ctx.Done():
-			return
-		case <-c:
-			err := sys.update()
-			if err != nil {
-				_ = sys.setDown(err)
-			}
-		}
-	}
-}
-
-// update updates the system data and records.
-// It first fetches the data from the agent then updates the records.
-func (sys *System) update() error {
-	_, err := sys.fetchDataFromAgent()
-	if err == nil {
-		_, err = sys.createRecords()
-	}
-	return err
-}
-
-// createRecords updates the system record and adds system_stats and container_stats records
-func (sys *System) createRecords() (*core.Record, error) {
-	systemRecord, err := sys.getRecord()
-	if err != nil {
-		return nil, err
-	}
-	hub := sys.manager.hub
-	// add system_stats and container_stats records
-	systemStats, err := hub.FindCachedCollectionByNameOrId("system_stats")
-	if err != nil {
-		return nil, err
-	}
-	systemStatsRecord := core.NewRecord(systemStats)
-	systemStatsRecord.Set("system", systemRecord.Id)
-	systemStatsRecord.Set("stats", sys.data.Stats)
-	systemStatsRecord.Set("type", "1m")
-	if err := hub.SaveNoValidate(systemStatsRecord); err != nil {
-		return nil, err
-	}
-	// add new container_stats record
-	if len(sys.data.Containers) > 0 {
-		containerStats, err := hub.FindCachedCollectionByNameOrId("container_stats")
-		if err != nil {
-			return nil, err
-		}
-		containerStatsRecord := core.NewRecord(containerStats)
-		containerStatsRecord.Set("system", systemRecord.Id)
-		containerStatsRecord.Set("stats", sys.data.Containers)
-		containerStatsRecord.Set("type", "1m")
-		if err := hub.SaveNoValidate(containerStatsRecord); err != nil {
-			return nil, err
-		}
-	}
-	// 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", sys.data.Info)
-	if err := hub.SaveNoValidate(systemRecord); err != nil {
-		return nil, err
-	}
-	return systemRecord, nil
-}
-
-// getRecord retrieves the system record from the database.
-// If the record is not found or the system is paused, it removes the system from the manager.
-func (sys *System) getRecord() (*core.Record, error) {
-	record, err := sys.manager.hub.FindRecordById("systems", sys.Id)
-	if err != nil || record == nil {
-		_ = sys.manager.RemoveSystem(sys.Id)
-		return nil, err
-	}
-	return record, nil
-}
-
-// setDown marks a system as down in the database.
-// It takes the original error that caused the system to go down and returns any error
-// encountered during the process of updating the system status.
-func (sys *System) setDown(OriginalError error) error {
-	if sys.Status == down {
-		return nil
-	}
-	record, err := sys.getRecord()
-	if err != nil {
-		return err
-	}
-	sys.manager.hub.Logger().Error("System down", "system", record.GetString("name"), "err", OriginalError)
-	record.Set("status", down)
-	err = sys.manager.hub.SaveNoValidate(record)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// fetchDataFromAgent fetches the data from the agent.
-// It first creates a new SSH client if it doesn't exist or the system is down.
-// Then it creates a new SSH session and fetches the data from the agent.
-// If the data is not found or the system is down, it sets the system down.
-func (sys *System) fetchDataFromAgent() (*system.CombinedData, error) {
-	maxRetries := 1
-	for attempt := 0; attempt <= maxRetries; attempt++ {
-		if sys.client == nil || sys.Status == down {
-			if err := sys.createSSHClient(); err != nil {
-				return nil, err
-			}
-		}
-
-		session, err := sys.createSessionWithTimeout(4 * time.Second)
-		if err != nil {
-			if attempt >= maxRetries {
-				return nil, err
-			}
-			sys.manager.hub.Logger().Warn("Session closed. Retrying...", "host", sys.Host, "port", sys.Port, "err", err)
-			sys.resetSSHClient()
-			continue
-		}
-		defer session.Close()
-
-		stdout, err := session.StdoutPipe()
-		if err != nil {
-			return nil, err
-		}
-		if err := session.Shell(); err != nil {
-			return nil, err
-		}
-
-		// this is initialized in startUpdater, should never be nil
-		*sys.data = system.CombinedData{}
-		if err := json.NewDecoder(stdout).Decode(sys.data); err != nil {
-			return nil, err
-		}
-		// wait for the session to complete
-		if err := session.Wait(); err != nil {
-			return nil, err
-		}
-		return sys.data, nil
-	}
-
-	// this should never be reached due to the return in the loop
-	return nil, fmt.Errorf("failed to fetch data")
-}
-
-// createSSHClientConfig initializes the ssh config for the system manager
-func (sm *SystemManager) createSSHClientConfig() error {
-	privateKey, err := sm.hub.GetSSHKey(sm.hub.DataDir())
-	if err != nil {
-		return err
-	}
-	sm.sshConfig = &ssh.ClientConfig{
-		User: "u",
-		Auth: []ssh.AuthMethod{
-			ssh.PublicKeys(privateKey),
-		},
-		Config: ssh.Config{
-			Ciphers:      common.DefaultCiphers,
-			KeyExchanges: common.DefaultKeyExchanges,
-			MACs:         common.DefaultMACs,
-		},
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-		Timeout:         sessionTimeout,
-	}
-	return nil
-}
-
-// createSSHClient creates a new SSH client for the system
-func (s *System) createSSHClient() error {
-	network := "tcp"
-	host := s.Host
-	if strings.HasPrefix(host, "/") {
-		network = "unix"
-	} else {
-		host = net.JoinHostPort(host, s.Port)
-	}
-	var err error
-	s.client, err = ssh.Dial(network, host, s.manager.sshConfig)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// createSessionWithTimeout creates a new SSH session with a timeout to avoid hanging
-// in case of network issues
-func (sys *System) createSessionWithTimeout(timeout time.Duration) (*ssh.Session, error) {
-	if sys.client == nil {
-		return nil, fmt.Errorf("client not initialized")
-	}
-
-	ctx, cancel := context.WithTimeout(sys.ctx, timeout)
-	defer cancel()
-
-	sessionChan := make(chan *ssh.Session, 1)
-	errChan := make(chan error, 1)
-
-	go func() {
-		if session, err := sys.client.NewSession(); err != nil {
-			errChan <- err
-		} else {
-			sessionChan <- session
-		}
-	}()
-
-	select {
-	case session := <-sessionChan:
-		return session, nil
-	case err := <-errChan:
-		return nil, err
-	case <-ctx.Done():
-		return nil, fmt.Errorf("timeout")
-	}
-}
-
-// resetSSHClient closes the SSH connection and resets the client to nil
-func (sys *System) resetSSHClient() {
-	if sys.client != nil {
-		sys.client.Close()
-	}
-	sys.client = nil
-}
-
-// deactivateAlerts finds all triggered alerts for a system and sets them to false
-func deactivateAlerts(app core.App, systemID string) error {
-	// we can't use an UPDATE query because it doesn't work with realtime updates
-	// _, err := e.App.DB().NewQuery(fmt.Sprintf("UPDATE alerts SET triggered = false WHERE system = '%s'", e.Record.Id)).Execute()
-	alerts, err := app.FindRecordsByFilter("alerts", fmt.Sprintf("system = '%s' && triggered = 1", systemID), "", -1, 0)
-	if err != nil {
-		return err
-	}
-	for _, alert := range alerts {
-		alert.Set("triggered", false)
-		if err := app.SaveNoValidate(alert); err != nil {
-			return err
-		}
-	}
-	return nil
-}

beszel/internal/hub/systems/systems_test.go

@@ -1,440 +0,0 @@
-//go:build testing
-// +build testing
-
-package systems_test
-
-import (
-	"beszel/internal/entities/container"
-	"beszel/internal/entities/system"
-	"beszel/internal/hub/systems"
-	"beszel/internal/tests"
-	"fmt"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/pocketbase/dbx"
-	"github.com/pocketbase/pocketbase/core"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// createTestSystem creates a test system record with a unique host name
-// and returns the created record and any error
-func createTestSystem(t *testing.T, hub *tests.TestHub, options map[string]any) (*core.Record, error) {
-	collection, err := hub.FindCachedCollectionByNameOrId("systems")
-	if err != nil {
-		return nil, err
-	}
-
-	// get user record
-	var firstUser *core.Record
-	users, err := hub.FindAllRecords("users", dbx.NewExp("id != ''"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(users) > 0 {
-		firstUser = users[0]
-	}
-	// Generate a unique host name to ensure we're adding a new system
-	uniqueHost := fmt.Sprintf("test-host-%d.example.com", time.Now().UnixNano())
-
-	// Create the record
-	record := core.NewRecord(collection)
-	record.Set("name", uniqueHost)
-	record.Set("host", uniqueHost)
-	record.Set("port", "45876")
-	record.Set("status", "pending")
-	record.Set("users", []string{firstUser.Id})
-
-	// Apply any custom options
-	for key, value := range options {
-		record.Set(key, value)
-	}
-
-	// Save the record to the database
-	err = hub.Save(record)
-	if err != nil {
-		return nil, err
-	}
-
-	return record, nil
-}
-
-func TestSystemManagerIntegration(t *testing.T) {
-	// Create a test hub
-	hub, err := tests.NewTestHub()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer hub.Cleanup()
-
-	// Create independent system manager
-	sm := systems.NewSystemManager(hub)
-	assert.NotNil(t, sm)
-
-	// Test initialization
-	sm.Initialize()
-
-	// Test collection existence. todo: move to hub package tests
-	t.Run("CollectionExistence", func(t *testing.T) {
-		// Verify that required collections exist
-		systems, err := hub.FindCachedCollectionByNameOrId("systems")
-		require.NoError(t, err)
-		assert.NotNil(t, systems)
-
-		systemStats, err := hub.FindCachedCollectionByNameOrId("system_stats")
-		require.NoError(t, err)
-		assert.NotNil(t, systemStats)
-
-		containerStats, err := hub.FindCachedCollectionByNameOrId("container_stats")
-		require.NoError(t, err)
-		assert.NotNil(t, containerStats)
-	})
-
-	// Test adding a system record
-	t.Run("AddRecord", func(t *testing.T) {
-		var wg sync.WaitGroup
-		wg.Add(2)
-
-		// Get the count before adding the system
-		countBefore := sm.GetSystemCount()
-
-		// record should be pending on create
-		hub.OnRecordCreate("systems").BindFunc(func(e *core.RecordEvent) error {
-			record := e.Record
-			if record.GetString("name") == "welcometoarcoampm" {
-				assert.Equal(t, "pending", e.Record.GetString("status"), "System status should be 'pending'")
-				wg.Done()
-			}
-			return e.Next()
-		})
-
-		// record should be down on update
-		hub.OnRecordAfterUpdateSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
-			record := e.Record
-			if record.GetString("name") == "welcometoarcoampm" {
-				assert.Equal(t, "down", e.Record.GetString("status"), "System status should be 'pending'")
-				wg.Done()
-			}
-			return e.Next()
-		})
-		// Create a test system with the first user assigned
-		record, err := createTestSystem(t, hub, map[string]any{
-			"name": "welcometoarcoampm",
-			"host": "localhost",
-			"port": "33914",
-		})
-		require.NoError(t, err)
-
-		wg.Wait()
-
-		// system should be down if grabbed from the store
-		assert.Equal(t, "down", sm.GetSystemStatusFromStore(record.Id), "System status should be 'down'")
-
-		// Check that the system count increased
-		countAfter := sm.GetSystemCount()
-		assert.Equal(t, countBefore+1, countAfter, "System count should increase after adding a system via event hook")
-
-		// Verify the system was added by checking if it exists
-		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store")
-
-		// Verify the system host and port
-		host, port := sm.GetSystemHostPort(record.Id)
-		assert.Equal(t, record.Get("host"), host, "System host should match")
-		assert.Equal(t, record.Get("port"), port, "System port should match")
-
-		// Verify the system is in the list of all system IDs
-		ids := sm.GetAllSystemIDs()
-		assert.Contains(t, ids, record.Id, "System ID should be in the list of all system IDs")
-
-		// Verify the system was added by checking if removing it works
-		err = sm.RemoveSystem(record.Id)
-		assert.NoError(t, err, "System should exist and be removable")
-
-		// Verify the system no longer exists
-		assert.False(t, sm.HasSystem(record.Id), "System should not exist in the store after removal")
-
-		// Verify the system is not in the list of all system IDs
-		newIds := sm.GetAllSystemIDs()
-		assert.NotContains(t, newIds, record.Id, "System ID should not be in the list of all system IDs after removal")
-
-	})
-
-	t.Run("RemoveSystem", func(t *testing.T) {
-		// Get the count before adding the system
-		countBefore := sm.GetSystemCount()
-
-		// Create a test system record
-		record, err := createTestSystem(t, hub, map[string]any{})
-		require.NoError(t, err)
-
-		// Verify the system count increased
-		countAfterAdd := sm.GetSystemCount()
-		assert.Equal(t, countBefore+1, countAfterAdd, "System count should increase after adding a system via event hook")
-
-		// Verify the system exists
-		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store")
-
-		// Remove the system
-		err = sm.RemoveSystem(record.Id)
-		assert.NoError(t, err)
-
-		// Check that the system count decreased
-		countAfterRemove := sm.GetSystemCount()
-		assert.Equal(t, countAfterAdd-1, countAfterRemove, "System count should decrease after removing a system")
-
-		// Verify the system no longer exists
-		assert.False(t, sm.HasSystem(record.Id), "System should not exist in the store after removal")
-
-		// Verify the system is not in the list of all system IDs
-		ids := sm.GetAllSystemIDs()
-		assert.NotContains(t, ids, record.Id, "System ID should not be in the list of all system IDs after removal")
-
-		// Verify the system status is empty
-		status := sm.GetSystemStatusFromStore(record.Id)
-		assert.Equal(t, "", status, "System status should be empty after removal")
-
-		// Try to remove it again - should return an error since it's already removed
-		err = sm.RemoveSystem(record.Id)
-		assert.Error(t, err)
-	})
-
-	t.Run("NewRecordPending", func(t *testing.T) {
-		// Create a test system
-		record, err := createTestSystem(t, hub, map[string]any{})
-		require.NoError(t, err)
-
-		// Add the record to the system manager
-		err = sm.AddRecord(record)
-		require.NoError(t, err)
-
-		// Test filtering records by status - should be "pending" now
-		filter := "status = 'pending'"
-		pendingSystems, err := hub.FindRecordsByFilter("systems", filter, "-created", 0, 0, nil)
-		require.NoError(t, err)
-		assert.GreaterOrEqual(t, len(pendingSystems), 1)
-	})
-
-	t.Run("SystemStatusUpdate", func(t *testing.T) {
-		// Create a test system record
-		record, err := createTestSystem(t, hub, map[string]any{})
-		require.NoError(t, err)
-
-		// Add the record to the system manager
-		err = sm.AddRecord(record)
-		require.NoError(t, err)
-
-		// Test status changes
-		initialStatus := sm.GetSystemStatusFromStore(record.Id)
-
-		// Set a new status
-		sm.SetSystemStatusInDB(record.Id, "up")
-
-		// Verify status was updated
-		newStatus := sm.GetSystemStatusFromStore(record.Id)
-		assert.Equal(t, "up", newStatus, "System status should be updated to 'up'")
-		assert.NotEqual(t, initialStatus, newStatus, "Status should have changed")
-
-		// Verify the database was updated
-		updatedRecord, err := hub.FindRecordById("systems", record.Id)
-		require.NoError(t, err)
-		assert.Equal(t, "up", updatedRecord.Get("status"), "Database status should match")
-	})
-
-	t.Run("HandleSystemData", func(t *testing.T) {
-		// Create a test system record
-		record, err := createTestSystem(t, hub, map[string]any{})
-		require.NoError(t, err)
-
-		// Create test system data
-		testData := &system.CombinedData{
-			Info: system.Info{
-				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,
-				Mem:         16384.0,
-				MemUsed:     6553.6,
-				MemPct:      40.0,
-				DiskTotal:   1024000.0,
-				DiskUsed:    614400.0,
-				DiskPct:     60.0,
-				NetworkSent: 1024.0,
-				NetworkRecv: 2048.0,
-			},
-			Containers: []*container.Stats{},
-		}
-
-		// Test handling system data. todo: move to hub/alerts package tests
-		err = hub.HandleSystemAlerts(record, testData)
-		assert.NoError(t, err)
-	})
-
-	t.Run("ErrorHandling", func(t *testing.T) {
-		// Try to add a non-existent record
-		nonExistentId := "non_existent_id"
-		err := sm.RemoveSystem(nonExistentId)
-		assert.Error(t, err)
-
-		// Try to add a system with invalid host
-		system := &systems.System{
-			Host: "",
-		}
-		err = sm.AddSystem(system)
-		assert.Error(t, err)
-	})
-
-	t.Run("DeleteRecord", func(t *testing.T) {
-		var wg sync.WaitGroup
-		wg.Add(2)
-
-		runs := 0
-
-		hub.OnRecordUpdate("systems").BindFunc(func(e *core.RecordEvent) error {
-			runs++
-			record := e.Record
-			if record.GetString("name") == "deadflagblues" {
-				if runs == 1 {
-					assert.Equal(t, "up", e.Record.GetString("status"), "System status should be 'up'")
-					wg.Done()
-				} else if runs == 2 {
-					assert.Equal(t, "paused", e.Record.GetString("status"), "System status should be 'paused'")
-					wg.Done()
-				}
-			}
-			return e.Next()
-		})
-
-		// Create a test system record
-		record, err := createTestSystem(t, hub, map[string]any{
-			"name": "deadflagblues",
-		})
-		require.NoError(t, err)
-
-		// Verify the system exists
-		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store")
-
-		// set the status manually to up
-		sm.SetSystemStatusInDB(record.Id, "up")
-
-		// verify the status is up
-		assert.Equal(t, "up", sm.GetSystemStatusFromStore(record.Id), "System status should be 'up'")
-
-		// Set the status to "paused" which should cause it to be deleted from the store
-		sm.SetSystemStatusInDB(record.Id, "paused")
-
-		wg.Wait()
-
-		// Verify the system no longer exists
-		assert.False(t, sm.HasSystem(record.Id), "System should not exist in the store after deletion")
-	})
-
-	t.Run("ConcurrentOperations", func(t *testing.T) {
-		// Create a test system
-		record, err := createTestSystem(t, hub, map[string]any{})
-		require.NoError(t, err)
-
-		// Run concurrent operations
-		const goroutines = 5
-		var wg sync.WaitGroup
-		wg.Add(goroutines)
-
-		for i := range goroutines {
-			go func(i int) {
-				defer wg.Done()
-
-				// Alternate between different operations
-				switch i % 3 {
-				case 0:
-					status := fmt.Sprintf("status-%d", i)
-					sm.SetSystemStatusInDB(record.Id, status)
-				case 1:
-					_ = sm.GetSystemStatusFromStore(record.Id)
-				case 2:
-					_, _ = sm.GetSystemHostPort(record.Id)
-				}
-			}(i)
-		}
-
-		wg.Wait()
-
-		// Verify system still exists and is in a valid state
-		assert.True(t, sm.HasSystem(record.Id), "System should still exist after concurrent operations")
-		status := sm.GetSystemStatusFromStore(record.Id)
-		assert.NotEmpty(t, status, "System should have a status after concurrent operations")
-	})
-
-	t.Run("ContextCancellation", func(t *testing.T) {
-		// Create a test system record
-		record, err := createTestSystem(t, hub, map[string]any{})
-		require.NoError(t, err)
-
-		// Verify the system exists in the store
-		assert.True(t, sm.HasSystem(record.Id), "System should exist in the store")
-
-		// Store the original context and cancel function
-		originalCtx, originalCancel, err := sm.GetSystemContextFromStore(record.Id)
-		assert.NoError(t, err)
-
-		// Ensure the context is not nil
-		assert.NotNil(t, originalCtx, "System context should not be nil")
-		assert.NotNil(t, originalCancel, "System cancel function should not be nil")
-
-		// Cancel the context
-		originalCancel()
-
-		// Wait a short time for cancellation to propagate
-		time.Sleep(10 * time.Millisecond)
-
-		// Verify the context is done
-		select {
-		case <-originalCtx.Done():
-			// Context was properly cancelled
-		default:
-			t.Fatal("Context was not cancelled")
-		}
-
-		// Verify the system is still in the store (cancellation shouldn't remove it)
-		assert.True(t, sm.HasSystem(record.Id), "System should still exist after context cancellation")
-
-		// Explicitly remove the system
-		err = sm.RemoveSystem(record.Id)
-		assert.NoError(t, err, "RemoveSystem should succeed")
-
-		// Verify the system is removed
-		assert.False(t, sm.HasSystem(record.Id), "System should be removed after RemoveSystem")
-
-		// Try to remove it again - should return an error
-		err = sm.RemoveSystem(record.Id)
-		assert.Error(t, err, "RemoveSystem should fail for non-existent system")
-
-		// Add the system back
-		err = sm.AddRecord(record)
-		require.NoError(t, err, "AddRecord should succeed")
-
-		// Verify the system is back in the store
-		assert.True(t, sm.HasSystem(record.Id), "System should exist after re-adding")
-
-		// Verify a new context was created
-		newCtx, newCancel, err := sm.GetSystemContextFromStore(record.Id)
-		assert.NoError(t, err)
-		assert.NotNil(t, newCtx, "New system context should not be nil")
-		assert.NotNil(t, newCancel, "New system cancel function should not be nil")
-		assert.NotEqual(t, originalCtx, newCtx, "New context should be different from original")
-
-		// Clean up
-		err = sm.RemoveSystem(record.Id)
-		assert.NoError(t, err)
-	})
-}

beszel/internal/hub/systems/systems_test_helpers.go

@@ -1,117 +0,0 @@
-//go:build testing
-// +build testing
-
-package systems
-
-import (
-	entities "beszel/internal/entities/system"
-	"context"
-	"fmt"
-)
-
-// GetSystemCount returns the number of systems in the store
-func (sm *SystemManager) GetSystemCount() int {
-	return sm.systems.Length()
-}
-
-// HasSystem checks if a system with the given ID exists in the store
-func (sm *SystemManager) HasSystem(systemID string) bool {
-	return sm.systems.Has(systemID)
-}
-
-// GetSystemStatusFromStore returns the status of a system with the given ID
-// Returns an empty string if the system doesn't exist
-func (sm *SystemManager) GetSystemStatusFromStore(systemID string) string {
-	sys, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return ""
-	}
-	return sys.Status
-}
-
-// GetSystemContextFromStore returns the context and cancel function for a system
-func (sm *SystemManager) GetSystemContextFromStore(systemID string) (context.Context, context.CancelFunc, error) {
-	sys, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return nil, nil, fmt.Errorf("no system")
-	}
-	return sys.ctx, sys.cancel, nil
-}
-
-// GetSystemFromStore returns a store from the system
-func (sm *SystemManager) GetSystemFromStore(systemID string) (*System, error) {
-	sys, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return nil, fmt.Errorf("no system")
-	}
-	return sys, nil
-}
-
-// GetAllSystemIDs returns a slice of all system IDs in the store
-func (sm *SystemManager) GetAllSystemIDs() []string {
-	data := sm.systems.GetAll()
-	ids := make([]string, 0, len(data))
-	for id := range data {
-		ids = append(ids, id)
-	}
-	return ids
-}
-
-// GetSystemData returns the combined data for a system with the given ID
-// Returns nil if the system doesn't exist
-// This method is intended for testing
-func (sm *SystemManager) GetSystemData(systemID string) *entities.CombinedData {
-	sys, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return nil
-	}
-	return sys.data
-}
-
-// GetSystemHostPort returns the host and port for a system with the given ID
-// Returns empty strings if the system doesn't exist
-func (sm *SystemManager) GetSystemHostPort(systemID string) (string, string) {
-	sys, ok := sm.systems.GetOk(systemID)
-	if !ok {
-		return "", ""
-	}
-	return sys.Host, sys.Port
-}
-
-// DisableAutoUpdater disables the automatic updater for a system
-// This is intended for testing
-// Returns false if the system doesn't exist
-// func (sm *SystemManager) DisableAutoUpdater(systemID string) bool {
-// 	sys, ok := sm.systems.GetOk(systemID)
-// 	if !ok {
-// 		return false
-// 	}
-// 	if sys.cancel != nil {
-// 		sys.cancel()
-// 		sys.cancel = nil
-// 	}
-// 	return true
-// }
-
-// SetSystemStatusInDB sets the status of a system directly and updates the database record
-// This is intended for testing
-// Returns false if the system doesn't exist
-func (sm *SystemManager) SetSystemStatusInDB(systemID string, status string) bool {
-	if !sm.HasSystem(systemID) {
-		return false
-	}
-
-	// Update the database record
-	record, err := sm.hub.FindRecordById("systems", systemID)
-	if err != nil {
-		return false
-	}
-
-	record.Set("status", status)
-	err = sm.hub.Save(record)
-	if err != nil {
-		return false
-	}
-
-	return true
-}

beszel/internal/records/records.go

@@ -4,15 +4,14 @@ package records
 import (
 	"beszel/internal/entities/container"
 	"beszel/internal/entities/system"
-	"fmt"
 	"log"
 	"math"
-	"strings"
 	"time"
 
 	"github.com/goccy/go-json"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/types"
 )
 
 type RecordManager struct {
@@ -26,6 +25,11 @@ type LongerRecordData struct {
 	minShorterRecords  int
 }
 
+type RecordDeletionData struct {
+	recordType string
+	retention  time.Duration
+}
+
 type RecordStats []struct {
 	Stats []byte `db:"stats"`
 }
@@ -35,7 +39,7 @@ func NewRecordManager(app core.App) *RecordManager {
 }
 
 // Create longer records by averaging shorter records
-func (rm *RecordManager) CreateLongerRecords() {
+func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
 	// start := time.Now()
 	longerRecordData := []LongerRecordData{
 		{
@@ -66,24 +70,14 @@ func (rm *RecordManager) CreateLongerRecords() {
 	}
 	// wrap the operations in a transaction
 	rm.app.RunInTransaction(func(txApp core.App) error {
-		var err error
-		collections := [2]*core.Collection{}
-		collections[0], err = txApp.FindCachedCollectionByNameOrId("system_stats")
+		activeSystems, err := txApp.FindAllRecords("systems", dbx.NewExp("status = 'up'"))
 		if err != nil {
+			log.Println("failed to get active systems", "err", err.Error())
 			return err
 		}
-		collections[1], err = txApp.FindCachedCollectionByNameOrId("container_stats")
-		if err != nil {
-			return err
-		}
-		var systems []struct {
-			Id string `db:"id"`
-		}
-
-		txApp.DB().NewQuery("SELECT id FROM systems WHERE status='up'").All(&systems)
 
 		// loop through all active systems, time periods, and collections
-		for _, system := range systems {
+		for _, system := range activeSystems {
 			// log.Println("processing system", system.GetString("name"))
 			for i := range longerRecordData {
 				recordData := longerRecordData[i]
@@ -98,7 +92,7 @@ func (rm *RecordManager) CreateLongerRecords() {
 					if recordData.longerType != "10m" {
 						lastLongerRecord, err := txApp.FindFirstRecordByFilter(
 							collection.Id,
-							"system = {:system} && type = {:type} && created > {:created}",
+							"type = {:type} && system = {:system} && created > {:created}",
 							dbx.Params{"type": recordData.longerType, "system": system.Id, "created": longerRecordPeriod},
 						)
 						// continue if longer record exists
@@ -114,7 +108,7 @@ func (rm *RecordManager) CreateLongerRecords() {
 						Select("stats").
 						From(collection.Name).
 						AndWhere(dbx.NewExp(
-							"system={:system} AND type={:type} AND created > {:created}",
+							"type={:type} AND system={:system} AND created > {:created}",
 							dbx.Params{
 								"type":    recordData.shorterType,
 								"system":  system.Id,
@@ -125,6 +119,7 @@ func (rm *RecordManager) CreateLongerRecords() {
 
 					// continue if not enough shorter records
 					if err != nil || len(stats) < recordData.minShorterRecords {
+						// log.Println("not enough shorter records. continue.", len(allShorterRecords), recordData.expectedShorterRecords)
 						continue
 					}
 					// average the shorter records and create longer record
@@ -138,7 +133,7 @@ func (rm *RecordManager) CreateLongerRecords() {
 						longerRecord.Set("stats", rm.AverageContainerStats(stats))
 					}
 					if err := txApp.SaveNoValidate(longerRecord); err != nil {
-						log.Println("failed to save longer record", "err", err)
+						log.Println("failed to save longer record", "err", err.Error())
 					}
 				}
 			}
@@ -151,20 +146,16 @@ func (rm *RecordManager) CreateLongerRecords() {
 }
 
 // Calculate the average stats of a list of system_stats records without reflect
-func (rm *RecordManager) AverageSystemStats(records RecordStats) *system.Stats {
-	sum := &system.Stats{}
+func (rm *RecordManager) AverageSystemStats(records RecordStats) system.Stats {
+	sum := system.Stats{}
 	count := float64(len(records))
+	// use different counter for temps in case some records don't have them
 	tempCount := float64(0)
 
-	// Temporary struct for unmarshaling
-	stats := &system.Stats{}
-
-	// Accumulate totals
+	var stats system.Stats
 	for i := range records {
-		*stats = system.Stats{} // Reset tempStats for unmarshaling
-		if err := json.Unmarshal(records[i].Stats, stats); err != nil {
-			continue
-		}
+		stats = system.Stats{} // Zero the struct before unmarshalling
+		json.Unmarshal(records[i].Stats, &stats)
 		sum.Cpu += stats.Cpu
 		sum.Mem += stats.Mem
 		sum.MemUsed += stats.MemUsed
@@ -180,25 +171,26 @@ func (rm *RecordManager) AverageSystemStats(records RecordStats) *system.Stats {
 		sum.DiskWritePs += stats.DiskWritePs
 		sum.NetworkSent += stats.NetworkSent
 		sum.NetworkRecv += stats.NetworkRecv
-		// Set peak values
+		// set peak values
 		sum.MaxCpu = max(sum.MaxCpu, stats.MaxCpu, stats.Cpu)
 		sum.MaxNetworkSent = max(sum.MaxNetworkSent, stats.MaxNetworkSent, stats.NetworkSent)
 		sum.MaxNetworkRecv = max(sum.MaxNetworkRecv, stats.MaxNetworkRecv, stats.NetworkRecv)
 		sum.MaxDiskReadPs = max(sum.MaxDiskReadPs, stats.MaxDiskReadPs, stats.DiskReadPs)
 		sum.MaxDiskWritePs = max(sum.MaxDiskWritePs, stats.MaxDiskWritePs, stats.DiskWritePs)
-
-		// Accumulate temperatures
+		// add temps to sum
 		if stats.Temperatures != nil {
 			if sum.Temperatures == nil {
 				sum.Temperatures = make(map[string]float64, len(stats.Temperatures))
 			}
 			tempCount++
 			for key, value := range stats.Temperatures {
+				if _, ok := sum.Temperatures[key]; !ok {
+					sum.Temperatures[key] = 0
+				}
 				sum.Temperatures[key] += value
 			}
 		}
-
-		// Accumulate extra filesystem stats
+		// add extra fs to sum
 		if stats.ExtraFs != nil {
 			if sum.ExtraFs == nil {
 				sum.ExtraFs = make(map[string]*system.FsStats, len(stats.ExtraFs))
@@ -207,26 +199,25 @@ func (rm *RecordManager) AverageSystemStats(records RecordStats) *system.Stats {
 				if _, ok := sum.ExtraFs[key]; !ok {
 					sum.ExtraFs[key] = &system.FsStats{}
 				}
-				fs := sum.ExtraFs[key]
-				fs.DiskTotal += value.DiskTotal
-				fs.DiskUsed += value.DiskUsed
-				fs.DiskWritePs += value.DiskWritePs
-				fs.DiskReadPs += value.DiskReadPs
-				fs.MaxDiskReadPS = max(fs.MaxDiskReadPS, value.MaxDiskReadPS, value.DiskReadPs)
-				fs.MaxDiskWritePS = max(fs.MaxDiskWritePS, value.MaxDiskWritePS, value.DiskWritePs)
+				sum.ExtraFs[key].DiskTotal += value.DiskTotal
+				sum.ExtraFs[key].DiskUsed += value.DiskUsed
+				sum.ExtraFs[key].DiskWritePs += value.DiskWritePs
+				sum.ExtraFs[key].DiskReadPs += value.DiskReadPs
+				// peak values
+				sum.ExtraFs[key].MaxDiskReadPS = max(sum.ExtraFs[key].MaxDiskReadPS, value.MaxDiskReadPS, value.DiskReadPs)
+				sum.ExtraFs[key].MaxDiskWritePS = max(sum.ExtraFs[key].MaxDiskWritePS, value.MaxDiskWritePS, value.DiskWritePs)
 			}
 		}
-
-		// Accumulate GPU data
+		// add GPU data
 		if stats.GPUData != nil {
 			if sum.GPUData == nil {
 				sum.GPUData = make(map[string]system.GPUData, len(stats.GPUData))
 			}
 			for id, value := range stats.GPUData {
-				gpu, ok := sum.GPUData[id]
-				if !ok {
-					gpu = system.GPUData{Name: value.Name}
+				if _, ok := sum.GPUData[id]; !ok {
+					sum.GPUData[id] = system.GPUData{Name: value.Name}
 				}
+				gpu := sum.GPUData[id]
 				gpu.Temperature += value.Temperature
 				gpu.MemoryUsed += value.MemoryUsed
 				gpu.MemoryTotal += value.MemoryTotal
@@ -238,67 +229,76 @@ func (rm *RecordManager) AverageSystemStats(records RecordStats) *system.Stats {
 		}
 	}
 
-	// Compute averages in place
-	if count > 0 {
-		sum.Cpu = twoDecimals(sum.Cpu / count)
-		sum.Mem = twoDecimals(sum.Mem / count)
-		sum.MemUsed = twoDecimals(sum.MemUsed / count)
-		sum.MemPct = twoDecimals(sum.MemPct / count)
-		sum.MemBuffCache = twoDecimals(sum.MemBuffCache / count)
-		sum.MemZfsArc = twoDecimals(sum.MemZfsArc / count)
-		sum.Swap = twoDecimals(sum.Swap / count)
-		sum.SwapUsed = twoDecimals(sum.SwapUsed / count)
-		sum.DiskTotal = twoDecimals(sum.DiskTotal / count)
-		sum.DiskUsed = twoDecimals(sum.DiskUsed / count)
-		sum.DiskPct = twoDecimals(sum.DiskPct / count)
-		sum.DiskReadPs = twoDecimals(sum.DiskReadPs / count)
-		sum.DiskWritePs = twoDecimals(sum.DiskWritePs / count)
-		sum.NetworkSent = twoDecimals(sum.NetworkSent / count)
-		sum.NetworkRecv = twoDecimals(sum.NetworkRecv / count)
+	stats = system.Stats{
+		Cpu:            twoDecimals(sum.Cpu / count),
+		Mem:            twoDecimals(sum.Mem / count),
+		MemUsed:        twoDecimals(sum.MemUsed / count),
+		MemPct:         twoDecimals(sum.MemPct / count),
+		MemBuffCache:   twoDecimals(sum.MemBuffCache / count),
+		MemZfsArc:      twoDecimals(sum.MemZfsArc / count),
+		Swap:           twoDecimals(sum.Swap / count),
+		SwapUsed:       twoDecimals(sum.SwapUsed / count),
+		DiskTotal:      twoDecimals(sum.DiskTotal / count),
+		DiskUsed:       twoDecimals(sum.DiskUsed / count),
+		DiskPct:        twoDecimals(sum.DiskPct / count),
+		DiskReadPs:     twoDecimals(sum.DiskReadPs / count),
+		DiskWritePs:    twoDecimals(sum.DiskWritePs / count),
+		NetworkSent:    twoDecimals(sum.NetworkSent / count),
+		NetworkRecv:    twoDecimals(sum.NetworkRecv / count),
+		MaxCpu:         sum.MaxCpu,
+		MaxDiskReadPs:  sum.MaxDiskReadPs,
+		MaxDiskWritePs: sum.MaxDiskWritePs,
+		MaxNetworkSent: sum.MaxNetworkSent,
+		MaxNetworkRecv: sum.MaxNetworkRecv,
+	}
 
-		// Average temperatures
-		if sum.Temperatures != nil && tempCount > 0 {
-			for key := range sum.Temperatures {
-				sum.Temperatures[key] = twoDecimals(sum.Temperatures[key] / tempCount)
-			}
+	if sum.Temperatures != nil {
+		stats.Temperatures = make(map[string]float64, len(sum.Temperatures))
+		for key, value := range sum.Temperatures {
+			stats.Temperatures[key] = twoDecimals(value / tempCount)
 		}
+	}
 
-		// Average extra filesystem stats
-		if sum.ExtraFs != nil {
-			for key := range sum.ExtraFs {
-				fs := sum.ExtraFs[key]
-				fs.DiskTotal = twoDecimals(fs.DiskTotal / count)
-				fs.DiskUsed = twoDecimals(fs.DiskUsed / count)
-				fs.DiskWritePs = twoDecimals(fs.DiskWritePs / count)
-				fs.DiskReadPs = twoDecimals(fs.DiskReadPs / count)
-			}
-		}
-
-		// Average GPU data
-		if sum.GPUData != nil {
-			for id := range sum.GPUData {
-				gpu := sum.GPUData[id]
-				gpu.Temperature = twoDecimals(gpu.Temperature / count)
-				gpu.MemoryUsed = twoDecimals(gpu.MemoryUsed / count)
-				gpu.MemoryTotal = twoDecimals(gpu.MemoryTotal / count)
-				gpu.Usage = twoDecimals(gpu.Usage / count)
-				gpu.Power = twoDecimals(gpu.Power / count)
-				gpu.Count = twoDecimals(gpu.Count / count)
-				sum.GPUData[id] = gpu
+	if sum.ExtraFs != nil {
+		stats.ExtraFs = make(map[string]*system.FsStats, len(sum.ExtraFs))
+		for key, value := range sum.ExtraFs {
+			stats.ExtraFs[key] = &system.FsStats{
+				DiskTotal:      twoDecimals(value.DiskTotal / count),
+				DiskUsed:       twoDecimals(value.DiskUsed / count),
+				DiskWritePs:    twoDecimals(value.DiskWritePs / count),
+				DiskReadPs:     twoDecimals(value.DiskReadPs / count),
+				MaxDiskReadPS:  value.MaxDiskReadPS,
+				MaxDiskWritePS: value.MaxDiskWritePS,
 			}
 		}
 	}
 
-	return sum
+	if sum.GPUData != nil {
+		stats.GPUData = make(map[string]system.GPUData, len(sum.GPUData))
+		for id, value := range sum.GPUData {
+			stats.GPUData[id] = system.GPUData{
+				Name:        value.Name,
+				Temperature: twoDecimals(value.Temperature / count),
+				MemoryUsed:  twoDecimals(value.MemoryUsed / count),
+				MemoryTotal: twoDecimals(value.MemoryTotal / count),
+				Usage:       twoDecimals(value.Usage / count),
+				Power:       twoDecimals(value.Power / count),
+				Count:       twoDecimals(value.Count / count),
+			}
+		}
+	}
+
+	return stats
 }
 
 // Calculate the average stats of a list of container_stats records
 func (rm *RecordManager) AverageContainerStats(records RecordStats) []container.Stats {
 	sums := make(map[string]*container.Stats)
 	count := float64(len(records))
-	containerStats := make([]container.Stats, 0, 50)
+
+	var containerStats []container.Stats
 	for i := range records {
-		// reset slice
+		// Reset the slice length to 0, but keep the capacity
 		containerStats = containerStats[:0]
 		if err := json.Unmarshal(records[i].Stats, &containerStats); err != nil {
 			return []container.Stats{}
@@ -330,45 +330,38 @@ func (rm *RecordManager) AverageContainerStats(records RecordStats) []container.
 
 // Deletes records older than what is displayed in the UI
 func (rm *RecordManager) DeleteOldRecords() {
-	// Define the collections to process
 	collections := []string{"system_stats", "container_stats"}
-
-	// Define record types and their retention periods
-	type RecordDeletionData struct {
-		recordType string
-		retention  time.Duration
-	}
 	recordData := []RecordDeletionData{
-		{recordType: "1m", retention: time.Hour},             // 1 hour
-		{recordType: "10m", retention: 12 * time.Hour},       // 12 hours
-		{recordType: "20m", retention: 24 * time.Hour},       // 1 day
-		{recordType: "120m", retention: 7 * 24 * time.Hour},  // 7 days
-		{recordType: "480m", retention: 30 * 24 * time.Hour}, // 30 days
+		{
+			recordType: "1m",
+			retention:  time.Hour,
+		},
+		{
+			recordType: "10m",
+			retention:  12 * time.Hour,
+		},
+		{
+			recordType: "20m",
+			retention:  24 * time.Hour,
+		},
+		{
+			recordType: "120m",
+			retention:  7 * 24 * time.Hour,
+		},
+		{
+			recordType: "480m",
+			retention:  30 * 24 * time.Hour,
+		},
 	}
-
-	// Process each collection
-	for _, collection := range collections {
-		// Build the WHERE clause dynamically
-		var conditionParts []string
-		var params dbx.Params = make(map[string]any)
-
-		for i, rd := range recordData {
-			// Create parameterized condition for this record type
-			dateParam := fmt.Sprintf("date%d", i)
-			conditionParts = append(conditionParts, fmt.Sprintf("(type = '%s' AND created < {:%s})", rd.recordType, dateParam))
-			params[dateParam] = time.Now().UTC().Add(-rd.retention)
-		}
-
-		// Combine conditions with OR
-		conditionStr := strings.Join(conditionParts, " OR ")
-
-		// Construct the full raw query
-		rawQuery := fmt.Sprintf("DELETE FROM %s WHERE %s", collection, conditionStr)
-
-		// Execute the query with parameters
-		if _, err := rm.app.DB().NewQuery(rawQuery).Bind(params).Execute(); err != nil {
-			// return fmt.Errorf("failed to delete from %s: %v", collection, err)
-			rm.app.Logger().Error("failed to delete", "collection", collection, "error", err)
+	db := rm.app.NonconcurrentDB()
+	for _, recordData := range recordData {
+		for _, collectionSlug := range collections {
+			formattedDate := time.Now().UTC().Add(-recordData.retention).Format(types.DefaultDateLayout)
+			expr := dbx.NewExp("[[created]] < {:date} AND [[type]] = {:type}", dbx.Params{"date": formattedDate, "type": recordData.recordType})
+			_, err := db.Delete(collectionSlug, expr).Execute()
+			if err != nil {
+				rm.app.Logger().Error("Failed to delete records", "err", err.Error())
+			}
 		}
 	}
 }

beszel/internal/tests/hub.go

@@ -1,58 +0,0 @@
-// Package tests provides helpers for testing the application.
-package tests
-
-import (
-	"beszel/internal/hub"
-
-	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tests"
-
-	_ "github.com/pocketbase/pocketbase/migrations"
-)
-
-// TestHub is a wrapper hub instance used for testing.
-type TestHub struct {
-	core.App
-	*tests.TestApp
-	*hub.Hub
-}
-
-// NewTestHub creates and initializes a test application instance.
-//
-// It is the caller's responsibility to call app.Cleanup() when the app is no longer needed.
-func NewTestHub(optTestDataDir ...string) (*TestHub, error) {
-	var testDataDir string
-	if len(optTestDataDir) > 0 {
-		testDataDir = optTestDataDir[0]
-	}
-
-	return NewTestHubWithConfig(core.BaseAppConfig{
-		DataDir:       testDataDir,
-		EncryptionEnv: "pb_test_env",
-	})
-}
-
-// NewTestHubWithConfig creates and initializes a test application instance
-// from the provided config.
-//
-// If config.DataDir is not set it fallbacks to the default internal test data directory.
-//
-// config.DataDir is cloned for each new test application instance.
-//
-// It is the caller's responsibility to call app.Cleanup() when the app is no longer needed.
-func NewTestHubWithConfig(config core.BaseAppConfig) (*TestHub, error) {
-	testApp, err := tests.NewTestAppWithConfig(config)
-	if err != nil {
-		return nil, err
-	}
-
-	hub := hub.NewHub(testApp)
-
-	t := &TestHub{
-		App:     testApp,
-		TestApp: testApp,
-		Hub:     hub,
-	}
-
-	return t, nil
-}

beszel/migrations/1738624382_updated_users.go

@@ -0,0 +1,98 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/pocketbase/core"
+	m "github.com/pocketbase/pocketbase/migrations"
+)
+
+func init() {
+	m.Register(func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("_pb_users_auth_")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"indexes": [
+				"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__email_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `email` + "`" + `) WHERE ` + "`" + `email` + "`" + ` != ''",
+				"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__tokenKey_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `tokenKey` + "`" + `)"
+			]
+		}`), &collection); err != nil {
+			return err
+		}
+
+		// remove field
+		collection.Fields.RemoveById("text4166911607")
+
+		// update field
+		if err := collection.Fields.AddMarshaledJSONAt(3, []byte(`{
+			"exceptDomains": null,
+			"hidden": false,
+			"id": "email3885137012",
+			"name": "email",
+			"onlyDomains": null,
+			"presentable": false,
+			"required": true,
+			"system": true,
+			"type": "email"
+		}`)); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	}, func(app core.App) error {
+		collection, err := app.FindCollectionByNameOrId("_pb_users_auth_")
+		if err != nil {
+			return err
+		}
+
+		// update collection data
+		if err := json.Unmarshal([]byte(`{
+			"indexes": [
+				"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__username_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (username COLLATE NOCASE)",
+				"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__email_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `email` + "`" + `) WHERE ` + "`" + `email` + "`" + ` != ''",
+				"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__tokenKey_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `tokenKey` + "`" + `)"
+			]
+		}`), &collection); err != nil {
+			return err
+		}
+
+		// add field
+		if err := collection.Fields.AddMarshaledJSONAt(6, []byte(`{
+			"autogeneratePattern": "users[0-9]{6}",
+			"hidden": false,
+			"id": "text4166911607",
+			"max": 150,
+			"min": 3,
+			"name": "username",
+			"pattern": "^[\\w][\\w\\.\\-]*$",
+			"presentable": false,
+			"primaryKey": false,
+			"required": true,
+			"system": false,
+			"type": "text"
+		}`)); err != nil {
+			return err
+		}
+
+		// update field
+		if err := collection.Fields.AddMarshaledJSONAt(3, []byte(`{
+			"exceptDomains": null,
+			"hidden": false,
+			"id": "email3885137012",
+			"name": "email",
+			"onlyDomains": null,
+			"presentable": false,
+			"required": false,
+			"system": true,
+			"type": "email"
+		}`)); err != nil {
+			return err
+		}
+
+		return app.Save(collection)
+	})
+}

beszel/migrations/collections_snapshot_0_10_2.go

@@ -1,676 +0,0 @@
-package migrations
-
-import (
-	"github.com/pocketbase/pocketbase/core"
-	m "github.com/pocketbase/pocketbase/migrations"
-)
-
-func init() {
-	m.Register(func(app core.App) error {
-		// delete duplicate alerts
-		app.DB().NewQuery(`
-		DELETE FROM alerts
-		WHERE rowid NOT IN (
-				SELECT MAX(rowid)
-				FROM alerts
-				GROUP BY user, system, name
-		);
-	`).Execute()
-
-		// import collections
-		jsonData := `[
-	{
-		"id": "elngm8x1l60zi2v",
-		"listRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"viewRule": "",
-		"createRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"updateRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"deleteRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"name": "alerts",
-		"type": "base",
-		"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": "_pb_users_auth_",
-				"hidden": false,
-				"id": "hn5ly3vi",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "user",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "2hz5ncl8tizk5nx",
-				"hidden": false,
-				"id": "g5sl3jdg",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"hidden": false,
-				"id": "zj3ingrv",
-				"maxSelect": 1,
-				"name": "name",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "select",
-				"values": [
-					"Status",
-					"CPU",
-					"Memory",
-					"Disk",
-					"Temperature",
-					"Bandwidth"
-				]
-			},
-			{
-				"hidden": false,
-				"id": "o2ablxvn",
-				"max": null,
-				"min": null,
-				"name": "value",
-				"onlyInt": false,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "fstdehcq",
-				"max": 60,
-				"min": null,
-				"name": "min",
-				"onlyInt": true,
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "number"
-			},
-			{
-				"hidden": false,
-				"id": "6hgdf6hs",
-				"name": "triggered",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "bool"
-			},
-			{
-				"hidden": false,
-				"id": "autodate2990389176",
-				"name": "created",
-				"onCreate": true,
-				"onUpdate": false,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"indexes": [
-			"CREATE UNIQUE INDEX ` + "`" + `idx_MnhEt21L5r` + "`" + ` ON ` + "`" + `alerts` + "`" + ` (\n  ` + "`" + `user` + "`" + `,\n  ` + "`" + `system` + "`" + `,\n  ` + "`" + `name` + "`" + `\n)"
-		],
-		"system": false
-	},
-	{
-		"id": "juohu4jipgc13v7",
-		"listRule": "@request.auth.id != \"\"",
-		"viewRule": null,
-		"createRule": null,
-		"updateRule": null,
-		"deleteRule": null,
-		"name": "container_stats",
-		"type": "base",
-		"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": "hutcu6ps",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"hidden": false,
-				"id": "r39hhnil",
-				"maxSize": 2000000,
-				"name": "stats",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "json"
-			},
-			{
-				"hidden": false,
-				"id": "vo7iuj96",
-				"maxSelect": 1,
-				"name": "type",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "select",
-				"values": [
-					"1m",
-					"10m",
-					"20m",
-					"120m",
-					"480m"
-				]
-			},
-			{
-				"hidden": false,
-				"id": "autodate2990389176",
-				"name": "created",
-				"onCreate": true,
-				"onUpdate": false,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"indexes": [
-			"CREATE INDEX ` + "`" + `idx_d87OiXGZD8` + "`" + ` ON ` + "`" + `container_stats` + "`" + ` (\n  ` + "`" + `system` + "`" + `,\n  ` + "`" + `type` + "`" + `,\n  ` + "`" + `created` + "`" + `\n)"
-		],
-		"system": false
-	},
-	{
-		"id": "ej9oowivz8b2mht",
-		"listRule": "@request.auth.id != \"\"",
-		"viewRule": null,
-		"createRule": null,
-		"updateRule": null,
-		"deleteRule": null,
-		"name": "system_stats",
-		"type": "base",
-		"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": "h9sg148r",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "system",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"hidden": false,
-				"id": "azftn0be",
-				"maxSize": 2000000,
-				"name": "stats",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "json"
-			},
-			{
-				"hidden": false,
-				"id": "m1ekhli3",
-				"maxSelect": 1,
-				"name": "type",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "select",
-				"values": [
-					"1m",
-					"10m",
-					"20m",
-					"120m",
-					"480m"
-				]
-			},
-			{
-				"hidden": false,
-				"id": "autodate2990389176",
-				"name": "created",
-				"onCreate": true,
-				"onUpdate": false,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"indexes": [
-			"CREATE INDEX ` + "`" + `idx_GxIee0j` + "`" + ` ON ` + "`" + `system_stats` + "`" + ` (\n  ` + "`" + `system` + "`" + `,\n  ` + "`" + `type` + "`" + `,\n  ` + "`" + `created` + "`" + `\n)"
-		],
-		"system": false
-	},
-	{
-		"id": "4afacsdnlu8q8r2",
-		"listRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"viewRule": null,
-		"createRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"updateRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
-		"deleteRule": null,
-		"name": "user_settings",
-		"type": "base",
-		"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": "_pb_users_auth_",
-				"hidden": false,
-				"id": "d5vztyxa",
-				"maxSelect": 1,
-				"minSelect": 0,
-				"name": "user",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"hidden": false,
-				"id": "xcx4qgqq",
-				"maxSize": 2000000,
-				"name": "settings",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "json"
-			},
-			{
-				"hidden": false,
-				"id": "autodate2990389176",
-				"name": "created",
-				"onCreate": true,
-				"onUpdate": false,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"indexes": [
-			"CREATE UNIQUE INDEX ` + "`" + `idx_30Lwgf2` + "`" + ` ON ` + "`" + `user_settings` + "`" + ` (` + "`" + `user` + "`" + `)"
-		],
-		"system": false
-	},
-	{
-		"id": "2hz5ncl8tizk5nx",
-		"listRule": "@request.auth.id != \"\" && users.id ?= @request.auth.id",
-		"viewRule": "@request.auth.id != \"\" && users.id ?= @request.auth.id",
-		"createRule": "@request.auth.id != \"\" && users.id ?= @request.auth.id && @request.auth.role != \"readonly\"",
-		"updateRule": "@request.auth.id != \"\" && users.id ?= @request.auth.id && @request.auth.role != \"readonly\"",
-		"deleteRule": "@request.auth.id != \"\" && users.id ?= @request.auth.id && @request.auth.role != \"readonly\"",
-		"name": "systems",
-		"type": "base",
-		"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"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "7xloxkwk",
-				"max": 0,
-				"min": 0,
-				"name": "name",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": true,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "waj7seaf",
-				"maxSelect": 1,
-				"name": "status",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "select",
-				"values": [
-					"up",
-					"down",
-					"paused",
-					"pending"
-				]
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "ve781smf",
-				"max": 0,
-				"min": 0,
-				"name": "host",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": true,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"autogeneratePattern": "",
-				"hidden": false,
-				"id": "pij0k2jk",
-				"max": 0,
-				"min": 0,
-				"name": "port",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "qoq64ntl",
-				"maxSize": 2000000,
-				"name": "info",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "json"
-			},
-			{
-				"cascadeDelete": true,
-				"collectionId": "_pb_users_auth_",
-				"hidden": false,
-				"id": "jcarjnjj",
-				"maxSelect": 2147483647,
-				"minSelect": 0,
-				"name": "users",
-				"presentable": false,
-				"required": true,
-				"system": false,
-				"type": "relation"
-			},
-			{
-				"hidden": false,
-				"id": "autodate2990389176",
-				"name": "created",
-				"onCreate": true,
-				"onUpdate": false,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"indexes": [],
-		"system": false
-	},
-	{
-		"id": "_pb_users_auth_",
-		"listRule": "id = @request.auth.id",
-		"viewRule": "id = @request.auth.id",
-		"createRule": null,
-		"updateRule": null,
-		"deleteRule": null,
-		"name": "users",
-		"type": "auth",
-		"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"
-			},
-			{
-				"cost": 10,
-				"hidden": true,
-				"id": "password901924565",
-				"max": 0,
-				"min": 8,
-				"name": "password",
-				"pattern": "",
-				"presentable": false,
-				"required": true,
-				"system": true,
-				"type": "password"
-			},
-			{
-				"autogeneratePattern": "[a-zA-Z0-9_]{50}",
-				"hidden": true,
-				"id": "text2504183744",
-				"max": 60,
-				"min": 30,
-				"name": "tokenKey",
-				"pattern": "",
-				"presentable": false,
-				"primaryKey": false,
-				"required": true,
-				"system": true,
-				"type": "text"
-			},
-			{
-				"exceptDomains": null,
-				"hidden": false,
-				"id": "email3885137012",
-				"name": "email",
-				"onlyDomains": null,
-				"presentable": false,
-				"required": true,
-				"system": true,
-				"type": "email"
-			},
-			{
-				"hidden": false,
-				"id": "bool1547992806",
-				"name": "emailVisibility",
-				"presentable": false,
-				"required": false,
-				"system": true,
-				"type": "bool"
-			},
-			{
-				"hidden": false,
-				"id": "bool256245529",
-				"name": "verified",
-				"presentable": false,
-				"required": false,
-				"system": true,
-				"type": "bool"
-			},
-			{
-				"autogeneratePattern": "users[0-9]{6}",
-				"hidden": false,
-				"id": "text4166911607",
-				"max": 150,
-				"min": 3,
-				"name": "username",
-				"pattern": "^[\\w][\\w\\.\\-]*$",
-				"presentable": false,
-				"primaryKey": false,
-				"required": false,
-				"system": false,
-				"type": "text"
-			},
-			{
-				"hidden": false,
-				"id": "qkbp58ae",
-				"maxSelect": 1,
-				"name": "role",
-				"presentable": false,
-				"required": false,
-				"system": false,
-				"type": "select",
-				"values": [
-					"user",
-					"admin",
-					"readonly"
-				]
-			},
-			{
-				"hidden": false,
-				"id": "autodate2990389176",
-				"name": "created",
-				"onCreate": true,
-				"onUpdate": false,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			},
-			{
-				"hidden": false,
-				"id": "autodate3332085495",
-				"name": "updated",
-				"onCreate": true,
-				"onUpdate": true,
-				"presentable": false,
-				"system": false,
-				"type": "autodate"
-			}
-		],
-		"indexes": [
-			"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__username_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (username COLLATE NOCASE)",
-			"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__email_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `email` + "`" + `) WHERE ` + "`" + `email` + "`" + ` != ''",
-			"CREATE UNIQUE INDEX ` + "`" + `__pb_users_auth__tokenKey_idx` + "`" + ` ON ` + "`" + `users` + "`" + ` (` + "`" + `tokenKey` + "`" + `)"
-		],
-		"system": false,
-		"authRule": "verified=true",
-		"manageRule": null
-	}
-]`
-
-		return app.ImportCollectionsByMarshaledJSON([]byte(jsonData), false)
-	}, func(app core.App) error {
-		return nil
-	})
-}

beszel/site/index.html

@@ -6,12 +6,7 @@
 		<link rel="icon" type="image/svg+xml" href="./static/favicon.svg" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Beszel</title>
-		<script>
-			globalThis.BESZEL = {
-				BASE_PATH: "%BASE_URL%",
-				HUB_VERSION: "{{V}}"
-			}
-		</script>
+		<script>window.BASE_PATH = "%BASE_URL%"</script>
 	</head>
 	<body>
 		<div id="app"></div>

beszel/site/lingui.config.ts

@@ -1,6 +1,6 @@
-import { defineConfig } from "@lingui/cli"
+import type { LinguiConfig } from "@lingui/conf"
 
-export default defineConfig({
+const config: LinguiConfig = {
 	locales: [
 		"en",
 		"ar",
@@ -33,13 +33,12 @@ export default defineConfig({
 	],
 	sourceLocale: "en",
 	compileNamespace: "ts",
-	formatOptions: {
-		lineNumbers: false,
-	},
 	catalogs: [
 		{
 			path: "<rootDir>/src/locales/{locale}/{locale}",
 			include: ["src"],
 		},
 	],
-})
+}
+
+export default config

beszel/site/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "beszel",
 	"private": true,
-	"version": "0.11.1",
+	"version": "0.0.0",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -12,10 +12,9 @@
 	},
 	"dependencies": {
 		"@henrygd/queue": "^1.0.7",
-		"@henrygd/semaphore": "^0.0.2",
-		"@lingui/detect-locale": "^5.2.0",
-		"@lingui/macro": "^5.2.0",
-		"@lingui/react": "^5.2.0",
+		"@lingui/detect-locale": "^4.14.1",
+		"@lingui/macro": "^4.14.1",
+		"@lingui/react": "^4.14.1",
 		"@nanostores/react": "^0.7.3",
 		"@nanostores/router": "^0.11.0",
 		"@radix-ui/react-alert-dialog": "^1.1.6",
@@ -32,35 +31,35 @@
 		"@radix-ui/react-tabs": "^1.1.3",
 		"@radix-ui/react-toast": "^1.2.6",
 		"@radix-ui/react-tooltip": "^1.1.8",
-		"@tanstack/react-table": "^8.21.2",
+		"@tanstack/react-table": "^8.20.6",
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
 		"cmdk": "^1.0.4",
 		"d3-time": "^3.1.0",
 		"lucide-react": "^0.452.0",
-		"nanostores": "^0.11.4",
-		"pocketbase": "^0.25.2",
+		"nanostores": "^0.11.3",
+		"pocketbase": "^0.25.1",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
 		"recharts": "^2.15.1",
 		"tailwind-merge": "^2.6.0",
 		"tailwindcss-animate": "^1.0.7",
-		"valibot": "^0.42.0"
+		"valibot": "^0.36.0"
 	},
 	"devDependencies": {
-		"@lingui/cli": "^5.2.0",
-		"@lingui/swc-plugin": "^5.5.0",
-		"@lingui/vite-plugin": "^5.2.0",
-		"@types/bun": "^1.2.4",
-		"@types/react": "^18.3.1",
-		"@types/react-dom": "^18.3.1",
-		"@vitejs/plugin-react-swc": "^3.8.0",
+		"@lingui/cli": "^4.14.1",
+		"@lingui/swc-plugin": "^4.1.0",
+		"@lingui/vite-plugin": "^4.14.1",
+		"@types/bun": "^1.2.2",
+		"@types/react": "^18.3.18",
+		"@types/react-dom": "^18.3.5",
+		"@vitejs/plugin-react-swc": "^3.7.2",
 		"autoprefixer": "^10.4.20",
-		"postcss": "^8.5.3",
+		"postcss": "^8.5.1",
 		"tailwindcss": "^3.4.17",
 		"tailwindcss-rtl": "^0.9.0",
-		"typescript": "^5.8.2",
-		"vite": "^6.2.0"
+		"typescript": "^5.7.3",
+		"vite": "^5.4.14"
 	},
 	"overrides": {
 		"@nanostores/router": {
@@ -70,4 +69,4 @@
 	"optionalDependencies": {
 		"@esbuild/linux-arm64": "^0.21.5"
 	}
-}
+}

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

@@ -1,5 +1,3 @@
-import { Trans } from "@lingui/react/macro"
-import { t } from "@lingui/core/macro"
 import { Button } from "@/components/ui/button"
 import {
 	Dialog,
@@ -16,15 +14,15 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { $publicKey, pb } from "@/lib/stores"
-import { cn, copyToClipboard, isReadOnlyUser, useLocalStorage } from "@/lib/utils"
+import { cn, copyToClipboard, isReadOnlyUser } from "@/lib/utils"
 import { i18n } from "@lingui/core"
+import { t, Trans } from "@lingui/macro"
 import { useStore } from "@nanostores/react"
-import { ChevronDownIcon, Copy, ExternalLinkIcon, PlusIcon } from "lucide-react"
+import { ChevronDownIcon, Copy, PlusIcon } from "lucide-react"
 import { memo, useRef, useState } from "react"
 import { basePath, navigate } from "./router"
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "./ui/dropdown-menu"
 import { SystemRecord } from "@/types"
-import { AppleIcon, DockerIcon, TuxIcon, WindowsIcon } from "./ui/icons"
 
 export function AddSystemButton({ className }: { className?: string }) {
 	const [open, setOpen] = useState(false)
@@ -63,33 +61,25 @@ function copyDockerCompose(port = "45876", publicKey: string) {
       # monitor other disks / partitions by mounting a folder in /extra-filesystems
       # - /mnt/disk/.beszel:/extra-filesystems/sda1:ro
     environment:
-      LISTEN: ${port}
+      PORT: ${port}
       KEY: "${publicKey}"`)
 }
 
 function copyDockerRun(port = "45876", publicKey: string) {
 	copyToClipboard(
-		`docker run -d --name beszel-agent --network host --restart unless-stopped -v /var/run/docker.sock:/var/run/docker.sock:ro -e KEY="${publicKey}" -e LISTEN=${port} henrygd/beszel-agent:latest`
+		`docker run -d --name beszel-agent --network host --restart unless-stopped -v /var/run/docker.sock:/var/run/docker.sock:ro -e KEY="${publicKey}" -e PORT=${port} henrygd/beszel-agent:latest`
 	)
 }
 
-function copyLinuxCommand(port = "45876", publicKey: string, brew = false) {
-	let cmd = `curl -sL https://get.beszel.dev${
-		brew ? "/brew" : ""
-	} -o /tmp/install-agent.sh && chmod +x /tmp/install-agent.sh && /tmp/install-agent.sh -p ${port} -k "${publicKey}"`
-	// brew script does not support --china-mirrors
-	if (!brew && (i18n.locale + navigator.language).includes("zh-CN")) {
+function copyInstallCommand(port = "45876", publicKey: string) {
+	let cmd = `curl -sL https://raw.githubusercontent.com/henrygd/beszel/main/supplemental/scripts/install-agent.sh -o install-agent.sh && chmod +x install-agent.sh && ./install-agent.sh -p ${port} -k "${publicKey}"`
+	// add china mirrors flag if zh-CN
+	if ((i18n.locale + navigator.language).includes("zh-CN")) {
 		cmd += ` --china-mirrors`
 	}
 	copyToClipboard(cmd)
 }
 
-function copyWindowsCommand(port = "45876", publicKey: string) {
-	copyToClipboard(
-		`& iwr -useb https://get.beszel.dev -OutFile "$env:TEMP\\install-agent.ps1"; & Powershell -ExecutionPolicy Bypass -File "$env:TEMP\\install-agent.ps1" -Key "${publicKey}" -Port ${port}`
-	)
-}
-
 /**
  * SystemDialog component for adding or editing a system.
  * @param {Object} props - The component props.
@@ -101,7 +91,6 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 	const port = useRef<HTMLInputElement>(null)
 	const [hostValue, setHostValue] = useState(system?.host ?? "")
 	const isUnixSocket = hostValue.startsWith("/")
-	const [tab, setTab] = useLocalStorage("as-tab", "docker")
 
 	async function handleSubmit(e: SubmitEvent) {
 		e.preventDefault()
@@ -129,7 +118,7 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 				setHostValue(system?.host ?? "")
 			}}
 		>
-			<Tabs defaultValue={tab} onValueChange={setTab}>
+			<Tabs defaultValue="docker">
 				<DialogHeader>
 					<DialogTitle className="mb-2">
 						{system ? `${t`Edit`} ${system?.name}` : <Trans>Add New System</Trans>}
@@ -151,7 +140,7 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 					</DialogDescription>
 				</TabsContent>
 				{/* Binary */}
-				<TabsContent value="binary" tabIndex={-1}>
+				<TabsContent value="binary">
 					<DialogDescription className="mb-4 leading-normal w-0 min-w-full">
 						<Trans>
 							The agent must be running on the system to connect. Copy the installation command for the agent below.
@@ -206,7 +195,7 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 											className="absolute end-0 top-0"
 											onClick={() => copyToClipboard(publicKey)}
 										>
-											<Copy className="size-4" />
+											<Copy className="h-4 w-4 " />
 										</Button>
 									</TooltipTrigger>
 									<TooltipContent>
@@ -222,41 +211,19 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 						{/* Docker */}
 						<TabsContent value="docker" className="contents">
 							<CopyButton
-								text={t({ message: "Copy docker compose", context: "Button to copy docker compose file content" })}
+								text={t`Copy` + " docker compose"}
 								onClick={() => copyDockerCompose(isUnixSocket ? hostValue : port.current?.value, publicKey)}
-								icon={<DockerIcon className="size-4 -me-0.5" />}
-								dropdownItems={[
-									{
-										text: t({ message: "Copy docker run", context: "Button to copy docker run command" }),
-										onClick: () => copyDockerRun(isUnixSocket ? hostValue : port.current?.value, publicKey),
-										icons: [<DockerIcon className="size-4" />],
-									},
-								]}
+								dropdownText={t`Copy` + " docker run"}
+								dropdownOnClick={() => copyDockerRun(isUnixSocket ? hostValue : port.current?.value, publicKey)}
 							/>
 						</TabsContent>
 						{/* Binary */}
 						<TabsContent value="binary" className="contents">
 							<CopyButton
 								text={t`Copy Linux command`}
-								icon={<TuxIcon className="size-4" />}
-								onClick={() => copyLinuxCommand(isUnixSocket ? hostValue : port.current?.value, publicKey)}
-								dropdownItems={[
-									{
-										text: t({ message: "Homebrew command", context: "Button to copy install command" }),
-										onClick: () => copyLinuxCommand(isUnixSocket ? hostValue : port.current?.value, publicKey, true),
-										icons: [<AppleIcon className="size-4" />, <TuxIcon className="w-4 h-4" />],
-									},
-									{
-										text: t({ message: "Windows command", context: "Button to copy install command" }),
-										onClick: () => copyWindowsCommand(isUnixSocket ? hostValue : port.current?.value, publicKey),
-										icons: [<WindowsIcon className="size-4" />],
-									},
-									{
-										text: t`Manual setup instructions`,
-										url: "https://beszel.dev/guide/agent-installation#binary",
-										icons: [<ExternalLinkIcon className="size-4" />],
-									},
-								]}
+								onClick={() => copyInstallCommand(isUnixSocket ? hostValue : port.current?.value, publicKey)}
+								dropdownText={t`Manual setup instructions`}
+								dropdownUrl="https://beszel.dev/guide/agent-installation#binary"
 							/>
 						</TabsContent>
 						{/* Save */}
@@ -268,30 +235,19 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 	)
 })
 
-interface DropdownItem {
-	text: string
-	onClick?: () => void
-	url?: string
-	icons?: React.ReactNode[]
-}
-
 interface CopyButtonProps {
 	text: string
 	onClick: () => void
-	dropdownItems: DropdownItem[]
-	icon?: React.ReactNode
+	dropdownText: string
+	dropdownOnClick?: () => void
+	dropdownUrl?: string
 }
 
 const CopyButton = memo((props: CopyButtonProps) => {
 	return (
 		<div className="flex gap-0 rounded-lg">
-			<Button
-				type="button"
-				variant="outline"
-				onClick={props.onClick}
-				className="rounded-e-none dark:border-e-0 grow flex items-center gap-2"
-			>
-				{props.text} {props.icon}
+			<Button type="button" variant="outline" onClick={props.onClick} className="rounded-e-none dark:border-e-0 grow">
+				{props.text}
 			</Button>
 			<div className="w-px h-full bg-muted"></div>
 			<DropdownMenu>
@@ -301,20 +257,15 @@ const CopyButton = memo((props: CopyButtonProps) => {
 					</Button>
 				</DropdownMenuTrigger>
 				<DropdownMenuContent align="end">
-					{props.dropdownItems.map((item, index) => {
-						const className = "cursor-pointer flex items-center gap-1.5"
-						return item.url ? (
-							<DropdownMenuItem key={index} asChild>
-								<a href={item.url} className={className} target="_blank" rel="noopener noreferrer">
-									{item.text} {item.icons?.map((icon) => icon)}
-								</a>
-							</DropdownMenuItem>
-						) : (
-							<DropdownMenuItem key={index} onClick={item.onClick} className={className}>
-								{item.text} {item.icons?.map((icon) => icon)}
-							</DropdownMenuItem>
-						)
-					})}
+					{props.dropdownUrl ? (
+						<DropdownMenuItem asChild>
+							<a href={props.dropdownUrl} target="_blank" rel="noopener noreferrer">
+								{props.dropdownText}
+							</a>
+						</DropdownMenuItem>
+					) : (
+						<DropdownMenuItem onClick={props.dropdownOnClick}>{props.dropdownText}</DropdownMenuItem>
+					)}
 				</DropdownMenuContent>
 			</DropdownMenu>
 		</div>

beszel/site/src/components/alerts/alert-button.tsx

@@ -1,8 +1,6 @@
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
-import { memo, useMemo, useState } from "react"
+import { memo, useState } from "react"
 import { useStore } from "@nanostores/react"
-import { $alerts } from "@/lib/stores"
+import { $alerts, $systems } from "@/lib/stores"
 import {
 	Dialog,
 	DialogTrigger,
@@ -15,119 +13,108 @@ import { BellIcon, GlobeIcon, ServerIcon } from "lucide-react"
 import { alertInfo, cn } from "@/lib/utils"
 import { Button } from "@/components/ui/button"
 import { AlertRecord, SystemRecord } from "@/types"
-import { $router, Link } from "../router"
+import { Link } from "../router"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
 import { Checkbox } from "../ui/checkbox"
 import { SystemAlert, SystemAlertGlobal } from "./alerts-system"
-import { getPagePath } from "@nanostores/router"
+import { Trans, t } from "@lingui/macro"
 
 export default memo(function AlertsButton({ system }: { system: SystemRecord }) {
 	const alerts = useStore($alerts)
 	const [opened, setOpened] = useState(false)
 
-	const hasAlert = alerts.some((alert) => alert.system === system.id)
+	const systemAlerts = alerts.filter((alert) => alert.system === system.id) as AlertRecord[]
+	const active = systemAlerts.length > 0
 
-	return useMemo(
-		() => (
-			<Dialog>
-				<DialogTrigger asChild>
-					<Button variant="ghost" size="icon" aria-label={t`Alerts`} data-nolink onClick={() => setOpened(true)}>
-						<BellIcon
-							className={cn("h-[1.2em] w-[1.2em] pointer-events-none", {
-								"fill-primary": hasAlert,
-							})}
-						/>
-					</Button>
-				</DialogTrigger>
-				<DialogContent className="max-h-full overflow-auto max-w-[35rem]">
-					{opened && <AlertDialogContent system={system} />}
-				</DialogContent>
-			</Dialog>
-		),
-		[opened, hasAlert]
+	return (
+		<Dialog>
+			<DialogTrigger asChild>
+				<Button variant="ghost" size="icon" aria-label={t`Alerts`} data-nolink onClick={() => setOpened(true)}>
+					<BellIcon
+						className={cn("h-[1.2em] w-[1.2em] pointer-events-none", {
+							"fill-primary": active,
+						})}
+					/>
+				</Button>
+			</DialogTrigger>
+			<DialogContent className="max-h-full overflow-auto max-w-[35rem]">
+				{opened && <TheContent data={{ system, alerts, systemAlerts }} />}
+			</DialogContent>
+		</Dialog>
 	)
 })
 
-function AlertDialogContent({ system }: { system: SystemRecord }) {
-	const alerts = useStore($alerts)
+function TheContent({
+	data: { system, alerts, systemAlerts },
+}: {
+	data: { system: SystemRecord; alerts: AlertRecord[]; systemAlerts: AlertRecord[] }
+}) {
 	const [overwriteExisting, setOverwriteExisting] = useState<boolean | "indeterminate">(false)
+	const systems = $systems.get()
 
-	// alertsSignature changes only when alerts for this system change
-	let alertsSignature = ""
-	const systemAlerts = alerts.filter((alert) => {
-		if (alert.system === system.id) {
-			alertsSignature += alert.name + alert.min + alert.value
-			return true
+	const data = Object.keys(alertInfo).map((key) => {
+		const alert = alertInfo[key as keyof typeof alertInfo]
+		return {
+			key: key as keyof typeof alertInfo,
+			alert,
+			system,
 		}
-		return false
-	}) as AlertRecord[]
+	})
 
-	return useMemo(() => {
-		// console.log("render modal", system.name, alertsSignature)
-		const data = Object.keys(alertInfo).map((name) => {
-			const alert = alertInfo[name as keyof typeof alertInfo]
-			return {
-				name: name as keyof typeof alertInfo,
-				alert,
-				system,
-			}
-		})
-
-		return (
-			<>
-				<DialogHeader>
-					<DialogTitle className="text-xl">
-						<Trans>Alerts</Trans>
-					</DialogTitle>
-					<DialogDescription>
-						<Trans>
-							See{" "}
-							<Link href={getPagePath($router, "settings", { name: "notifications" })} className="link">
-								notification settings
-							</Link>{" "}
-							to configure how you receive alerts.
-						</Trans>
-					</DialogDescription>
-				</DialogHeader>
-				<Tabs defaultValue="system">
-					<TabsList className="mb-1 -mt-0.5">
-						<TabsTrigger value="system">
-							<ServerIcon className="me-2 h-3.5 w-3.5" />
-							{system.name}
-						</TabsTrigger>
-						<TabsTrigger value="global">
-							<GlobeIcon className="me-1.5 h-3.5 w-3.5" />
-							<Trans>All Systems</Trans>
-						</TabsTrigger>
-					</TabsList>
-					<TabsContent value="system">
-						<div className="grid gap-3">
-							{data.map((d) => (
-								<SystemAlert key={d.name} system={system} data={d} systemAlerts={systemAlerts} />
-							))}
-						</div>
-					</TabsContent>
-					<TabsContent value="global">
-						<label
-							htmlFor="ovw"
-							className="mb-3 flex gap-2 items-center justify-center cursor-pointer border rounded-sm py-3 px-4 border-destructive text-destructive font-semibold text-sm"
-						>
-							<Checkbox
-								id="ovw"
-								className="text-destructive border-destructive data-[state=checked]:bg-destructive"
-								checked={overwriteExisting}
-								onCheckedChange={setOverwriteExisting}
-							/>
-							<Trans>Overwrite existing alerts</Trans>
-						</label>
-						<div className="grid gap-3">
-							{data.map((d) => (
-								<SystemAlertGlobal key={d.name} data={d} overwrite={overwriteExisting} />
-							))}
-						</div>
-					</TabsContent>
-				</Tabs>
-			</>
-		)
-	}, [alertsSignature, overwriteExisting])
+	return (
+		<>
+			<DialogHeader>
+				<DialogTitle className="text-xl">
+					<Trans>Alerts</Trans>
+				</DialogTitle>
+				<DialogDescription>
+					<Trans>
+						See{" "}
+						<Link href="/settings/notifications" className="link">
+							notification settings
+						</Link>{" "}
+						to configure how you receive alerts.
+					</Trans>
+				</DialogDescription>
+			</DialogHeader>
+			<Tabs defaultValue="system">
+				<TabsList className="mb-1 -mt-0.5">
+					<TabsTrigger value="system">
+						<ServerIcon className="me-2 h-3.5 w-3.5" />
+						{system.name}
+					</TabsTrigger>
+					<TabsTrigger value="global">
+						<GlobeIcon className="me-1.5 h-3.5 w-3.5" />
+						<Trans>All Systems</Trans>
+					</TabsTrigger>
+				</TabsList>
+				<TabsContent value="system">
+					<div className="grid gap-3">
+						{data.map((d) => (
+							<SystemAlert key={d.key} system={system} data={d} systemAlerts={systemAlerts} />
+						))}
+					</div>
+				</TabsContent>
+				<TabsContent value="global">
+					<label
+						htmlFor="ovw"
+						className="mb-3 flex gap-2 items-center justify-center cursor-pointer border rounded-sm py-3 px-4 border-destructive text-destructive font-semibold text-sm"
+					>
+						<Checkbox
+							id="ovw"
+							className="text-destructive border-destructive data-[state=checked]:bg-destructive"
+							checked={overwriteExisting}
+							onCheckedChange={setOverwriteExisting}
+						/>
+						<Trans>Overwrite existing alerts</Trans>
+					</label>
+					<div className="grid gap-3">
+						{data.map((d) => (
+							<SystemAlertGlobal key={d.key} data={d} overwrite={overwriteExisting} alerts={alerts} systems={systems} />
+						))}
+					</div>
+				</TabsContent>
+			</Tabs>
+		</>
+	)
 }

beszel/site/src/components/alerts/alerts-system.tsx

@@ -1,20 +1,18 @@
-import { t } from "@lingui/core/macro"
-import { Trans, Plural } from "@lingui/react/macro"
-import { $alerts, $systems, pb } from "@/lib/stores"
+import { pb } from "@/lib/stores"
 import { alertInfo, cn } from "@/lib/utils"
 import { Switch } from "@/components/ui/switch"
 import { AlertInfo, AlertRecord, SystemRecord } from "@/types"
-import { lazy, Suspense, useMemo, useState } from "react"
+import { lazy, Suspense, useRef, useState } from "react"
 import { toast } from "../ui/use-toast"
-import { BatchService } from "pocketbase"
-import { getSemaphore } from "@henrygd/semaphore"
+import { RecordOptions } from "pocketbase"
+import { Trans, t, Plural } from "@lingui/macro"
 
 interface AlertData {
 	checked?: boolean
 	val?: number
 	min?: number
 	updateAlert?: (checked: boolean, value: number, min: number) => void
-	name: keyof typeof alertInfo
+	key: keyof typeof alertInfo
 	alert: AlertInfo
 	system: SystemRecord
 }
@@ -37,7 +35,7 @@ export function SystemAlert({
 	systemAlerts: AlertRecord[]
 	data: AlertData
 }) {
-	const alert = systemAlerts.find((alert) => alert.name === data.name)
+	const alert = systemAlerts.find((alert) => alert.name === data.key)
 
 	data.updateAlert = async (checked: boolean, value: number, min: number) => {
 		try {
@@ -49,7 +47,7 @@ export function SystemAlert({
 				pb.collection("alerts").create({
 					system: system.id,
 					user: pb.authStore.record!.id,
-					name: data.name,
+					name: data.key,
 					value: value,
 					min: min,
 				})
@@ -68,150 +66,99 @@ export function SystemAlert({
 	return <AlertContent data={data} />
 }
 
-export const SystemAlertGlobal = ({ data, overwrite }: { data: AlertData; overwrite: boolean | "indeterminate" }) => {
+export function SystemAlertGlobal({
+	data,
+	overwrite,
+	alerts,
+	systems,
+}: {
+	data: AlertData
+	overwrite: boolean | "indeterminate"
+	alerts: AlertRecord[]
+	systems: SystemRecord[]
+}) {
+	const systemsWithExistingAlerts = useRef<{ set: Set<string>; populatedSet: boolean }>({
+		set: new Set(),
+		populatedSet: false,
+	})
+
 	data.checked = false
 	data.val = data.min = 0
 
-	// set of system ids that have an alert for this name when the component is mounted
-	const existingAlertsSystems = useMemo(() => {
-		const map = new Set<string>()
-		const alerts = $alerts.get()
-		for (const alert of alerts) {
-			if (alert.name === data.name) {
-				map.add(alert.system)
-			}
-		}
-		return map
-	}, [])
-
 	data.updateAlert = async (checked: boolean, value: number, min: number) => {
-		const sem = getSemaphore("alerts")
-		await sem.acquire()
-		try {
-			// if another update is waiting behind, don't start this one
-			if (sem.size() > 1) {
-				return
-			}
+		const { set, populatedSet } = systemsWithExistingAlerts.current
 
-			const recordData: Partial<AlertRecord> = {
-				value,
-				min,
-				triggered: false,
-			}
+		// if overwrite checked, make sure all alerts will be overwritten
+		if (overwrite) {
+			set.clear()
+		}
 
-			const batch = batchWrapper("alerts", 25)
-			const systems = $systems.get()
-			const currentAlerts = $alerts.get()
+		const recordData: Partial<AlertRecord> = {
+			value,
+			min,
+			triggered: false,
+		}
 
-			// map of current alerts with this name right now by system id
-			const currentAlertsSystems = new Map<string, AlertRecord>()
-			for (const alert of currentAlerts) {
-				if (alert.name === data.name) {
-					currentAlertsSystems.set(alert.system, alert)
-				}
-			}
+		// we can only send 50 in one batch
+		let done = 0
 
-			if (overwrite) {
-				existingAlertsSystems.clear()
-			}
+		while (done < systems.length) {
+			const batch = pb.createBatch()
+			let batchSize = 0
 
-			const processSystem = async (system: SystemRecord): Promise<void> => {
-				const existingAlert = existingAlertsSystems.has(system.id)
-
-				if (!overwrite && existingAlert) {
-					return
-				}
-
-				const currentAlert = currentAlertsSystems.get(system.id)
-
-				// delete existing alert if unchecked
-				if (!checked && currentAlert) {
-					return batch.remove(currentAlert.id)
-				}
-				if (checked && currentAlert) {
-					// update existing alert if checked
-					return batch.update(currentAlert.id, recordData)
-				}
-				if (checked) {
-					// create new alert if checked and not existing
-					return batch.create({
-						system: system.id,
-						user: pb.authStore.record!.id,
-						name: data.name,
-						...recordData,
-					})
-				}
-			}
-
-			// make sure current system is updated in the first batch
-			await processSystem(data.system)
-			for (const system of systems) {
-				if (system.id === data.system.id) {
+			for (let i = done; i < Math.min(done + 50, systems.length); i++) {
+				const system = systems[i]
+				// if overwrite is false and system is in set (alert existed), skip
+				if (!overwrite && set.has(system.id)) {
 					continue
 				}
-				if (sem.size() > 1) {
-					return
+				// find matching existing alert
+				const existingAlert = alerts.find((alert) => alert.system === system.id && data.key === alert.name)
+				// if first run, add system to set (alert already existed when global panel was opened)
+				if (existingAlert && !populatedSet && !overwrite) {
+					set.add(system.id)
+					continue
+				}
+				batchSize++
+				const requestOptions: RecordOptions = {
+					requestKey: system.id,
+				}
+
+				// checked - make sure alert is created or updated
+				if (checked) {
+					if (existingAlert) {
+						batch.collection("alerts").update(existingAlert.id, recordData, requestOptions)
+					} else {
+						batch.collection("alerts").create(
+							{
+								system: system.id,
+								user: pb.authStore.record!.id,
+								name: data.key,
+								...recordData,
+							},
+							requestOptions
+						)
+					}
+				} else if (existingAlert) {
+					batch.collection("alerts").delete(existingAlert.id)
 				}
-				await processSystem(system)
 			}
-			await batch.send()
-		} finally {
-			sem.release()
+			try {
+				batchSize && batch.send()
+			} catch (e) {
+				failedUpdateToast()
+			} finally {
+				done += 50
+			}
 		}
+		systemsWithExistingAlerts.current.populatedSet = true
 	}
 
 	return <AlertContent data={data} />
 }
 
-/**
- * Creates a wrapper for performing batch operations on a specified collection.
- */
-function batchWrapper(collection: string, batchSize: number) {
-	let batch: BatchService | undefined
-	let count = 0
-
-	const create = async <T extends Record<string, any>>(options: T) => {
-		batch ||= pb.createBatch()
-		batch.collection(collection).create(options)
-		if (++count >= batchSize) {
-			await send()
-		}
-	}
-
-	const update = async <T extends Record<string, any>>(id: string, data: T) => {
-		batch ||= pb.createBatch()
-		batch.collection(collection).update(id, data)
-		if (++count >= batchSize) {
-			await send()
-		}
-	}
-
-	const remove = async (id: string) => {
-		batch ||= pb.createBatch()
-		batch.collection(collection).delete(id)
-		if (++count >= batchSize) {
-			await send()
-		}
-	}
-
-	const send = async () => {
-		if (count) {
-			await batch?.send({ requestKey: null })
-			batch = undefined
-			count = 0
-		}
-	}
-
-	return {
-		update,
-		remove,
-		send,
-		create,
-	}
-}
-
 function AlertContent({ data }: { data: AlertData }) {
-	const { name } = data
+	const { key } = data
 
 	const singleDescription = data.alert.singleDesc?.()
 
@@ -219,12 +166,17 @@ function AlertContent({ data }: { data: AlertData }) {
 	const [min, setMin] = useState(data.min || 10)
 	const [value, setValue] = useState(data.val || (singleDescription ? 0 : 80))
 
-	const Icon = alertInfo[name].icon
+	const newMin = useRef(min)
+	const newValue = useRef(value)
+
+	const Icon = alertInfo[key].icon
+
+	const updateAlert = (c?: boolean) => data.updateAlert?.(c ?? checked, newValue.current, newMin.current)
 
 	return (
 		<div className="rounded-lg border border-muted-foreground/15 hover:border-muted-foreground/20 transition-colors duration-100 group">
 			<label
-				htmlFor={`s${name}`}
+				htmlFor={`s${key}`}
 				className={cn("flex flex-row items-center justify-between gap-4 cursor-pointer p-4", {
 					"pb-0": checked,
 				})}
@@ -236,67 +188,56 @@ function AlertContent({ data }: { data: AlertData }) {
 					{!checked && <span className="block text-sm text-muted-foreground">{data.alert.desc()}</span>}
 				</div>
 				<Switch
-					id={`s${name}`}
+					id={`s${key}`}
 					checked={checked}
-					onCheckedChange={(newChecked) => {
-						setChecked(newChecked)
-						data.updateAlert?.(newChecked, value, min)
+					onCheckedChange={(checked) => {
+						setChecked(checked)
+						updateAlert(checked)
 					}}
 				/>
 			</label>
 			{checked && (
 				<div className="grid sm:grid-cols-2 mt-1.5 gap-5 px-4 pb-5 tabular-nums text-muted-foreground">
 					<Suspense fallback={<div className="h-10" />}>
-						{!singleDescription && (
-							<div>
-								<p id={`v${name}`} className="text-sm block h-8">
-									<Trans>
-										Average exceeds{" "}
-										<strong className="text-foreground">
-											{value}
-											{data.alert.unit}
-										</strong>
-									</Trans>
-								</p>
-								<div className="flex gap-3">
-									<Slider
-										aria-labelledby={`v${name}`}
-										defaultValue={[value]}
-										onValueCommit={(val) => {
-											data.updateAlert?.(true, val[0], min)
-										}}
-										onValueChange={(val) => {
-											setValue(val[0])
-										}}
-										min={1}
-										max={alertInfo[name].max ?? 99}
-									/>
-								</div>
-							</div>
-						)}
-						<div className={cn(singleDescription && "col-span-full lowercase")}>
-							<p id={`t${name}`} className="text-sm block h-8 first-letter:uppercase">
-								{singleDescription && (
-									<>
-										{singleDescription}
-										{` `}
-									</>
-								)}
+					{!singleDescription && (
+						<div>
+							<p id={`v${key}`} className="text-sm block h-8">
 								<Trans>
-									For <strong className="text-foreground">{min}</strong>{" "}
-									<Plural value={min} one="minute" other="minutes" />
+									Average exceeds{" "}
+									<strong className="text-foreground">
+										{value}
+										{data.alert.unit}
+									</strong>
 								</Trans>
 							</p>
 							<div className="flex gap-3">
 								<Slider
-									aria-labelledby={`v${name}`}
+									aria-labelledby={`v${key}`}
+									defaultValue={[value]}
+									onValueCommit={(val) => (newValue.current = val[0]) && updateAlert()}
+									onValueChange={(val) => setValue(val[0])}
+									min={1}
+									max={alertInfo[key].max ?? 99}
+								/>
+							</div>
+						</div>
+					)}
+						<div className={cn(singleDescription && "col-span-full lowercase")}>
+							<p id={`t${key}`} className="text-sm block h-8 first-letter:uppercase">
+								{singleDescription && (
+									<>{singleDescription}{` `}</>
+								)}
+								<Trans>
+									For <strong className="text-foreground">{min}</strong>{" "}
+									<Plural value={min} one=" minute" other=" minutes" />
+								</Trans>
+							</p>
+							<div className="flex gap-3">
+								<Slider
+									aria-labelledby={`v${key}`}
 									defaultValue={[min]}
-									onValueCommit={(min) => {
-										data.updateAlert?.(true, value, min[0])
-									}}
-									onValueChange={(val) => {
-										setMin(val[0])
-									}}
+									onValueCommit={(val) => (newMin.current = val[0]) && updateAlert()}
+									onValueChange={(val) => setMin(val[0])}
 									min={1}
 									max={60}
 								/>

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

@@ -1,6 +1,5 @@
-import { t } from "@lingui/core/macro"
-
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
+
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import {
 	useYAxisWidth,
@@ -13,7 +12,8 @@ import {
 // import Spinner from '../spinner'
 import { ChartData } from "@/types"
 import { memo, useMemo } from "react"
-import { useLingui } from "@lingui/react/macro"
+import { t } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 
 /** [label, key, color, opacity] */
 type DataKeys = [string, string, number, number]
@@ -35,7 +35,6 @@ export default memo(function AreaChartDefault({
 	chartData,
 	max,
 	tickFormatter,
-	contentFormatter,
 }: {
 	maxToggled?: boolean
 	unit?: string
@@ -43,7 +42,6 @@ export default memo(function AreaChartDefault({
 	chartData: ChartData
 	max?: number
 	tickFormatter?: (value: number) => string
-	contentFormatter?: (value: number) => string
 }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
 	const { i18n } = useLingui()
@@ -117,12 +115,7 @@ export default memo(function AreaChartDefault({
 						content={
 							<ChartTooltipContent
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
-								contentFormatter={({ value }) => {
-									if (contentFormatter) {
-										return contentFormatter(value)
-									}
-									return decimalString(value) + unit
-								}}
+								contentFormatter={(item) => decimalString(item.value) + unit}
 								// indicator="line"
 							/>
 						}

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

@@ -16,17 +16,16 @@ import { useStore } from "@nanostores/react"
 import { $containerFilter } from "@/lib/stores"
 import { ChartData } from "@/types"
 import { Separator } from "../ui/separator"
-import { ChartType } from "@/lib/enums"
 
 export default memo(function ContainerChart({
 	dataKey,
 	chartData,
-	chartType,
+	chartName,
 	unit = "%",
 }: {
 	dataKey: string
 	chartData: ChartData
-	chartType: ChartType
+	chartName: string
 	unit?: string
 }) {
 	const filter = useStore($containerFilter)
@@ -34,7 +33,7 @@ export default memo(function ContainerChart({
 
 	const { containerData } = chartData
 
-	const isNetChart = chartType === ChartType.Network
+	const isNetChart = chartName === "net"
 
 	const chartConfig = useMemo(() => {
 		let config = {} as Record<
@@ -82,7 +81,7 @@ export default memo(function ContainerChart({
 			tickFormatter: (value: any) => string
 		}
 		// tick formatter
-		if (chartType === ChartType.CPU) {
+		if (chartName === "cpu") {
 			obj.tickFormatter = (value) => {
 				const val = toFixedWithoutTrailingZeros(value, 2) + unit
 				return updateYAxisWidth(val)
@@ -112,11 +111,6 @@ export default memo(function ContainerChart({
 					return null
 				}
 			}
-		} else if (chartType === ChartType.Memory) {
-			obj.toolTipFormatter = (item: any) => {
-				const { v, u } = getSizeAndUnit(item.value, false)
-				return decimalString(v, 2) + u
-			}
 		} else {
 			obj.toolTipFormatter = (item: any) => decimalString(item.value) + unit
 		}
@@ -163,14 +157,13 @@ export default memo(function ContainerChart({
 					<ChartTooltip
 						animationEasing="ease-out"
 						animationDuration={150}
-						truncate={true}
 						labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
 						// @ts-ignore
 						itemSorter={(a, b) => b.value - a.value}
 						content={<ChartTooltipContent filter={filter} contentFormatter={toolTipFormatter} />}
 					/>
 					{Object.keys(chartConfig).map((key) => {
-						const filtered = filter && !key.toLowerCase().includes(filter.toLowerCase())
+						const filtered = filter && !key.includes(filter)
 						let fillOpacity = filtered ? 0.05 : 0.4
 						let strokeOpacity = filtered ? 0.1 : 1
 						return (

beszel/site/src/components/charts/disk-chart.tsx

@@ -1,4 +1,5 @@
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
+
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import {
 	useYAxisWidth,
@@ -11,7 +12,8 @@ import {
 } from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo } from "react"
-import { useLingui } from "@lingui/react/macro"
+import { t } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 
 export default memo(function DiskChart({
 	dataKey,
@@ -23,7 +25,7 @@ export default memo(function DiskChart({
 	chartData: ChartData
 }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
-	const { t } = useLingui()
+	const { _ } = useLingui()
 
 	// round to nearest GB
 	if (diskSize >= 100) {
@@ -74,7 +76,7 @@ export default memo(function DiskChart({
 					/>
 					<Area
 						dataKey={dataKey}
-						name={t`Disk Usage`}
+						name={_(t`Disk Usage`)}
 						type="monotoneX"
 						fill="hsl(var(--chart-4))"
 						fillOpacity={0.4}

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

@@ -1,13 +1,15 @@
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
+
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import { useYAxisWidth, cn, toFixedFloat, decimalString, formatShortDate, chartMargin } from "@/lib/utils"
 import { memo } from "react"
 import { ChartData } from "@/types"
-import { useLingui } from "@lingui/react/macro"
+import { t } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 
 export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
-	const { t } = useLingui()
+	const { _ } = useLingui()
 
 	const totalMem = toFixedFloat(chartData.systemStats.at(-1)?.stats.m ?? 0, 1)
 
@@ -60,7 +62,7 @@ export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 						}
 					/>
 					<Area
-						name={t`Used`}
+						name={_(t`Used`)}
 						order={3}
 						dataKey="stats.mu"
 						type="monotoneX"
@@ -84,7 +86,7 @@ export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 						/>
 					)}
 					<Area
-						name={t`Cache / Buffers`}
+						name={_(t`Cache / Buffers`)}
 						order={1}
 						dataKey="stats.mb"
 						type="monotoneX"

beszel/site/src/components/charts/swap-chart.tsx

@@ -1,6 +1,5 @@
-import { t } from "@lingui/core/macro";
-
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
+
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import {
 	useYAxisWidth,
@@ -12,6 +11,7 @@ import {
 } from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo } from "react"
+import { t } from "@lingui/macro"
 
 export default memo(function SwapChart({ chartData }: { chartData: ChartData }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

beszel/site/src/components/charts/temperature-chart.tsx

@@ -18,11 +18,8 @@ import {
 } from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo, useMemo } from "react"
-import { $temperatureFilter } from "@/lib/stores"
-import { useStore } from "@nanostores/react"
 
 export default memo(function TemperatureChart({ chartData }: { chartData: ChartData }) {
-	const filter = useStore($temperatureFilter)
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
 
 	if (chartData.systemStats.length === 0) {
@@ -89,28 +86,22 @@ export default memo(function TemperatureChart({ chartData }: { chartData: ChartD
 							<ChartTooltipContent
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
 								contentFormatter={(item) => decimalString(item.value) + " °C"}
-								filter={filter}
+								// indicator="line"
 							/>
 						}
 					/>
-					{colors.map((key) => {
-						const filtered = filter && !key.toLowerCase().includes(filter.toLowerCase())
-						let strokeOpacity = filtered ? 0.1 : 1
-						return (
-							<Line
-								key={key}
-								dataKey={key}
-								name={key}
-								type="monotoneX"
-								dot={false}
-								strokeWidth={1.5}
-								stroke={newChartData.colors[key]}
-								strokeOpacity={strokeOpacity}
-								activeDot={{ opacity: filtered ? 0 : 1 }}
-								isAnimationActive={false}
-							/>
-						)
-					})}
+					{colors.map((key) => (
+						<Line
+							key={key}
+							dataKey={key}
+							name={key}
+							type="monotoneX"
+							dot={false}
+							strokeWidth={1.5}
+							stroke={newChartData.colors[key]}
+							isAnimationActive={false}
+						/>
+					))}
 					{colors.length < 12 && <ChartLegend content={<ChartLegendContent />} />}
 				</LineChart>
 			</ChartContainer>

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

@@ -19,15 +19,17 @@ import {
 	CommandSeparator,
 	CommandShortcut,
 } from "@/components/ui/command"
-import { memo, useEffect, useMemo } from "react"
+import { useEffect } from "react"
+import { useStore } from "@nanostores/react"
 import { $systems } from "@/lib/stores"
-import { getHostDisplayValue, isAdmin, listen } from "@/lib/utils"
-import { $router, basePath, navigate, prependBasePath } from "./router"
-import { Trans } from "@lingui/react/macro"
-import { t } from "@lingui/core/macro"
+import { getHostDisplayValue, isAdmin } from "@/lib/utils"
+import { $router, basePath, navigate } from "./router"
+import { Trans, t } from "@lingui/macro"
 import { getPagePath } from "@nanostores/router"
 
-export default memo(function CommandPalette({ open, setOpen }: { open: boolean; setOpen: (open: boolean) => void }) {
+export default function CommandPalette({ open, setOpen }: { open: boolean; setOpen: (open: boolean) => void }) {
+	const systems = useStore($systems)
+
 	useEffect(() => {
 		const down = (e: KeyboardEvent) => {
 			if (e.key === "k" && (e.metaKey || e.ctrlKey)) {
@@ -35,163 +37,162 @@ export default memo(function CommandPalette({ open, setOpen }: { open: boolean;
 				setOpen(!open)
 			}
 		}
-		return listen(document, "keydown", down)
+
+		document.addEventListener("keydown", down)
+		return () => document.removeEventListener("keydown", down)
 	}, [open, setOpen])
 
-	return useMemo(() => {
-		const systems = $systems.get()
-		return (
-			<CommandDialog open={open} onOpenChange={setOpen}>
-				<CommandInput placeholder={t`Search for systems or settings...`} />
-				<CommandList>
-					<CommandEmpty>
-						<Trans>No results found.</Trans>
-					</CommandEmpty>
-					{systems.length > 0 && (
-						<>
-							<CommandGroup>
-								{systems.map((system) => (
-									<CommandItem
-										key={system.id}
-										onSelect={() => {
-											navigate(getPagePath($router, "system", { name: system.name }))
-											setOpen(false)
-										}}
-									>
-										<Server className="me-2 h-4 w-4" />
-										<span>{system.name}</span>
-										<CommandShortcut>{getHostDisplayValue(system)}</CommandShortcut>
-									</CommandItem>
-								))}
-							</CommandGroup>
-							<CommandSeparator className="mb-1.5" />
-						</>
-					)}
-					<CommandGroup heading={t`Pages / Settings`}>
-						<CommandItem
-							keywords={["home"]}
-							onSelect={() => {
-								navigate(basePath)
-								setOpen(false)
-							}}
-						>
-							<LayoutDashboard className="me-2 h-4 w-4" />
-							<span>
-								<Trans>Dashboard</Trans>
-							</span>
-							<CommandShortcut>
-								<Trans>Page</Trans>
-							</CommandShortcut>
-						</CommandItem>
-						<CommandItem
-							onSelect={() => {
-								navigate(getPagePath($router, "settings", { name: "general" }))
-								setOpen(false)
-							}}
-						>
-							<SettingsIcon className="me-2 h-4 w-4" />
-							<span>
-								<Trans>Settings</Trans>
-							</span>
-							<CommandShortcut>
-								<Trans>Settings</Trans>
-							</CommandShortcut>
-						</CommandItem>
-						<CommandItem
-							keywords={["alerts"]}
-							onSelect={() => {
-								navigate(getPagePath($router, "settings", { name: "notifications" }))
-								setOpen(false)
-							}}
-						>
-							<MailIcon className="me-2 h-4 w-4" />
-							<span>
-								<Trans>Notifications</Trans>
-							</span>
-							<CommandShortcut>
-								<Trans>Settings</Trans>
-							</CommandShortcut>
-						</CommandItem>
-						<CommandItem
-							keywords={["help", "oauth", "oidc"]}
-							onSelect={() => {
-								window.location.href = "https://beszel.dev/guide/what-is-beszel"
-							}}
-						>
-							<BookIcon className="me-2 h-4 w-4" />
-							<span>
-								<Trans>Documentation</Trans>
-							</span>
-							<CommandShortcut>beszel.dev</CommandShortcut>
-						</CommandItem>
-					</CommandGroup>
-					{isAdmin() && (
-						<>
-							<CommandSeparator className="mb-1.5" />
-							<CommandGroup heading={t`Admin`}>
+	return (
+		<CommandDialog open={open} onOpenChange={setOpen}>
+			<CommandInput placeholder={t`Search for systems or settings...`} />
+			<CommandList>
+				<CommandEmpty>
+					<Trans>No results found.</Trans>
+				</CommandEmpty>
+				{systems.length > 0 && (
+					<>
+						<CommandGroup>
+							{systems.map((system) => (
 								<CommandItem
-									keywords={["pocketbase"]}
+									key={system.id}
 									onSelect={() => {
+										navigate(getPagePath($router, "system", { name: system.name }))
 										setOpen(false)
-										window.open(prependBasePath("/_/"), "_blank")
 									}}
 								>
-									<UsersIcon className="me-2 h-4 w-4" />
-									<span>
-										<Trans>Users</Trans>
-									</span>
-									<CommandShortcut>
-										<Trans>Admin</Trans>
-									</CommandShortcut>
+									<Server className="me-2 h-4 w-4" />
+									<span>{system.name}</span>
+									<CommandShortcut>{getHostDisplayValue(system)}</CommandShortcut>
 								</CommandItem>
-								<CommandItem
-									onSelect={() => {
-										setOpen(false)
-										window.open(prependBasePath("/_/#/logs"), "_blank")
-									}}
-								>
-									<LogsIcon className="me-2 h-4 w-4" />
-									<span>
-										<Trans>Logs</Trans>
-									</span>
-									<CommandShortcut>
-										<Trans>Admin</Trans>
-									</CommandShortcut>
-								</CommandItem>
-								<CommandItem
-									onSelect={() => {
-										setOpen(false)
-										window.open(prependBasePath("/_/#/settings/backups"), "_blank")
-									}}
-								>
-									<DatabaseBackupIcon className="me-2 h-4 w-4" />
-									<span>
-										<Trans>Backups</Trans>
-									</span>
-									<CommandShortcut>
-										<Trans>Admin</Trans>
-									</CommandShortcut>
-								</CommandItem>
-								<CommandItem
-									keywords={["email"]}
-									onSelect={() => {
-										setOpen(false)
-										window.open(prependBasePath("/_/#/settings/mail"), "_blank")
-									}}
-								>
-									<MailIcon className="me-2 h-4 w-4" />
-									<span>
-										<Trans>SMTP settings</Trans>
-									</span>
-									<CommandShortcut>
-										<Trans>Admin</Trans>
-									</CommandShortcut>
-								</CommandItem>
-							</CommandGroup>
-						</>
-					)}
-				</CommandList>
-			</CommandDialog>
-		)
-	}, [open])
-})
+							))}
+						</CommandGroup>
+						<CommandSeparator className="mb-1.5" />
+					</>
+				)}
+				<CommandGroup heading={t`Pages / Settings`}>
+					<CommandItem
+						keywords={["home"]}
+						onSelect={() => {
+							navigate(basePath)
+							setOpen(false)
+						}}
+					>
+						<LayoutDashboard className="me-2 h-4 w-4" />
+						<span>
+							<Trans>Dashboard</Trans>
+						</span>
+						<CommandShortcut>
+							<Trans>Page</Trans>
+						</CommandShortcut>
+					</CommandItem>
+					<CommandItem
+						onSelect={() => {
+							navigate(getPagePath($router, "settings", { name: "general" }))
+							setOpen(false)
+						}}
+					>
+						<SettingsIcon className="me-2 h-4 w-4" />
+						<span>
+							<Trans>Settings</Trans>
+						</span>
+						<CommandShortcut>
+							<Trans>Settings</Trans>
+						</CommandShortcut>
+					</CommandItem>
+					<CommandItem
+						keywords={["alerts"]}
+						onSelect={() => {
+							navigate(getPagePath($router, "settings", { name: "notifications" }))
+							setOpen(false)
+						}}
+					>
+						<MailIcon className="me-2 h-4 w-4" />
+						<span>
+							<Trans>Notifications</Trans>
+						</span>
+						<CommandShortcut>
+							<Trans>Settings</Trans>
+						</CommandShortcut>
+					</CommandItem>
+					<CommandItem
+						keywords={["help", "oauth", "oidc"]}
+						onSelect={() => {
+							window.location.href = "https://beszel.dev/guide/what-is-beszel"
+						}}
+					>
+						<BookIcon className="me-2 h-4 w-4" />
+						<span>
+							<Trans>Documentation</Trans>
+						</span>
+						<CommandShortcut>beszel.dev</CommandShortcut>
+					</CommandItem>
+				</CommandGroup>
+				{isAdmin() && (
+					<>
+						<CommandSeparator className="mb-1.5" />
+						<CommandGroup heading={t`Admin`}>
+							<CommandItem
+								keywords={["pocketbase"]}
+								onSelect={() => {
+									setOpen(false)
+									window.open("/_/", "_blank")
+								}}
+							>
+								<UsersIcon className="me-2 h-4 w-4" />
+								<span>
+									<Trans>Users</Trans>
+								</span>
+								<CommandShortcut>
+									<Trans>Admin</Trans>
+								</CommandShortcut>
+							</CommandItem>
+							<CommandItem
+								onSelect={() => {
+									setOpen(false)
+									window.open("/_/#/logs", "_blank")
+								}}
+							>
+								<LogsIcon className="me-2 h-4 w-4" />
+								<span>
+									<Trans>Logs</Trans>
+								</span>
+								<CommandShortcut>
+									<Trans>Admin</Trans>
+								</CommandShortcut>
+							</CommandItem>
+							<CommandItem
+								onSelect={() => {
+									setOpen(false)
+									window.open("/_/#/settings/backups", "_blank")
+								}}
+							>
+								<DatabaseBackupIcon className="me-2 h-4 w-4" />
+								<span>
+									<Trans>Backups</Trans>
+								</span>
+								<CommandShortcut>
+									<Trans>Admin</Trans>
+								</CommandShortcut>
+							</CommandItem>
+							<CommandItem
+								keywords={["email"]}
+								onSelect={() => {
+									setOpen(false)
+									window.open("/_/#/settings/mail", "_blank")
+								}}
+							>
+								<MailIcon className="me-2 h-4 w-4" />
+								<span>
+									<Trans>SMTP settings</Trans>
+								</span>
+								<CommandShortcut>
+									<Trans>Admin</Trans>
+								</CommandShortcut>
+							</CommandItem>
+						</CommandGroup>
+					</>
+				)}
+			</CommandList>
+		</CommandDialog>
+	)
+}

beszel/site/src/components/copy-to-clipboard.tsx

@@ -1,8 +1,8 @@
-import { Trans } from "@lingui/react/macro";
 import { useEffect, useMemo, useRef } from "react"
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "./ui/dialog"
 import { Textarea } from "./ui/textarea"
 import { $copyContent } from "@/lib/stores"
+import { Trans } from "@lingui/macro"
 
 export default function CopyToClipboard({ content }: { content: string }) {
 	return (

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

@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button"
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
 import languages from "@/lib/languages"
 import { cn } from "@/lib/utils"
-import { useLingui } from "@lingui/react/macro"
+import { useLingui } from "@lingui/react"
 import { dynamicActivate } from "@/lib/i18n"
 
 export function LangToggle() {

beszel/site/src/components/login/auth-form.tsx

@@ -1,5 +1,3 @@
-import { t } from "@lingui/core/macro";
-import { Trans } from "@lingui/react/macro";
 import { cn } from "@/lib/utils"
 import { buttonVariants } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -12,6 +10,7 @@ import { Dialog, DialogContent, DialogTrigger, DialogHeader, DialogTitle } from
 import { useCallback, useEffect, useState } from "react"
 import { AuthMethodsList, AuthProviderInfo, OAuth2AuthConfig } from "pocketbase"
 import { $router, Link, prependBasePath } from "../router"
+import { Trans, t } from "@lingui/macro"
 import { getPagePath } from "@nanostores/router"
 
 const honeypot = v.literal("")
@@ -136,6 +135,7 @@ export function UserAuthForm({
 				toast({
 					title: t`Error`,
 					description: t`Please enable pop-ups for this site`,
+					variant: "destructive",
 				})
 				return
 			}
@@ -156,17 +156,14 @@ export function UserAuthForm({
 
 	useEffect(() => {
 		// auto login if password disabled and only one auth provider
-		if (!passwordEnabled && authProviders.length === 1 && !sessionStorage.getItem("lo")) {
-			// Add a small timeout to ensure browser is ready to handle popups
-			setTimeout(() => {
-				loginWithOauth(authProviders[0], true)
-			}, 300)
+		if (!passwordEnabled && authProviders.length === 1) {
+			loginWithOauth(authProviders[0], true)
 		}
 	}, [])
 
 	return (
-        <div className={cn("grid gap-6", className)} {...props}>
-            {passwordEnabled && (
+		<div className={cn("grid gap-6", className)} {...props}>
+			{passwordEnabled && (
 				<>
 					<form onSubmit={handleSubmit} onChange={() => setErrors({})}>
 						<div className="grid gap-2.5">
@@ -242,20 +239,21 @@ export function UserAuthForm({
 					</form>
 					{(isFirstRun || oauthEnabled) && (
 						// only show 'continue with' during onboarding or if we have auth providers
-						(<div className="relative">
-                            <div className="absolute inset-0 flex items-center">
+						<div className="relative">
+							<div className="absolute inset-0 flex items-center">
 								<span className="w-full border-t" />
 							</div>
-                            <div className="relative flex justify-center text-xs uppercase">
+							<div className="relative flex justify-center text-xs uppercase">
 								<span className="bg-background px-2 text-muted-foreground">
 									<Trans>Or continue with</Trans>
 								</span>
 							</div>
-                        </div>)
+						</div>
 					)}
 				</>
 			)}
-            {oauthEnabled && (
+
+			{oauthEnabled && (
 				<div className="grid gap-2 -mt-1">
 					{authMethods.oauth2.providers.map((provider) => (
 						<button
@@ -285,16 +283,17 @@ export function UserAuthForm({
 					))}
 				</div>
 			)}
-            {!oauthEnabled && isFirstRun && (
+
+			{!oauthEnabled && isFirstRun && (
 				// only show GitHub button / dialog during onboarding
-				(<Dialog>
-                    <DialogTrigger asChild>
+				<Dialog>
+					<DialogTrigger asChild>
 						<button type="button" className={cn(buttonVariants({ variant: "outline" }))}>
 							<img className="me-2 h-4 w-4 dark:invert" src={prependBasePath("/_/images/oauth2/github.svg")} alt="" />
 							<span className="translate-y-[1px]">GitHub</span>
 						</button>
 					</DialogTrigger>
-                    <DialogContent style={{ maxWidth: 440, width: "90%" }}>
+					<DialogContent style={{ maxWidth: 440, width: "90%" }}>
 						<DialogHeader>
 							<DialogTitle>
 								<Trans>OAuth 2 / OIDC support</Trans>
@@ -318,9 +317,10 @@ export function UserAuthForm({
 							</p>
 						</div>
 					</DialogContent>
-                </Dialog>)
+				</Dialog>
 			)}
-            {passwordEnabled && !isFirstRun && (
+
+			{passwordEnabled && !isFirstRun && (
 				<Link
 					href={getPagePath($router, "forgot_password")}
 					className="text-sm mx-auto hover:text-brand underline underline-offset-4 opacity-70 hover:opacity-100 transition-opacity"
@@ -328,6 +328,6 @@ export function UserAuthForm({
 					<Trans>Forgot password?</Trans>
 				</Link>
 			)}
-        </div>
-    );
+		</div>
+	)
 }

beszel/site/src/components/login/forgot-pass-form.tsx

@@ -1,5 +1,3 @@
-import { Trans } from "@lingui/react/macro";
-import { t } from "@lingui/core/macro";
 import { LoaderCircle, MailIcon, SendHorizonalIcon } from "lucide-react"
 import { Input } from "../ui/input"
 import { Label } from "../ui/label"
@@ -10,6 +8,7 @@ import { cn } from "@/lib/utils"
 import { pb } from "@/lib/stores"
 import { Dialog, DialogHeader } from "../ui/dialog"
 import { DialogContent, DialogTrigger, DialogTitle } from "../ui/dialog"
+import { t, Trans } from "@lingui/macro"
 
 const showLoginFaliedToast = () => {
 	toast({

beszel/site/src/components/login/login.tsx

@@ -1,4 +1,3 @@
-import { t } from "@lingui/core/macro";
 import { UserAuthForm } from "@/components/login/auth-form"
 import { Logo } from "../logo"
 import { useEffect, useMemo, useState } from "react"
@@ -7,6 +6,7 @@ import { useStore } from "@nanostores/react"
 import ForgotPassword from "./forgot-pass-form"
 import { $router } from "../router"
 import { AuthMethodsList } from "pocketbase"
+import { t } from "@lingui/macro"
 import { useTheme } from "../theme-provider"
 
 export default function () {

beszel/site/src/components/mode-toggle.tsx

@@ -1,11 +1,10 @@
-import { Trans } from "@lingui/react/macro";
-import { t } from "@lingui/core/macro";
 import { LaptopIcon, MoonStarIcon, SunIcon } from "lucide-react"
 
 import { Button } from "@/components/ui/button"
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
 import { useTheme } from "@/components/theme-provider"
 import { cn } from "@/lib/utils"
+import { t, Trans } from "@lingui/macro"
 
 export function ModeToggle() {
 	const { theme, setTheme } = useTheme()

beszel/site/src/components/navbar.tsx

@@ -1,4 +1,3 @@
-import { Trans } from "@lingui/react/macro";
 import { useState, lazy, Suspense } from "react"
 import { Button, buttonVariants } from "@/components/ui/button"
 import {
@@ -27,6 +26,7 @@ import {
 	DropdownMenuItem,
 } from "@/components/ui/dropdown-menu"
 import { AddSystemButton } from "./add-system"
+import { Trans } from "@lingui/macro"
 import { getPagePath } from "@nanostores/router"
 
 const CommandPalette = lazy(() => import("./command-palette"))

beszel/site/src/components/router.tsx

@@ -11,7 +11,7 @@ const routes = {
  * The base path of the application.
  * This is used to prepend the base path to all routes.
  */
-export const basePath = globalThis.BESZEL.BASE_PATH || ""
+export const basePath = window.BASE_PATH || ""
 
 /**
  * Prepends the base path to the given path.

beszel/site/src/components/routes/home.tsx

@@ -1,6 +1,6 @@
-import { Suspense, lazy, memo, useEffect, useMemo } from "react"
+import { Suspense, lazy, useEffect, useMemo } from "react"
 import { Card, CardContent, CardHeader, CardTitle } from "../ui/card"
-import { $alerts, $systems, pb } from "@/lib/stores"
+import { $alerts, $hubVersion, $systems, pb } from "@/lib/stores"
 import { useStore } from "@nanostores/react"
 import { GithubIcon } from "lucide-react"
 import { Separator } from "../ui/separator"
@@ -8,17 +8,17 @@ import { alertInfo, updateRecordList, updateSystemList } from "@/lib/utils"
 import { AlertRecord, SystemRecord } from "@/types"
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
 import { $router, Link } from "../router"
-import { Plural, Trans, useLingui } from "@lingui/react/macro"
+import { Plural, t, Trans } from "@lingui/macro"
 import { getPagePath } from "@nanostores/router"
 
 const SystemsTable = lazy(() => import("../systems-table/systems-table"))
 
-export const Home = memo(() => {
+export default function Home() {
+	const hubVersion = useStore($hubVersion)
+
 	const alerts = useStore($alerts)
 	const systems = useStore($systems)
-	const { t } = useLingui()
 
-	let alertsKey = ""
 	const activeAlerts = useMemo(() => {
 		const activeAlerts = alerts.filter((alert) => {
 			const active = alert.triggered && alert.name in alertInfo
@@ -26,17 +26,14 @@ export const Home = memo(() => {
 				return false
 			}
 			alert.sysname = systems.find((system) => system.id === alert.system)?.name
-			alertsKey += alert.id
 			return true
 		})
 		return activeAlerts
-	}, [systems, alerts])
+	}, [alerts])
 
 	useEffect(() => {
 		document.title = t`Dashboard` + " / Beszel"
-	}, [t])
 
-	useEffect(() => {
 		// make sure we have the latest list of systems
 		updateSystemList()
 
@@ -44,6 +41,7 @@ export const Home = memo(() => {
 		pb.collection<SystemRecord>("systems").subscribe("*", (e) => {
 			updateRecordList(e, $systems)
 		})
+		// todo: add toast if new triggered alert comes in
 		pb.collection<AlertRecord>("alerts").subscribe("*", (e) => {
 			updateRecordList(e, $alerts)
 		})
@@ -53,15 +51,56 @@ export const Home = memo(() => {
 		}
 	}, [])
 
-	return useMemo(
-		() => (
-			<>
-				{/* show active alerts */}
-				{activeAlerts.length > 0 && <ActiveAlerts key={activeAlerts.length} activeAlerts={activeAlerts} />}
-				<Suspense>
-					<SystemsTable />
-				</Suspense>
+	return (
+		<>
+			{/* show active alerts */}
+			{activeAlerts.length > 0 && (
+				<Card className="mb-4">
+					<CardHeader className="pb-4 px-2 sm:px-6 max-sm:pt-5 max-sm:pb-1">
+						<div className="px-2 sm:px-1">
+							<CardTitle>
+								<Trans>Active Alerts</Trans>
+							</CardTitle>
+						</div>
+					</CardHeader>
+					<CardContent className="max-sm:p-2">
+						{activeAlerts.length > 0 && (
+							<div className="grid sm:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-3">
+								{activeAlerts.map((alert) => {
+									const info = alertInfo[alert.name as keyof typeof alertInfo]
+									return (
+										<Alert
+											key={alert.id}
+											className="hover:-translate-y-[1px] duration-200 bg-transparent border-foreground/10  hover:shadow-md shadow-black"
+										>
+											<info.icon className="h-4 w-4" />
+											<AlertTitle>
+												{alert.sysname} {info.name().toLowerCase().replace("cpu", "CPU")}
+											</AlertTitle>
+											<AlertDescription>
+												<Trans>
+													Exceeds {alert.value}
+													{info.unit} in last <Plural value={alert.min} one="# minute" other="# minutes" />
+												</Trans>
+											</AlertDescription>
+											<Link
+												href={getPagePath($router, "system", { name: alert.sysname! })}
+												className="absolute inset-0 w-full h-full"
+												aria-label="View system"
+											></Link>
+										</Alert>
+									)
+								})}
+							</div>
+						)}
+					</CardContent>
+				</Card>
+			)}
+			<Suspense>
+				<SystemsTable />
+			</Suspense>
 
+			{hubVersion && (
 				<div className="flex gap-1.5 justify-end items-center pe-3 sm:pe-6 mt-3.5 text-xs opacity-80">
 					<a
 						href="https://github.com/henrygd/beszel"
@@ -76,56 +115,10 @@ export const Home = memo(() => {
 						target="_blank"
 						className="text-muted-foreground hover:text-foreground duration-75"
 					>
-						Beszel {globalThis.BESZEL.HUB_VERSION}
+						Beszel {hubVersion}
 					</a>
 				</div>
-			</>
-		),
-		[alertsKey]
+			)}
+		</>
 	)
-})
-
-const ActiveAlerts = memo(({ activeAlerts }: { activeAlerts: AlertRecord[] }) => {
-	return (
-		<Card className="mb-4">
-			<CardHeader className="pb-4 px-2 sm:px-6 max-sm:pt-5 max-sm:pb-1">
-				<div className="px-2 sm:px-1">
-					<CardTitle>
-						<Trans>Active Alerts</Trans>
-					</CardTitle>
-				</div>
-			</CardHeader>
-			<CardContent className="max-sm:p-2">
-				{activeAlerts.length > 0 && (
-					<div className="grid sm:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-3">
-						{activeAlerts.map((alert) => {
-							const info = alertInfo[alert.name as keyof typeof alertInfo]
-							return (
-								<Alert
-									key={alert.id}
-									className="hover:-translate-y-[1px] duration-200 bg-transparent border-foreground/10  hover:shadow-md shadow-black"
-								>
-									<info.icon className="h-4 w-4" />
-									<AlertTitle>
-										{alert.sysname} {info.name().toLowerCase().replace("cpu", "CPU")}
-									</AlertTitle>
-									<AlertDescription>
-										<Trans>
-											Exceeds {alert.value}
-											{info.unit} in last <Plural value={alert.min} one="# minute" other="# minutes" />
-										</Trans>
-									</AlertDescription>
-									<Link
-										href={getPagePath($router, "system", { name: alert.sysname! })}
-										className="absolute inset-0 w-full h-full"
-										aria-label="View system"
-									></Link>
-								</Alert>
-							)
-						})}
-					</div>
-				)}
-			</CardContent>
-		</Card>
-	)
-})
+}

beszel/site/src/components/routes/settings/config-yaml.tsx

@@ -1,5 +1,3 @@
-import { t } from "@lingui/core/macro";
-import { Trans } from "@lingui/react/macro";
 import { isAdmin } from "@/lib/utils"
 import { Separator } from "@/components/ui/separator"
 import { Button } from "@/components/ui/button"
@@ -12,6 +10,7 @@ import { useState } from "react"
 import { Textarea } from "@/components/ui/textarea"
 import { toast } from "@/components/ui/use-toast"
 import clsx from "clsx"
+import { Trans, t } from "@lingui/macro"
 
 export default function ConfigYaml() {
 	const [configContent, setConfigContent] = useState<string>("")

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

@@ -1,4 +1,3 @@
-import { Trans } from "@lingui/react/macro"
 import { Button } from "@/components/ui/button"
 import { Label } from "@/components/ui/label"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
@@ -8,9 +7,10 @@ import { LanguagesIcon, LoaderCircleIcon, SaveIcon } from "lucide-react"
 import { UserSettings } from "@/types"
 import { saveSettings } from "./layout"
 import { useState } from "react"
+import { Trans } from "@lingui/macro"
 import languages from "@/lib/languages"
 import { dynamicActivate } from "@/lib/i18n"
-import { useLingui } from "@lingui/react/macro"
+import { useLingui } from "@lingui/react"
 // import { setLang } from "@/lib/i18n"
 
 export default function SettingsProfilePage({ userSettings }: { userSettings: UserSettings }) {
@@ -46,11 +46,11 @@ export default function SettingsProfilePage({ userSettings }: { userSettings: Us
 						</h3>
 						<p className="text-sm text-muted-foreground leading-relaxed">
 							<Trans>
-								Want to help improve our translations? Check{" "}
+								Want to help us make our translations even better? Check out{" "}
 								<a href="https://crowdin.com/project/beszel" className="link" target="_blank" rel="noopener noreferrer">
 									Crowdin
 								</a>{" "}
-								for details.
+								for more details.
 							</Trans>
 						</p>
 					</div>

beszel/site/src/components/routes/settings/layout.tsx

@@ -1,5 +1,3 @@
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
 import { useEffect } from "react"
 import { Separator } from "../../ui/separator"
 import { SidebarNav } from "./sidebar-nav.tsx"
@@ -14,7 +12,8 @@ import { UserSettings } from "@/types.js"
 import General from "./general.tsx"
 import Notifications from "./notifications.tsx"
 import ConfigYaml from "./config-yaml.tsx"
-import { useLingui } from "@lingui/react/macro"
+import { Trans, t } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 
 export async function saveSettings(newSettings: Partial<UserSettings>) {
 	try {
@@ -45,11 +44,11 @@ export async function saveSettings(newSettings: Partial<UserSettings>) {
 }
 
 export default function SettingsLayout() {
-	const { t } = useLingui()
+	const { _ } = useLingui()
 
 	const sidebarNavItems = [
 		{
-			title: t({ message: `General`, comment: "Context: General settings" }),
+			title: _(t({ message: `General`, comment: "Context: General settings" })),
 			href: getPagePath($router, "settings", { name: "general" }),
 			icon: SettingsIcon,
 		},

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

@@ -1,5 +1,3 @@
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
@@ -14,6 +12,7 @@ import { UserSettings } from "@/types"
 import { saveSettings } from "./layout"
 import * as v from "valibot"
 import { isAdmin } from "@/lib/utils"
+import { Trans, t } from "@lingui/macro"
 import { prependBasePath } from "@/components/router"
 
 interface ShoutrrrUrlCardProps {
@@ -128,7 +127,7 @@ const SettingsNotificationsPage = ({ userSettings }: { userSettings: UserSetting
 						<p className="text-sm text-muted-foreground leading-relaxed">
 							<Trans>
 								Beszel uses{" "}
-								<a href="https://beszel.dev/guide/notifications" target="_blank" className="link">
+								<a href="https://containrrr.dev/shoutrrr/services/overview/" target="_blank" className="link">
 									Shoutrrr
 								</a>{" "}
 								to integrate with popular notification services.

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

@@ -1,17 +1,5 @@
-import { t } from "@lingui/core/macro"
-import { Plural, Trans } from "@lingui/react/macro"
-import {
-	$systems,
-	pb,
-	$chartTime,
-	$containerFilter,
-	$userSettings,
-	$direction,
-	$maxValues,
-	$temperatureFilter,
-} from "@/lib/stores"
+import { $systems, pb, $chartTime, $containerFilter, $userSettings, $direction, $maxValues } from "@/lib/stores"
 import { ChartData, ChartTimes, ContainerStatsRecord, GPUData, SystemRecord, SystemStatsRecord } from "@/types"
-import { ChartType, Os } from "@/lib/enums"
 import React, { lazy, memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { Card, CardHeader, CardTitle, CardDescription } from "../ui/card"
 import { useStore } from "@nanostores/react"
@@ -24,7 +12,6 @@ import {
 	getHostDisplayValue,
 	getPbTimestamp,
 	getSizeAndUnit,
-	listen,
 	toFixedFloat,
 	useLocalStorage,
 } from "@/lib/utils"
@@ -32,15 +19,12 @@ import { Separator } from "../ui/separator"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip"
 import { Button } from "../ui/button"
 import { Input } from "../ui/input"
-import { ChartAverage, ChartMax, Rows, TuxIcon, WindowsIcon, AppleIcon, FreeBsdIcon } from "../ui/icons"
+import { ChartAverage, ChartMax, Rows, TuxIcon } from "../ui/icons"
 import { useIntersectionObserver } from "@/lib/use-intersection-observer"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select"
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "../ui/tabs"
 import { timeTicks } from "d3-time"
-import { useLingui } from "@lingui/react/macro"
-import { $router, navigate } from "../router"
-import { getPagePath } from "@nanostores/router"
-import DisksTab from "../tabs/disks-tab"
+import { Plural, Trans, t } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 
 const AreaChartDefault = lazy(() => import("../charts/area-chart"))
 const ContainerChart = lazy(() => import("../charts/container-chart"))
@@ -119,7 +103,7 @@ function dockerOrPodman(str: string, system: SystemRecord) {
 
 export default function SystemDetail({ name }: { name: string }) {
 	const direction = useStore($direction)
-	const { t } = useLingui()
+	const { _ } = useLingui()
 	const systems = useStore($systems)
 	const chartTime = useStore($chartTime)
 	const maxValues = useStore($maxValues)
@@ -128,7 +112,6 @@ export default function SystemDetail({ name }: { name: string }) {
 	const [systemStats, setSystemStats] = useState([] as SystemStatsRecord[])
 	const [containerData, setContainerData] = useState([] as ChartData["containerData"])
 	const netCardRef = useRef<HTMLDivElement>(null)
-	const persistChartTime = useRef(false)
 	const [containerFilterBar, setContainerFilterBar] = useState(null as null | JSX.Element)
 	const [bottomSpacing, setBottomSpacing] = useState(0)
 	const [chartLoading, setChartLoading] = useState(true)
@@ -137,10 +120,8 @@ export default function SystemDetail({ name }: { name: string }) {
 	useEffect(() => {
 		document.title = `${name} / Beszel`
 		return () => {
-			if (!persistChartTime.current) {
-				$chartTime.set($userSettings.get().chartTime)
-			}
-			persistChartTime.current = false
+			$chartTime.set($userSettings.get().chartTime)
+			// resetCharts()
 			setSystemStats([])
 			setContainerData([])
 			setContainerFilterBar(null)
@@ -230,7 +211,7 @@ export default function SystemDetail({ name }: { name: string }) {
 				cache.set(cs_cache_key, containerData)
 			}
 			if (containerData.length) {
-				!containerFilterBar && setContainerFilterBar(<FilterBar />)
+				!containerFilterBar && setContainerFilterBar(<ContainerFilterBar />)
 			} else if (containerFilterBar) {
 				setContainerFilterBar(null)
 			}
@@ -263,27 +244,6 @@ export default function SystemDetail({ name }: { name: string }) {
 		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: React.ReactNode
 		if (system.info.u < 172800) {
 			const hours = Math.trunc(system.info.u / 3600)
@@ -300,8 +260,8 @@ export default function SystemDetail({ name }: { name: string }) {
 				// 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: uptime, Icon: ClockArrowUp, label: t`Uptime` },
+			{ value: system.info.k, Icon: TuxIcon, label: t({ comment: "Linux kernel", message: "Kernel" }) },
 			{
 				value: `${system.info.m} (${system.info.c}c${system.info.t ? `/${system.info.t}t` : ""})`,
 				Icon: CpuIcon,
@@ -329,41 +289,6 @@ export default function SystemDetail({ name }: { name: string }) {
 		setBottomSpacing(tooltipHeight - distanceToBottom)
 	}, [netCardRef, containerData])
 
-	// keyboard navigation between systems
-	useEffect(() => {
-		if (!systems.length) {
-			return
-		}
-		const handleKeyUp = (e: KeyboardEvent) => {
-			if (
-				e.target instanceof HTMLInputElement ||
-				e.target instanceof HTMLTextAreaElement ||
-				e.shiftKey ||
-				e.ctrlKey ||
-				e.metaKey
-			) {
-				return
-			}
-			const currentIndex = systems.findIndex((s) => s.name === name)
-			if (currentIndex === -1 || systems.length <= 1) {
-				return
-			}
-			switch (e.key) {
-				case "ArrowLeft":
-				case "h":
-					const prevIndex = (currentIndex - 1 + systems.length) % systems.length
-					persistChartTime.current = true
-					return navigate(getPagePath($router, "system", { name: systems[prevIndex].name }))
-				case "ArrowRight":
-				case "l":
-					const nextIndex = (currentIndex + 1) % systems.length
-					persistChartTime.current = true
-					return navigate(getPagePath($router, "system", { name: systems[nextIndex].name }))
-			}
-		}
-		return listen(document, "keyup", handleKeyUp)
-	}, [name, systems])
-
 	if (!system.id) {
 		return null
 	}
@@ -465,20 +390,12 @@ export default function SystemDetail({ name }: { name: string }) {
 					</div>
 				</Card>
 
-				{/* tabs for different views */}
-				<Tabs defaultValue="systems" className="w-full">
-					<TabsList>
-						<TabsTrigger value="systems">Systems</TabsTrigger>
-						<TabsTrigger value="disks">Disks</TabsTrigger>
-					</TabsList>
-					
-					<TabsContent value="systems" className="mt-4">
 				{/* main charts */}
 				<div className="grid xl:grid-cols-2 gap-4">
 					<ChartCard
 						empty={dataEmpty}
 						grid={grid}
-						title={t`CPU Usage`}
+						title={_(t`CPU Usage`)}
 						description={t`Average system-wide CPU utilization`}
 						cornerEl={maxValSelect}
 					>
@@ -493,7 +410,7 @@ export default function SystemDetail({ name }: { name: string }) {
 							description={t`Average CPU utilization of containers`}
 							cornerEl={containerFilterBar}
 						>
-							<ContainerChart chartData={chartData} dataKey="c" chartType={ChartType.CPU} />
+							<ContainerChart chartData={chartData} dataKey="c" chartName="cpu" />
 						</ChartCard>
 					)}
 
@@ -514,7 +431,7 @@ export default function SystemDetail({ name }: { name: string }) {
 							description={dockerOrPodman(t`Memory usage of docker containers`, system)}
 							cornerEl={containerFilterBar}
 						>
-							<ContainerChart chartData={chartData} dataKey="m" chartType={ChartType.Memory} />
+							<ContainerChart chartData={chartData} chartName="mem" dataKey="m" unit=" MB" />
 						</ChartCard>
 					)}
 
@@ -556,7 +473,7 @@ export default function SystemDetail({ name }: { name: string }) {
 								cornerEl={containerFilterBar}
 							>
 								{/* @ts-ignore */}
-								<ContainerChart chartData={chartData} chartType={ChartType.Network} dataKey="n" />
+								<ContainerChart chartData={chartData} chartName="net" dataKey="n" />
 							</ChartCard>
 						</div>
 					)}
@@ -580,7 +497,6 @@ export default function SystemDetail({ name }: { name: string }) {
 							grid={grid}
 							title={t`Temperature`}
 							description={t`Temperatures of system sensors`}
-							cornerEl={<FilterBar store={$temperatureFilter} />}
 						>
 							<TemperatureChart chartData={chartData} />
 						</ChartCard>
@@ -604,10 +520,6 @@ export default function SystemDetail({ name }: { name: string }) {
 					<div className="grid xl:grid-cols-2 gap-4">
 						{Object.keys(systemStats.at(-1)?.stats.g ?? {}).map((id) => {
 							const gpu = systemStats.at(-1)?.stats.g?.[id] as GPUData
-							const sizeFormatter = (value: number, decimals?: number) => {
-								const { v, u } = getSizeAndUnit(value, false)
-								return toFixedFloat(v, decimals || 1) + u
-							}
 							return (
 								<div key={id} className="contents">
 									<ChartCard
@@ -627,9 +539,12 @@ export default function SystemDetail({ name }: { name: string }) {
 										<AreaChartDefault
 											chartData={chartData}
 											chartName={`g.${id}.mu`}
+											unit=" MB"
 											max={gpu.mt}
-											tickFormatter={sizeFormatter}
-											contentFormatter={(value) => sizeFormatter(value, 2)}
+											tickFormatter={(value) => {
+												const { v, u } = getSizeAndUnit(value, false)
+												return toFixedFloat(v, 1) + u
+											}}
 										/>
 									</ChartCard>
 								</div>
@@ -670,12 +585,6 @@ export default function SystemDetail({ name }: { name: string }) {
 						})}
 					</div>
 				)}
-					</TabsContent>
-					
-					<TabsContent value="disks" className="mt-4">
-						<DisksTab smartData={systemStats.at(-1)?.stats.sm} />
-					</TabsContent>
-				</Tabs>
 			</div>
 
 			{/* add space for tooltip if more than 12 containers */}
@@ -684,17 +593,17 @@ export default function SystemDetail({ name }: { name: string }) {
 	)
 }
 
-function FilterBar({ store = $containerFilter }: { store?: typeof $containerFilter }) {
-	const containerFilter = useStore(store)
-	const { t } = useLingui()
+function ContainerFilterBar() {
+	const containerFilter = useStore($containerFilter)
+	const { _ } = useLingui()
 
 	const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
-		store.set(e.target.value)
+		$containerFilter.set(e.target.value)
 	}, [])
 
 	return (
 		<>
-			<Input placeholder={t`Filter...`} className="ps-4 pe-8" value={containerFilter} onChange={handleChange} />
+			<Input placeholder={_(t`Filter...`)} className="ps-4 pe-8" value={containerFilter} onChange={handleChange} />
 			{containerFilter && (
 				<Button
 					type="button"
@@ -702,7 +611,7 @@ function FilterBar({ store = $containerFilter }: { store?: typeof $containerFilt
 					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={() => store.set("")}
+					onClick={() => $containerFilter.set("")}
 				>
 					<XIcon className="h-4 w-4" />
 				</Button>

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

@@ -10,8 +10,6 @@ import {
 	getCoreRowModel,
 	useReactTable,
 	HeaderContext,
-	Row,
-	Table as TableType,
 } from "@tanstack/react-table"
 
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
@@ -63,13 +61,14 @@ import {
 	PenBoxIcon,
 } from "lucide-react"
 import { memo, useEffect, useMemo, useRef, useState } from "react"
-import { $systems, pb } from "@/lib/stores"
+import { $hubVersion, $systems, pb } from "@/lib/stores"
 import { useStore } from "@nanostores/react"
 import { cn, copyToClipboard, decimalString, isReadOnlyUser, useLocalStorage } from "@/lib/utils"
 import AlertsButton from "../alerts/alert-button"
 import { $router, Link, navigate } from "../router"
 import { EthernetIcon, GpuIcon, ThermometerIcon } from "../ui/icons"
-import { useLingui, Trans } from "@lingui/react/macro"
+import { Trans, t } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/card"
 import { Input } from "../ui/input"
 import { ClassValue } from "clsx"
@@ -104,66 +103,47 @@ function CellFormatter(info: CellContext<SystemRecord, unknown>) {
 
 function sortableHeader(context: HeaderContext<SystemRecord, unknown>) {
 	const { column } = context
-	// @ts-ignore
-	const { Icon, hideSort, name }: { Icon: React.ElementType; name: () => string; hideSort: boolean } = column.columnDef
 	return (
 		<Button
 			variant="ghost"
 			className="h-9 px-3 flex"
 			onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
 		>
-			{Icon && <Icon className="me-2 size-4" />}
-			{name()}
-			{hideSort || <ArrowUpDownIcon className="ms-2 size-4" />}
+			{/* @ts-ignore */}
+			{column.columnDef.icon && <column.columnDef.icon className="me-2 size-4" />}
+			{column.id}
+			{/* @ts-ignore */}
+			{column.columnDef.hideSort || <ArrowUpDownIcon className="ms-2 size-4" />}
 		</Button>
 	)
 }
 
 export default function SystemsTable() {
 	const data = useStore($systems)
-	const { i18n, t } = useLingui()
+	const hubVersion = useStore($hubVersion)
 	const [filter, setFilter] = useState<string>()
-	const [sorting, setSorting] = useState<SortingState>([{ id: "system", desc: false }])
+	const [sorting, setSorting] = useState<SortingState>([{ id: t`System`, desc: false }])
 	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
 	const [columnVisibility, setColumnVisibility] = useLocalStorage<VisibilityState>("cols", {})
 	const [viewMode, setViewMode] = useLocalStorage<ViewMode>("viewMode", window.innerWidth > 1024 ? "table" : "grid")
-
-	const locale = i18n.locale
+	const { i18n } = useLingui()
 
 	useEffect(() => {
 		if (filter !== undefined) {
-			table.getColumn("system")?.setFilterValue(filter)
+			table.getColumn(t`System`)?.setFilterValue(filter)
 		}
 	}, [filter])
 
-	const columnDefs = useMemo(() => {
-		const statusTranslations = {
-			up: () => t`Up`.toLowerCase(),
-			down: () => t`Down`.toLowerCase(),
-			paused: () => t`Paused`.toLowerCase(),
-		}
+	const columns = useMemo(() => {
 		return [
 			{
 				// size: 200,
 				size: 200,
 				minSize: 0,
 				accessorKey: "name",
-				id: "system",
-				name: () => t`System`,
-				filterFn: (row, _, filterVal) => {
-					const filterLower = filterVal.toLowerCase()
-					const { name, status } = row.original
-					// Check if the filter matches the name or status for this row
-					if (
-						name.toLowerCase().includes(filterLower) ||
-						statusTranslations[status as keyof typeof statusTranslations]?.().includes(filterLower)
-					) {
-						return true
-					}
-					return false
-				},
+				id: t`System`,
 				enableHiding: false,
-				Icon: ServerIcon,
+				icon: ServerIcon,
 				cell: (info) => (
 					<span className="flex gap-0.5 items-center text-base md:pe-5">
 						<IndicatorDot system={info.row.original} />
@@ -182,48 +162,43 @@ export default function SystemsTable() {
 			},
 			{
 				accessorKey: "info.cpu",
-				id: "cpu",
-				name: () => t`CPU`,
+				id: t`CPU`,
 				invertSorting: true,
 				cell: CellFormatter,
-				Icon: CpuIcon,
+				icon: CpuIcon,
 				header: sortableHeader,
 			},
 			{
 				accessorKey: "info.mp",
-				id: "memory",
-				name: () => t`Memory`,
+				id: t`Memory`,
 				invertSorting: true,
 				cell: CellFormatter,
-				Icon: MemoryStickIcon,
+				icon: MemoryStickIcon,
 				header: sortableHeader,
 			},
 			{
 				accessorKey: "info.dp",
-				id: "disk",
-				name: () => t`Disk`,
+				id: t`Disk`,
 				invertSorting: true,
 				cell: CellFormatter,
-				Icon: HardDriveIcon,
+				icon: HardDriveIcon,
 				header: sortableHeader,
 			},
 			{
 				accessorFn: (originalRow) => originalRow.info.g,
-				id: "gpu",
-				name: () => "GPU",
+				id: "GPU",
 				invertSorting: true,
 				sortUndefined: -1,
 				cell: CellFormatter,
-				Icon: GpuIcon,
+				icon: GpuIcon,
 				header: sortableHeader,
 			},
 			{
 				accessorFn: (originalRow) => originalRow.info.b || 0,
-				id: "net",
-				name: () => t`Net`,
+				id: t`Net`,
 				invertSorting: true,
 				size: 50,
-				Icon: EthernetIcon,
+				icon: EthernetIcon,
 				header: sortableHeader,
 				cell(info) {
 					const val = info.getValue() as number
@@ -240,13 +215,15 @@ export default function SystemsTable() {
 			},
 			{
 				accessorFn: (originalRow) => originalRow.info.dt,
-				id: "temp",
-				name: () => t({ message: "Temp", comment: "Temperature label in systems table" }),
+				id: t({
+					message: "Temp",
+					comment: "Temperature label in systems table",
+				}),
 				invertSorting: true,
 				sortUndefined: -1,
 				size: 50,
 				hideSort: true,
-				Icon: ThermometerIcon,
+				icon: ThermometerIcon,
 				header: sortableHeader,
 				cell(info) {
 					const val = info.getValue() as number
@@ -266,16 +243,15 @@ export default function SystemsTable() {
 			},
 			{
 				accessorKey: "info.v",
-				id: "agent",
-				name: () => t`Agent`,
+				id: t`Agent`,
 				invertSorting: true,
 				size: 50,
-				Icon: WifiIcon,
+				icon: WifiIcon,
 				hideSort: true,
 				header: sortableHeader,
 				cell(info) {
 					const version = info.getValue() as string
-					if (!version) {
+					if (!version || !hubVersion) {
 						return null
 					}
 					const system = info.row.original
@@ -289,7 +265,7 @@ export default function SystemsTable() {
 								system={system}
 								className={
 									(system.status !== "up" && "bg-primary/30") ||
-									(version === globalThis.BESZEL.HUB_VERSION && "bg-green-500") ||
+									(version === hubVersion && "bg-green-500") ||
 									"bg-yellow-500"
 								}
 							/>
@@ -299,9 +275,7 @@ export default function SystemsTable() {
 				},
 			},
 			{
-				id: "actions",
-				// @ts-ignore
-				name: () => t({ message: "Actions", comment: "Table column" }),
+				id: t({ message: "Actions", comment: "Table column" }),
 				size: 50,
 				cell: ({ row }) => (
 					<div className="flex justify-end items-center gap-1">
@@ -311,11 +285,11 @@ export default function SystemsTable() {
 				),
 			},
 		] as ColumnDef<SystemRecord>[]
-	}, [])
+	}, [hubVersion, i18n.locale])
 
 	const table = useReactTable({
 		data,
-		columns: columnDefs,
+		columns,
 		getCoreRowModel: getCoreRowModel(),
 		onSortingChange: setSorting,
 		getSortedRowModel: getSortedRowModel(),
@@ -329,17 +303,15 @@ export default function SystemsTable() {
 		},
 		defaultColumn: {
 			minSize: 0,
-			size: 900,
-			maxSize: 900,
+			size: Number.MAX_SAFE_INTEGER,
+			maxSize: Number.MAX_SAFE_INTEGER,
 		},
 	})
 
 	const rows = table.getRowModel().rows
-	const columns = table.getAllColumns()
-	const visibleColumns = table.getVisibleLeafColumns()
-	// TODO: hiding temp then gpu messes up table headers
-	const CardHead = useMemo(() => {
-		return (
+
+	return (
+		<Card>
 			<CardHeader className="pb-5 px-2 sm:px-6 max-sm:pt-5 max-sm:pb-1">
 				<div className="grid md:flex gap-5 w-full items-end">
 					<div className="px-2 sm:px-1">
@@ -390,8 +362,8 @@ export default function SystemsTable() {
 										</DropdownMenuLabel>
 										<DropdownMenuSeparator />
 										<div className="px-1 pb-1">
-											{columns.map((column) => {
-												if (!column.getCanSort()) return null
+											{table.getAllColumns().map((column) => {
+												if (column.id === t`Actions` || !column.getCanSort()) return null
 												let Icon = <span className="w-6"></span>
 												// if current sort column, show sort direction
 												if (sorting[0]?.id === column.id) {
@@ -410,8 +382,7 @@ export default function SystemsTable() {
 														key={column.id}
 													>
 														{Icon}
-														{/* @ts-ignore */}
-														{column.columnDef.name()}
+														{column.id}
 													</DropdownMenuItem>
 												)
 											})}
@@ -425,7 +396,8 @@ export default function SystemsTable() {
 										</DropdownMenuLabel>
 										<DropdownMenuSeparator />
 										<div className="px-1.5 pb-1">
-											{columns
+											{table
+												.getAllColumns()
 												.filter((column) => column.getCanHide())
 												.map((column) => {
 													return (
@@ -435,8 +407,7 @@ export default function SystemsTable() {
 															checked={column.getIsVisible()}
 															onCheckedChange={(value) => column.toggleVisibility(!!value)}
 														>
-															{/* @ts-ignore */}
-															{column.columnDef.name()}
+															{column.id}
 														</DropdownMenuCheckboxItem>
 													)
 												})}
@@ -448,24 +419,128 @@ export default function SystemsTable() {
 					</div>
 				</div>
 			</CardHeader>
-		)
-	}, [visibleColumns.length, sorting, viewMode, locale])
-
-	return (
-		<Card>
-			{CardHead}
 			<div className="p-6 pt-0 max-sm:py-3 max-sm:px-2">
 				{viewMode === "table" ? (
 					// table layout
 					<div className="rounded-md border overflow-hidden">
-						<AllSystemsTable table={table} rows={rows} colLength={visibleColumns.length} />
+						<Table>
+							<TableHeader>
+								{table.getHeaderGroups().map((headerGroup) => (
+									<TableRow 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>
+											)
+										})}
+									</TableRow>
+								))}
+							</TableHeader>
+							<TableBody>
+								{rows.length ? (
+									table.getRowModel().rows.map((row) => (
+										<TableRow
+											key={row.original.id}
+											data-state={row.getIsSelected() && "selected"}
+											className={cn("cursor-pointer transition-opacity", {
+												"opacity-50": row.original.status === "paused",
+											})}
+											onClick={(e) => {
+												const target = e.target as HTMLElement
+												if (!target.closest("[data-nolink]") && e.currentTarget.contains(target)) {
+													navigate(getPagePath($router, "system", { name: row.original.name }))
+												}
+											}}
+										>
+											{row.getVisibleCells().map((cell) => (
+												<TableCell
+													key={cell.id}
+													style={{
+														width: cell.column.getSize() === Number.MAX_SAFE_INTEGER ? "auto" : cell.column.getSize(),
+													}}
+													className={cn("overflow-hidden relative", data.length > 10 ? "py-2" : "py-2.5")}
+												>
+													{flexRender(cell.column.columnDef.cell, cell.getContext())}
+												</TableCell>
+											))}
+										</TableRow>
+									))
+								) : (
+									<TableRow>
+										<TableCell colSpan={columns.length} className="h-24 text-center">
+											<Trans>No systems found.</Trans>
+										</TableCell>
+									</TableRow>
+								)}
+							</TableBody>
+						</Table>
 					</div>
 				) : (
 					// grid layout
 					<div className="grid gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3">
-						{rows?.length ? (
-							rows.map((row) => {
-								return <SystemCard key={row.original.id} row={row} table={table} colLength={visibleColumns.length} />
+						{table.getRowModel().rows?.length ? (
+							table.getRowModel().rows.map((row) => {
+								const system = row.original
+								const { status } = system
+								return (
+									<Card
+										key={system.id}
+										className={cn(
+											"cursor-pointer hover:shadow-md transition-all bg-transparent w-full dark:border-border duration-200 relative",
+											{
+												"opacity-50": status === "paused",
+											}
+										)}
+									>
+										<CardHeader className="py-1 ps-5 pe-3 bg-muted/30 border-b border-border/60">
+											<div className="flex items-center justify-between gap-2">
+												<CardTitle className="text-base tracking-normal shrink-1 text-primary/90 flex items-center min-h-10 gap-2.5 min-w-0">
+													<div className="flex items-center gap-2.5 min-w-0">
+														<IndicatorDot system={system} />
+														<CardTitle className="text-[.95em]/normal tracking-normal truncate text-primary/90">
+															{system.name}
+														</CardTitle>
+													</div>
+												</CardTitle>
+												{table.getColumn(t`Actions`)?.getIsVisible() && (
+													<div className="flex gap-1 flex-shrink-0 relative z-10">
+														<AlertsButton system={system} />
+														<ActionsButton system={system} />
+													</div>
+												)}
+											</div>
+										</CardHeader>
+										<CardContent className="space-y-2.5 text-sm px-5 pt-3.5 pb-4">
+											{table.getAllColumns().map((column) => {
+												if (!column.getIsVisible() || column.id === t`System` || column.id === t`Actions`) return null
+												const cell = row.getAllCells().find((cell) => cell.column.id === column.id)
+												if (!cell) return null
+												return (
+													<div key={column.id} className="flex items-center gap-3">
+														{/* @ts-ignore */}
+														{column.columnDef?.icon && (
+															// @ts-ignore
+															<column.columnDef.icon className="size-4 text-muted-foreground" />
+														)}
+														<div className="flex items-center gap-3 flex-1">
+															<span className="text-muted-foreground min-w-16">{column.id}:</span>
+															<div className="flex-1">{flexRender(cell.column.columnDef.cell, cell.getContext())}</div>
+														</div>
+													</div>
+												)
+											})}
+										</CardContent>
+										<Link
+											href={getPagePath($router, "system", { name: row.original.name })}
+											className="inset-0 absolute w-full h-full"
+										>
+											<span className="sr-only">{row.original.name}</span>
+										</Link>
+									</Card>
+								)
 							})
 						) : (
 							<div className="col-span-full text-center py-8">
@@ -479,247 +554,6 @@ export default function SystemsTable() {
 	)
 }
 
-const AllSystemsTable = memo(
-	({ table, rows, colLength }: { table: TableType<SystemRecord>; rows: Row<SystemRecord>[]; colLength: number }) => {
-		return (
-			<Table>
-				<SystemsTableHead table={table} colLength={colLength} />
-				<TableBody>
-					{rows.length ? (
-						rows.map((row) => (
-							<SystemTableRow key={row.original.id} row={row} length={rows.length} colLength={colLength} />
-						))
-					) : (
-						<TableRow>
-							<TableCell colSpan={colLength} className="h-24 text-center">
-								<Trans>No systems found.</Trans>
-							</TableCell>
-						</TableRow>
-					)}
-				</TableBody>
-			</Table>
-		)
-	}
-)
-
-function SystemsTableHead({ table, colLength }: { table: TableType<SystemRecord>; colLength: number }) {
-	const { i18n } = useLingui()
-	return useMemo(() => {
-		return (
-			<TableHeader>
-				{table.getHeaderGroups().map((headerGroup) => (
-					<TableRow key={headerGroup.id}>
-						{headerGroup.headers.map((header) => {
-							return (
-								<TableHead className="px-2" key={header.id}>
-									{flexRender(header.column.columnDef.header, header.getContext())}
-								</TableHead>
-							)
-						})}
-					</TableRow>
-				))}
-			</TableHeader>
-		)
-	}, [i18n.locale, colLength])
-}
-
-const SystemTableRow = memo(
-	({ row, length, colLength }: { row: Row<SystemRecord>; length: number; colLength: number }) => {
-		const system = row.original
-		const { t } = useLingui()
-		return useMemo(() => {
-			return (
-				<TableRow
-					// data-state={row.getIsSelected() && "selected"}
-					className={cn("cursor-pointer transition-opacity", {
-						"opacity-50": system.status === "paused",
-					})}
-					onClick={(e) => {
-						const target = e.target as HTMLElement
-						if (!target.closest("[data-nolink]") && e.currentTarget.contains(target)) {
-							navigate(getPagePath($router, "system", { name: system.name }))
-						}
-					}}
-				>
-					{row.getVisibleCells().map((cell) => (
-						<TableCell
-							key={cell.id}
-							style={{
-								width: cell.column.getSize(),
-							}}
-							className={cn("overflow-hidden relative", length > 10 ? "py-2" : "py-2.5")}
-						>
-							{flexRender(cell.column.columnDef.cell, cell.getContext())}
-						</TableCell>
-					))}
-				</TableRow>
-			)
-		}, [system, system.status, colLength, t])
-	}
-)
-
-const SystemCard = memo(
-	({ row, table, colLength }: { row: Row<SystemRecord>; table: TableType<SystemRecord>; colLength: number }) => {
-		const system = row.original
-		const { t } = useLingui()
-
-		return useMemo(() => {
-			return (
-				<Card
-					key={system.id}
-					className={cn(
-						"cursor-pointer hover:shadow-md transition-all bg-transparent w-full dark:border-border duration-200 relative",
-						{
-							"opacity-50": system.status === "paused",
-						}
-					)}
-				>
-					<CardHeader className="py-1 ps-5 pe-3 bg-muted/30 border-b border-border/60">
-						<div className="flex items-center justify-between gap-2">
-							<CardTitle className="text-base tracking-normal shrink-1 text-primary/90 flex items-center min-h-10 gap-2.5 min-w-0">
-								<div className="flex items-center gap-2.5 min-w-0">
-									<IndicatorDot system={system} />
-									<CardTitle className="text-[.95em]/normal tracking-normal truncate text-primary/90">
-										{system.name}
-									</CardTitle>
-								</div>
-							</CardTitle>
-							{table.getColumn("actions")?.getIsVisible() && (
-								<div className="flex gap-1 flex-shrink-0 relative z-10">
-									<AlertsButton system={system} />
-									<ActionsButton system={system} />
-								</div>
-							)}
-						</div>
-					</CardHeader>
-					<CardContent className="space-y-2.5 text-sm px-5 pt-3.5 pb-4">
-						{table.getAllColumns().map((column) => {
-							if (!column.getIsVisible() || column.id === "system" || column.id === "actions") return null
-							const cell = row.getAllCells().find((cell) => cell.column.id === column.id)
-							if (!cell) return null
-							// @ts-ignore
-							const { Icon, name } = column.columnDef as ColumnDef<SystemRecord, unknown>
-							return (
-								<div key={column.id} className="flex items-center gap-3">
-									{Icon && <Icon className="size-4 text-muted-foreground" />}
-									<div className="flex items-center gap-3 flex-1">
-										<span className="text-muted-foreground min-w-16">{name()}:</span>
-										<div className="flex-1">{flexRender(cell.column.columnDef.cell, cell.getContext())}</div>
-									</div>
-								</div>
-							)
-						})}
-					</CardContent>
-					<Link
-						href={getPagePath($router, "system", { name: row.original.name })}
-						className="inset-0 absolute w-full h-full"
-					>
-						<span className="sr-only">{row.original.name}</span>
-					</Link>
-				</Card>
-			)
-		}, [system, colLength, t])
-	}
-)
-
-const ActionsButton = memo(({ system }: { system: SystemRecord }) => {
-	const [deleteOpen, setDeleteOpen] = useState(false)
-	const [editOpen, setEditOpen] = useState(false)
-	let editOpened = useRef(false)
-	const { t } = useLingui()
-	const { id, status, host, name } = system
-
-	return useMemo(() => {
-		return (
-			<>
-				<DropdownMenu>
-					<DropdownMenuTrigger asChild>
-						<Button variant="ghost" size={"icon"} data-nolink>
-							<span className="sr-only">
-								<Trans>Open menu</Trans>
-							</span>
-							<MoreHorizontalIcon className="w-5" />
-						</Button>
-					</DropdownMenuTrigger>
-					<DropdownMenuContent align="end">
-						{!isReadOnlyUser() && (
-							<DropdownMenuItem
-								onSelect={() => {
-									editOpened.current = true
-									setEditOpen(true)
-								}}
-							>
-								<PenBoxIcon className="me-2.5 size-4" />
-								<Trans>Edit</Trans>
-							</DropdownMenuItem>
-						)}
-						<DropdownMenuItem
-							className={cn(isReadOnlyUser() && "hidden")}
-							onClick={() => {
-								pb.collection("systems").update(id, {
-									status: status === "paused" ? "pending" : "paused",
-								})
-							}}
-						>
-							{status === "paused" ? (
-								<>
-									<PlayCircleIcon className="me-2.5 size-4" />
-									<Trans>Resume</Trans>
-								</>
-							) : (
-								<>
-									<PauseCircleIcon className="me-2.5 size-4" />
-									<Trans>Pause</Trans>
-								</>
-							)}
-						</DropdownMenuItem>
-						<DropdownMenuItem onClick={() => copyToClipboard(host)}>
-							<CopyIcon className="me-2.5 size-4" />
-							<Trans>Copy host</Trans>
-						</DropdownMenuItem>
-						<DropdownMenuSeparator className={cn(isReadOnlyUser() && "hidden")} />
-						<DropdownMenuItem className={cn(isReadOnlyUser() && "hidden")} onSelect={() => setDeleteOpen(true)}>
-							<Trash2Icon className="me-2.5 size-4" />
-							<Trans>Delete</Trans>
-						</DropdownMenuItem>
-					</DropdownMenuContent>
-				</DropdownMenu>
-				{/* edit dialog */}
-				<Dialog open={editOpen} onOpenChange={setEditOpen}>
-					{editOpened.current && <SystemDialog system={system} setOpen={setEditOpen} />}
-				</Dialog>
-				{/* deletion dialog */}
-				<AlertDialog open={deleteOpen} onOpenChange={(open) => setDeleteOpen(open)}>
-					<AlertDialogContent>
-						<AlertDialogHeader>
-							<AlertDialogTitle>
-								<Trans>Are you sure you want to delete {name}?</Trans>
-							</AlertDialogTitle>
-							<AlertDialogDescription>
-								<Trans>
-									This action cannot be undone. This will permanently delete all current records for {name} from the
-									database.
-								</Trans>
-							</AlertDialogDescription>
-						</AlertDialogHeader>
-						<AlertDialogFooter>
-							<AlertDialogCancel>
-								<Trans>Cancel</Trans>
-							</AlertDialogCancel>
-							<AlertDialogAction
-								className={cn(buttonVariants({ variant: "destructive" }))}
-								onClick={() => pb.collection("systems").delete(id)}
-							>
-								<Trans>Continue</Trans>
-							</AlertDialogAction>
-						</AlertDialogFooter>
-					</AlertDialogContent>
-				</AlertDialog>
-			</>
-		)
-	}, [id, status, host, name, t, deleteOpen, editOpen])
-})
-
 function IndicatorDot({ system, className }: { system: SystemRecord; className?: ClassValue }) {
 	className ||= {
 		"bg-green-500": system.status === "up",
@@ -734,3 +568,99 @@ function IndicatorDot({ system, className }: { system: SystemRecord; className?:
 		/>
 	)
 }
+
+const ActionsButton = memo(({ system }: { system: SystemRecord }) => {
+	const [deleteOpen, setDeleteOpen] = useState(false)
+	const [editOpen, setEditOpen] = useState(false)
+	let editOpened = useRef(false)
+
+	const { id, status, host, name } = system
+
+	return (
+		<>
+			<DropdownMenu>
+				<DropdownMenuTrigger asChild>
+					<Button variant="ghost" size={"icon"} data-nolink>
+						<span className="sr-only">
+							<Trans>Open menu</Trans>
+						</span>
+						<MoreHorizontalIcon className="w-5" />
+					</Button>
+				</DropdownMenuTrigger>
+				<DropdownMenuContent align="end">
+					{!isReadOnlyUser() && (
+						<DropdownMenuItem
+							onSelect={() => {
+								editOpened.current = true
+								setEditOpen(true)
+							}}
+						>
+							<PenBoxIcon className="me-2.5 size-4" />
+							<Trans>Edit</Trans>
+						</DropdownMenuItem>
+					)}
+					<DropdownMenuItem
+						className={cn(isReadOnlyUser() && "hidden")}
+						onClick={() => {
+							pb.collection("systems").update(id, {
+								status: status === "paused" ? "pending" : "paused",
+							})
+						}}
+					>
+						{status === "paused" ? (
+							<>
+								<PlayCircleIcon className="me-2.5 size-4" />
+								<Trans>Resume</Trans>
+							</>
+						) : (
+							<>
+								<PauseCircleIcon className="me-2.5 size-4" />
+								<Trans>Pause</Trans>
+							</>
+						)}
+					</DropdownMenuItem>
+					<DropdownMenuItem onClick={() => copyToClipboard(host)}>
+						<CopyIcon className="me-2.5 size-4" />
+						<Trans>Copy host</Trans>
+					</DropdownMenuItem>
+					<DropdownMenuSeparator className={cn(isReadOnlyUser() && "hidden")} />
+					<DropdownMenuItem className={cn(isReadOnlyUser() && "hidden")} onSelect={() => setDeleteOpen(true)}>
+						<Trash2Icon className="me-2.5 size-4" />
+						<Trans>Delete</Trans>
+					</DropdownMenuItem>
+				</DropdownMenuContent>
+			</DropdownMenu>
+			{/* edit dialog */}
+			<Dialog open={editOpen} onOpenChange={setEditOpen}>
+				{editOpened.current && <SystemDialog system={system} setOpen={setEditOpen} />}
+			</Dialog>
+			{/* deletion dialog */}
+			<AlertDialog open={deleteOpen} onOpenChange={(open) => setDeleteOpen(open)}>
+				<AlertDialogContent>
+					<AlertDialogHeader>
+						<AlertDialogTitle>
+							<Trans>Are you sure you want to delete {name}?</Trans>
+						</AlertDialogTitle>
+						<AlertDialogDescription>
+							<Trans>
+								This action cannot be undone. This will permanently delete all current records for {name} from the
+								database.
+							</Trans>
+						</AlertDialogDescription>
+					</AlertDialogHeader>
+					<AlertDialogFooter>
+						<AlertDialogCancel>
+							<Trans>Cancel</Trans>
+						</AlertDialogCancel>
+						<AlertDialogAction
+							className={cn(buttonVariants({ variant: "destructive" }))}
+							onClick={() => pb.collection("systems").delete(id)}
+						>
+							<Trans>Continue</Trans>
+						</AlertDialogAction>
+					</AlertDialogFooter>
+				</AlertDialogContent>
+			</AlertDialog>
+		</>
+	)
+})

beszel/site/src/components/tabs/disks-tab.tsx

@@ -1,631 +0,0 @@
-"use client"
-
-import * as React from "react"
-import {
-	ColumnDef,
-	ColumnFiltersState,
-	flexRender,
-	getCoreRowModel,
-	getFilteredRowModel,
-	getPaginationRowModel,
-	getSortedRowModel,
-	SortingState,
-	useReactTable,
-	VisibilityState,
-} from "@tanstack/react-table"
-import { Activity, Box, Binary, Container, ChevronDown, Clock, HardDrive, Thermometer, Tags, MoreHorizontal } from "lucide-react"
-
-import { Button } from "../ui/button"
-import { Card, CardHeader, CardTitle, CardDescription } from "../ui/card"
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogHeader,
-	DialogTitle,
-	DialogTrigger,
-} from "../ui/dialog"
-import {
-	DropdownMenu,
-	DropdownMenuCheckboxItem,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuLabel,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "../ui/dropdown-menu"
-import { Input } from "../ui/input"
-import {
-	Table,
-	TableBody,
-	TableCell,
-	TableHead,
-	TableHeader,
-	TableRow,
-} from "../ui/table"
-import { Badge } from "../ui/badge"
-import { SmartData, SmartAttribute } from "@/types"
-
-
-// Column definition for S.M.A.R.T. attributes table
-export const smartColumns: ColumnDef<SmartAttribute>[] = [
-	{
-		accessorKey: "id",
-		header: "ID",
-		cell: ({ row }) => {
-			const id = row.getValue("id") as number | undefined
-			return <div className="font-medium">{id || ""}</div>
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "n",
-		header: "Name",
-		cell: ({ row }) => (
-			<div className="font-medium">{row.getValue("n")}</div>
-		),
-		enableSorting: false,
-	},
-	{
-		accessorKey: "rs",
-		header: "Value",
-		cell: ({ row }) => {
-			// if raw string is not empty, use it, otherwise use raw value
-			const rawString = row.getValue("rs") as string | undefined
-			const rawValue = row.original.rv
-			const displayValue = rawString || rawValue?.toString() || "-"
-			return <div className="font-mono text-sm">{displayValue}</div>
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "v",
-		header: "Normalized",
-		cell: ({ row }) => (
-			<div className="font-medium">{row.getValue("v")}</div>
-		),
-		enableSorting: false,
-	},
-	{
-		accessorKey: "w",
-		header: "Worst",
-		cell: ({ row }) => {
-			const worst = row.getValue("w") as number | undefined
-			return <div>{worst || ""}</div>
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "t",
-		header: "Threshold",
-		cell: ({ row }) => {
-			const threshold = row.getValue("t") as number | undefined
-			return <div>{threshold || ""}</div>
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "f",
-		header: "Flags",
-		cell: ({ row }) => {
-			const flags = row.getValue("f") as string | undefined
-			return <div className="font-mono text-sm">{flags || ""}</div>
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "wf",
-		header: "Failing",
-		cell: ({ row }) => {
-			const whenFailed = row.getValue("wf") as string | undefined
-			return <div className="font-mono text-sm">{whenFailed || ""}</div>
-		},
-		enableSorting: false,
-	},
-]
-
-export type DiskInfo = {
-	device: string
-	model: string
-	serialNumber: string
-	firmwareVersion: string
-	capacity: string
-	status: string
-	temperature: number
-	deviceType: string
-	powerOnHours?: number
-	powerCycles?: number
-}
-
-// Function to format capacity display
-function formatCapacity(bytes: number): string {
-	const units = [
-		{ name: 'PB', size: 1024 ** 5 },
-		{ name: 'TB', size: 1024 ** 4 },
-		{ name: 'GB', size: 1024 ** 3 },
-		{ name: 'MB', size: 1024 ** 2 },
-		{ name: 'KB', size: 1024 ** 1 },
-		{ name: 'B', size: 1 }
-	]
-	
-	for (const unit of units) {
-		if (bytes >= unit.size) {
-			const value = bytes / unit.size
-			// For bytes, don't show decimals; for other units show one decimal place
-			const decimals = unit.name === 'B' ? 0 : 1
-			return `${value.toFixed(decimals)} ${unit.name}`
-		}
-	}
-	
-	return '0 B'
-}
-
-// Function to convert SmartData to DiskInfo
-function convertSmartDataToDiskInfo(smartDataRecord: Record<string, SmartData>): DiskInfo[] {
-	return Object.entries(smartDataRecord).map(([key, smartData]) => ({
-		device: smartData.dn || key,
-		model: smartData.mn || "Unknown",
-		serialNumber: smartData.sn || "Unknown",
-		firmwareVersion: smartData.fv || "Unknown",
-		capacity: smartData.c ? formatCapacity(smartData.c) : "Unknown",
-		status: smartData.s || "Unknown",
-		temperature: smartData.t || 0,
-		deviceType: smartData.dt || "Unknown",
-		// These fields need to be extracted from SmartAttribute if available
-		powerOnHours: smartData.a?.find(attr => attr.n.toLowerCase().includes("poweronhours") || attr.n.toLowerCase().includes("power_on_hours"))?.rv,
-		powerCycles: smartData.a?.find(attr => attr.n.toLowerCase().includes("power") && attr.n.toLowerCase().includes("cycle"))?.rv,
-	}))
-}
-
-// S.M.A.R.T. details dialog component
-function SmartDialog({ disk, smartData }: { disk: DiskInfo; smartData?: SmartData }) {
-	const [open, setOpen] = React.useState(false)
-	
-	const smartAttributes = smartData?.a || []
-	
-	// Find all attributes where when failed is not empty
-	const failedAttributes = smartAttributes.filter(attr => attr.wf && attr.wf.trim() !== '')
-	
-	const table = useReactTable({
-		data: smartAttributes,
-		columns: smartColumns,
-		getCoreRowModel: getCoreRowModel(),
-		enableSorting: false,
-	})
-
-	return (
-		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
-				<DropdownMenuItem onSelect={(e) => e.preventDefault()}>
-					View S.M.A.R.T.
-				</DropdownMenuItem>
-			</DialogTrigger>
-			<DialogContent className="max-w-4xl max-h-[80vh] overflow-hidden flex flex-col">
-				<DialogHeader>
-					<DialogTitle>S.M.A.R.T. Details - {disk.device}</DialogTitle>
-					<DialogDescription>
-						S.M.A.R.T. attributes for {disk.model} ({disk.serialNumber})
-					</DialogDescription>
-				</DialogHeader>
-				{smartData?.s && (
-					<div className={`p-4 rounded-md ${
-						smartData.s === "PASSED" 
-							? "bg-green-100 dark:bg-green-900 border border-green-200 dark:border-green-800" 
-							: "bg-red-100 dark:bg-red-900 border border-red-200 dark:border-red-800"
-					}`}>
-						<h4 className={`font-semibold ${
-							smartData.s === "PASSED" 
-								? "text-green-800 dark:text-green-200" 
-								: "text-red-800 dark:text-red-200"
-						}`}>
-							S.M.A.R.T. Self-Test: {smartData.s}
-						</h4>
-						{failedAttributes.length > 0 && (
-							<p className="mt-2 text-red-800 dark:text-red-200">
-								Failed Attributes: {failedAttributes.map(attr => attr.n).join(", ")}
-							</p>
-						)}
-					</div>
-				)}
-				<div className="flex-1 overflow-auto">
-					{smartAttributes.length > 0 ? (
-						<div className="rounded-md border">
-							<Table>
-								<TableHeader>
-									{table.getHeaderGroups().map((headerGroup) => (
-										<TableRow key={headerGroup.id}>
-											{headerGroup.headers.map((header) => (
-												<TableHead key={header.id}>
-													{header.isPlaceholder
-														? null
-														: flexRender(
-																header.column.columnDef.header,
-																header.getContext()
-															)}
-												</TableHead>
-											))}
-										</TableRow>
-									))}
-								</TableHeader>
-								<TableBody>
-									{table.getRowModel().rows.map((row) => {
-										// Check if the attribute is failed
-										const isFailedAttribute = row.original.wf && row.original.wf.trim() !== '';
-										
-										return (
-											<TableRow 
-												key={row.id}
-												className={isFailedAttribute ? "text-red-600 dark:text-red-400" : ""}
-											>
-												{row.getVisibleCells().map((cell) => (
-													<TableCell key={cell.id}>
-														{flexRender(
-															cell.column.columnDef.cell,
-															cell.getContext()
-														)}
-													</TableCell>
-												))}
-											</TableRow>
-										);
-									})}
-								</TableBody>
-							</Table>
-						</div>
-					) : (
-						<div className="text-center py-8 text-muted-foreground">
-							No S.M.A.R.T. attributes available for this device.
-						</div>
-					)}
-				</div>
-			</DialogContent>
-		</Dialog>
-	)
-}
-
-export const columns: ColumnDef<DiskInfo>[] = [
-	{
-		accessorKey: "device",
-		header: () => (
-			<div className="flex items-center">
-				<HardDrive className="mr-2 h-4 w-4" />
-				Device
-			</div>
-		),
-		cell: ({ row }) => (
-			<div className="font-medium">{row.getValue("device")}</div>
-		),
-		enableSorting: false,
-	},
-	{
-		accessorKey: "model",
-		header: () => (
-			<div className="flex items-center">
-				<Box className="mr-2 h-4 w-4" />
-				Model
-			</div>
-		),
-		cell: ({ row }) => (
-			<div className="max-w-[200px] truncate" title={row.getValue("model")}>
-				{row.getValue("model")}
-			</div>
-		),
-		enableSorting: false,
-	},
-	{
-		accessorKey: "capacity",
-		header: () => (
-			<div className="flex items-center">
-				<Container className="mr-2 h-4 w-4" />
-				Capacity
-			</div>
-		),
-		cell: ({ row }) => (
-			<div className="font-medium">{row.getValue("capacity")}</div>
-		),
-		enableSorting: false,
-	},
-	{
-		accessorKey: "temperature",
-		header: () => (
-			<div className="flex items-center">
-				<Thermometer className="mr-2 h-4 w-4" />
-				Temp.
-			</div>
-		),
-		cell: ({ row }) => {
-			const temp = row.getValue("temperature") as number
-			const getTemperatureColor = (temp: number) => {
-				if (temp >= 60) return "destructive"
-				if (temp >= 45) return "secondary"
-				return "default"
-			}
-			return (
-				<Badge variant={getTemperatureColor(temp)}>
-					{temp}°C
-				</Badge>
-			)
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "status",
-		header: () => (
-			<div className="flex items-center">
-				<Activity className="mr-2 h-4 w-4" />
-				Status
-			</div>
-		),
-		cell: ({ row }) => {
-			const status = row.getValue("status") as string
-			return (
-				<Badge 
-					variant={status === "PASSED" ? "default" : "destructive"}
-					className={status === "PASSED" ? "bg-green-500 hover:bg-green-600 text-white" : ""}
-				>
-					{status}
-				</Badge>
-			)
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "deviceType",
-		header: () => (
-			<div className="flex items-center">
-				<Tags className="mr-2 h-4 w-4" />
-				Type
-			</div>
-		),
-		cell: ({ row }) => (
-			<Badge variant="outline" className="uppercase">
-				{row.getValue("deviceType")}
-			</Badge>
-		),
-		enableSorting: false,
-	},
-	{
-		accessorKey: "powerOnHours",
-		header: () => (
-			<div className="flex items-center">
-				<Clock className="mr-2 h-4 w-4" />
-				Power On Time
-			</div>
-		),
-		cell: ({ row }) => {
-			const hours = row.getValue("powerOnHours") as number | undefined
-			if (!hours && hours !== 0) {
-				return (
-					<div className="text-sm text-muted-foreground">
-						N/A
-					</div>
-				)
-			}
-			const days = Math.floor(hours / 24)
-			return (
-				<div className="text-sm">
-					<div>{hours.toLocaleString()} hours</div>
-					<div className="text-muted-foreground text-xs">{days} days</div>
-				</div>
-			)
-		},
-		enableSorting: false,
-	},
-	{
-		accessorKey: "serialNumber",
-		header: () => (
-			<div className="flex items-center">
-				<Binary className="mr-2 h-4 w-4" />
-				Serial Number
-			</div>
-		),
-		cell: ({ row }) => (
-			<div className="font-mono text-sm">{row.getValue("serialNumber")}</div>
-		),
-		enableSorting: false,
-	},
-	{
-		id: "actions",
-		enableHiding: false,
-		cell: () => null, // This will be overwritten by columnsWithSmartData
-	},
-]
-
-export default function DisksTab({ smartData }: { smartData?: Record<string, SmartData> }) {
-	const [sorting, setSorting] = React.useState<SortingState>([])
-	const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
-	const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
-	const [rowSelection, setRowSelection] = React.useState({})
-
-	// Convert SmartData to DiskInfo, if no data use empty array
-	const diskData = React.useMemo(() => {
-		return smartData ? convertSmartDataToDiskInfo(smartData) : []
-	}, [smartData])
-
-	// Create column definitions with SmartData
-	const columnsWithSmartData = React.useMemo(() => {
-		return columns.map(column => {
-			if (column.id === "actions") {
-				return {
-					...column,
-					cell: ({ row }: { row: any }) => {
-						const disk = row.original as DiskInfo
-						// Find the corresponding SmartData
-						const diskSmartData = smartData ? Object.values(smartData).find(
-							sd => sd.dn === disk.device || sd.mn === disk.model
-						) : undefined
-
-						return (
-							<DropdownMenu>
-								<DropdownMenuTrigger asChild>
-									<Button variant="ghost" className="h-8 w-8 p-0">
-										<span className="sr-only">Open menu</span>
-										<MoreHorizontal className="h-4 w-4" />
-									</Button>
-								</DropdownMenuTrigger>
-								<DropdownMenuContent align="end">
-									<DropdownMenuLabel>Actions</DropdownMenuLabel>
-									<SmartDialog disk={disk} smartData={diskSmartData} />
-									<DropdownMenuSeparator />
-									<DropdownMenuItem
-										onClick={() => navigator.clipboard.writeText(disk.device)}
-									>
-										Copy device path
-									</DropdownMenuItem>
-									<DropdownMenuItem
-										onClick={() => navigator.clipboard.writeText(disk.serialNumber)}
-									>
-										Copy serial number
-									</DropdownMenuItem>
-								</DropdownMenuContent>
-							</DropdownMenu>
-						)
-					}
-				}
-			}
-			return column
-		})
-	}, [smartData])
-
-	const table = useReactTable({
-		data: diskData,
-		columns: columnsWithSmartData,
-		onSortingChange: setSorting,
-		onColumnFiltersChange: setColumnFilters,
-		getCoreRowModel: getCoreRowModel(),
-		getPaginationRowModel: getPaginationRowModel(),
-		getSortedRowModel: getSortedRowModel(),
-		getFilteredRowModel: getFilteredRowModel(),
-		onColumnVisibilityChange: setColumnVisibility,
-		onRowSelectionChange: setRowSelection,
-		state: {
-			sorting,
-			columnFilters,
-			columnVisibility,
-			rowSelection,
-		},
-	})
-
-	return (
-		<div>
-			<Card>
-				<CardHeader>
-					<CardTitle>Disk Information</CardTitle>
-					<CardDescription>Disk information and S.M.A.R.T. data</CardDescription>
-				</CardHeader>
-				<div className="px-6 pb-6">
-					<div className="w-full">
-						<div className="flex items-center py-4">
-							<Input
-								placeholder="Filter devices..."
-								value={(table.getColumn("device")?.getFilterValue() as string) ?? ""}
-								onChange={(event) =>
-									table.getColumn("device")?.setFilterValue(event.target.value)
-								}
-								className="max-w-sm"
-							/>
-							<DropdownMenu>
-								<DropdownMenuTrigger asChild>
-									<Button variant="outline" className="ml-auto">
-										Columns <ChevronDown className="ml-2 h-4 w-4" />
-									</Button>
-								</DropdownMenuTrigger>
-								<DropdownMenuContent align="end">
-									{table
-										.getAllColumns()
-										.filter((column) => column.getCanHide())
-										.map((column) => {
-											return (
-												<DropdownMenuCheckboxItem
-													key={column.id}
-													className="capitalize"
-													checked={column.getIsVisible()}
-													onCheckedChange={(value) =>
-														column.toggleVisibility(!!value)
-													}
-												>
-													{column.id}
-												</DropdownMenuCheckboxItem>
-											)
-										})}
-								</DropdownMenuContent>
-							</DropdownMenu>
-						</div>
-						<div className="rounded-md border grid">
-							<Table>
-								<TableHeader>
-									{table.getHeaderGroups().map((headerGroup) => (
-										<TableRow key={headerGroup.id}>
-											{headerGroup.headers.map((header) => {
-												return (
-													<TableHead key={header.id}>
-														{header.isPlaceholder
-															? null
-															: flexRender(
-																	header.column.columnDef.header,
-																	header.getContext()
-																)}
-													</TableHead>
-												)
-											})}
-										</TableRow>
-									))}
-								</TableHeader>
-								<TableBody>
-									{table.getRowModel().rows?.length ? (
-										table.getRowModel().rows.map((row) => (
-											<TableRow
-												key={row.id}
-												data-state={row.getIsSelected() && "selected"}
-											>
-												{row.getVisibleCells().map((cell) => (
-													<TableCell key={cell.id}>
-														{flexRender(
-															cell.column.columnDef.cell,
-															cell.getContext()
-														)}
-													</TableCell>
-												))}
-											</TableRow>
-										))
-									) : (
-										<TableRow>
-											<TableCell
-												colSpan={columns.length}
-												className="h-24 text-center"
-											>
-												{smartData ? "No disk data available." : "Loading disk data..."}
-											</TableCell>
-										</TableRow>
-									)}
-								</TableBody>
-							</Table>
-						</div>
-						<div className="flex items-center justify-end space-x-2 py-4">
-							<div className="text-muted-foreground flex-1 text-sm">
-								{table.getFilteredRowModel().rows.length} disk device(s)
-							</div>
-							<div className="space-x-2">
-								<Button
-									variant="outline"
-									size="sm"
-									onClick={() => table.previousPage()}
-									disabled={!table.getCanPreviousPage()}
-								>
-									Previous
-								</Button>
-								<Button
-									variant="outline"
-									size="sm"
-									onClick={() => table.nextPage()}
-									disabled={!table.getCanNextPage()}
-								>
-									Next
-								</Button>
-							</div>
-						</div>
-					</div>
-				</div>
-			</Card>
-		</div>
-	)
-} 

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

@@ -99,7 +99,6 @@ const ChartTooltipContent = React.forwardRef<
 			unit?: string
 			filter?: string
 			contentFormatter?: (item: any, key: string) => React.ReactNode | string
-			truncate?: boolean
 		}
 >(
 	(
@@ -120,7 +119,6 @@ const ChartTooltipContent = React.forwardRef<
 			filter,
 			itemSorter,
 			contentFormatter: content = undefined,
-			truncate = false,
 		},
 		ref
 	) => {
@@ -129,7 +127,7 @@ const ChartTooltipContent = React.forwardRef<
 
 		React.useMemo(() => {
 			if (filter) {
-				payload = payload?.filter((item) => (item.name as string)?.toLowerCase().includes(filter.toLowerCase()))
+				payload = payload?.filter((item) => (item.name as string)?.includes(filter))
 			}
 			if (itemSorter) {
 				// @ts-ignore
@@ -216,15 +214,10 @@ const ChartTooltipContent = React.forwardRef<
 												nestLabel ? "items-end" : "items-center"
 											)}
 										>
-											{nestLabel ? tooltipLabel : null}
-											<span
-												className={cn(
-													"text-muted-foreground",
-													truncate ? "max-w-40 truncate leading-normal -my-1" : ""
-												)}
-											>
-												{itemConfig?.label || item.name}
-											</span>
+											<div className="grid gap-1.5">
+												{nestLabel ? tooltipLabel : null}
+												<span className="text-muted-foreground">{itemConfig?.label || item.name}</span>
+											</div>
 											{item.value !== undefined && (
 												<span className="font-medium tabular-nums text-foreground">
 													{content && typeof content === "function"

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

@@ -12,54 +12,6 @@ export function TuxIcon(props: SVGProps<SVGSVGElement>) {
 	)
 }
 
-// icon park (Apache 2.0) https://github.com/bytedance/IconPark/blob/master/LICENSE
-export function WindowsIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg {...props} viewBox="0 0 48 48">
-			<path
-				fill="none"
-				stroke="currentColor"
-				strokeWidth="3.8"
-				d="m6.8 11 12.9-1.7v12.1h-13zm18-2.2 16.4-2v14.6H25zm0 18.6 16.4.4v13.4L25 38.6zm-18-.8 12.9.3v10.9l-13-2.2z"
-			/>
-		</svg>
-	)
-}
-
-// teenyicons (MIT) https://github.com/teenyicons/teenyicons/blob/master/LICENSE
-export function AppleIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 20 20" {...props}>
-			<path
-				fill="currentColor"
-				d="M14.1 4.7a5 5 0 0 1 3.8 2c-3.3 1.9-2.8 6.7.6 8L17.2 17c-.8 1.3-2 2.9-3.5 2.9-1.2 0-1.6-.9-3.3-.8s-2.2.8-3.5.8c-1.4 0-2.5-1.5-3.4-2.7-2.3-3.6-2.5-7.9-1.1-10 1-1.7 2.6-2.6 4.1-2.6 1.6 0 2.6.8 3.8.8 1.3 0 2-.8 3.8-.8M13.7 0c.2 1.2-.3 2.4-1 3.2a4 4 0 0 1-3 1.6c-.2-1.2.3-2.3 1-3.2.7-.8 2-1.5 3-1.6"
-			/>
-		</svg>
-	)
-}
-
-// Apache 2.0 https://github.com/Templarian/MaterialDesign/blob/master/LICENSE
-export function FreeBsdIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg viewBox="0 0 24 24" {...props}>
-			<path
-				fill="currentColor"
-				d="M2.7 2C3.5 2 6 3.2 6 3.2 4.8 4 3.7 5 3 6.4 2.1 4.8 1.3 2.9 2 2.2l.7-.2m18.1.1c.4 0 .8 0 1 .2 1 1.1-2 5.8-2.4 6.4-.5.5-1.8 0-2.9-1-1-1.2-1.5-2.4-1-3 .4-.4 3.6-2.4 5.3-2.6m-8.8.5c1.3 0 2.5.2 3.7.7l-1 .7c-1 1-.6 2.8 1 4.4 1 1 2.1 1.6 3 1.6a2 2 0 0 0 1.5-.6l.7-1a9.7 9.7 0 1 1-18.6 3.8A9.7 9.7 0 0 1 12 2.7"
-			/>
-		</svg>
-	)
-}
-
-// ion icons (MIT) https://github.com/ionic-team/ionicons/blob/main/LICENSE
-export function DockerIcon(props: SVGProps<SVGSVGElement>) {
-	return (
-		<svg {...props} viewBox="0 0 512 512" fill="currentColor">
-			<path d="M507 211c-1-1-14-11-42-11a133 133 0 0 0-21 2c-6-36-36-54-37-55l-7-4-5 7a102 102 0 0 0-13 30c-5 21-2 40 8 57-12 7-33 9-37 9H16a16 16 0 0 0-16 16 241 241 0 0 0 15 87c11 30 29 53 51 67 25 15 66 24 113 24a344 344 0 0 0 62-6 257 257 0 0 0 82-29 224 224 0 0 0 55-46c27-30 43-64 55-94h4c30 0 48-12 58-22a63 63 0 0 0 15-22l2-6Z" />
-			<path d="M47 236h45a4 4 0 0 0 4-4v-40a4 4 0 0 0-4-4H47a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4m63 0h45a4 4 0 0 0 4-4v-40a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4m63 0h45a4 4 0 0 0 4-4v-40a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4m62 0h45a4 4 0 0 0 4-4v-40a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4m-125-57h45a4 4 0 0 0 4-4v-41a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v41a4 4 0 0 0 4 4m63 0h45a4 4 0 0 0 4-4v-41a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v41a4 4 0 0 0 4 4m62 0h45a4 4 0 0 0 4-4v-41a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v41a4 4 0 0 0 4 4m0-58h45a4 4 0 0 0 4-4V76a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4m63 116h45a4 4 0 0 0 4-4v-40a4 4 0 0 0-4-4h-45a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4" />
-		</svg>
-	)
-}
-
 // MingCute Apache License 2.0 https://github.com/Richard9394/MingCute
 export function Rows(props: SVGProps<SVGSVGElement>) {
 	return (

beszel/site/src/components/ui/table.tsx

@@ -51,7 +51,7 @@ const TableHead = React.forwardRef<HTMLTableCellElement, React.ThHTMLAttributes<
 		<th
 			ref={ref}
 			className={cn(
-				"h-12 px-4 text-start align-middle whitespace-nowrap font-medium text-muted-foreground [&:has([role=checkbox])]:pe-0",
+				"h-12 px-4 text-start align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pe-0",
 				className
 			)}
 			{...props}
@@ -62,7 +62,7 @@ TableHead.displayName = "TableHead"
 
 const TableCell = React.forwardRef<HTMLTableCellElement, React.TdHTMLAttributes<HTMLTableCellElement>>(
 	({ className, ...props }, ref) => (
-		<td ref={ref} className={cn("p-4 align-middle whitespace-nowrap [&:has([role=checkbox])]:pe-0", className)} {...props} />
+		<td ref={ref} className={cn("p-4 align-middle [&:has([role=checkbox])]:pe-0", className)} {...props} />
 	)
 )
 TableCell.displayName = "TableCell"

beszel/site/src/index.css

@@ -74,7 +74,6 @@
 @layer base {
 	* {
 		@apply border-border;
-		overflow-anchor: none;
 	}
 	body {
 		@apply bg-background text-foreground;

beszel/site/src/lib/enums.ts

@@ -1,13 +0,0 @@
-export enum Os {
-	Linux = 0,
-	Darwin,
-	Windows,
-	FreeBSD,
-}
-
-export enum ChartType {
-	Memory,
-	Disk,
-	Network,
-	CPU,
-}

beszel/site/src/lib/i18n.ts

@@ -3,7 +3,15 @@ import { i18n } from "@lingui/core"
 import type { Messages } from "@lingui/core"
 import languages from "@/lib/languages"
 import { detect, fromStorage, fromNavigator } from "@lingui/detect-locale"
-import { messages as enMessages } from "@/locales/en/en"
+import { messages as enMessages } from "@/locales/en/en.ts"
+
+// let locale = detect(fromUrl("lang"), fromStorage("lang"), fromNavigator(), "en")
+let locale = detect(fromStorage("lang"), fromNavigator(), "en")
+
+// log if dev
+if (import.meta.env.DEV) {
+	console.log("detected locale", locale)
+}
 
 // activates locale
 function activateLocale(locale: string, messages: Messages = enMessages) {
@@ -29,28 +37,21 @@ export async function dynamicActivate(locale: string) {
 	}
 }
 
-export function getLocale() {
-	// let locale = detect(fromUrl("lang"), fromStorage("lang"), fromNavigator(), "en")
-	let locale = detect(fromStorage("lang"), fromNavigator(), "en")
-	// log if dev
-	if (import.meta.env.DEV) {
-		console.log("detected locale", locale)
-	}
-	// handle zh variants
-	if (locale?.startsWith("zh-")) {
-		// map zh variants to zh-CN
-		const zhVariantMap: Record<string, string> = {
-			"zh-HK": "zh-HK",
-			"zh-TW": "zh",
-			"zh-MO": "zh",
-			"zh-Hant": "zh",
-		}
-		return zhVariantMap[locale] || "zh-CN"
+// handle zh variants
+if (locale?.startsWith("zh-")) {
+	// map zh variants to zh-CN
+	const zhVariantMap: Record<string, string> = {
+		"zh-HK": "zh-HK",
+		"zh-TW": "zh",
+		"zh-MO": "zh",
+		"zh-Hant": "zh",
 	}
+	dynamicActivate(zhVariantMap[locale] || "zh-CN")
+} else {
 	locale = (locale || "en").split("-")[0]
 	// use en if locale is not in languages
 	if (!languages.some((l) => l.lang === locale)) {
 		locale = "en"
 	}
-	return locale
+	dynamicActivate(locale)
 }

beszel/site/src/lib/stores.ts

@@ -18,6 +18,9 @@ export const $alerts = atom([] as AlertRecord[])
 /** SSH public key */
 export const $publicKey = atom("")
 
+/** Beszel hub version */
+export const $hubVersion = atom("")
+
 /** Chart time period */
 export const $chartTime = atom("1h") as PreinitializedWritableAtom<ChartTimes>
 
@@ -38,9 +41,6 @@ $userSettings.subscribe((value) => {
 /** Container chart filter */
 export const $containerFilter = atom("")
 
-/** Temperature chart filter */
-export const $temperatureFilter = atom("")
-
 /** Fallback copy to clipboard dialog content */
 export const $copyContent = atom("")
 

beszel/site/src/lib/utils.ts

@@ -1,4 +1,3 @@
-import { t } from "@lingui/core/macro";
 import { toast } from "@/components/ui/use-toast"
 import { type ClassValue, clsx } from "clsx"
 import { twMerge } from "tailwind-merge"
@@ -10,21 +9,13 @@ import { timeDay, timeHour } from "d3-time"
 import { useEffect, useState } from "react"
 import { CpuIcon, HardDriveIcon, MemoryStickIcon, ServerIcon } from "lucide-react"
 import { EthernetIcon, ThermometerIcon } from "@/components/ui/icons"
+import { t } from "@lingui/macro"
 import { prependBasePath } from "@/components/router"
 
 export function cn(...inputs: ClassValue[]) {
 	return twMerge(clsx(inputs))
 }
-
-/** Adds event listener to node and returns function that removes the listener */
-export function listen<T extends Event = Event>(
-  node: Node, 
-  event: string, 
-  handler: (event: T) => void
-) {
-  node.addEventListener(event, handler as EventListener)
-  return () => node.removeEventListener(event, handler as EventListener)
-}
+// export const cn = clsx
 
 export async function copyToClipboard(content: string) {
 	const duration = 1500
@@ -77,7 +68,6 @@ export const updateSystemList = (() => {
 
 /** Logs the user out by clearing the auth store and unsubscribing from realtime updates. */
 export async function logOut() {
-	sessionStorage.setItem("lo", "t")
 	pb.authStore.clear()
 	pb.realtime.unsubscribe()
 }