release 0.10.2

- Fixes a bad sensor returning an error instead of other good sensors
- Adds ability to set GPU as PRIMARY_SENSOR

.github/DISCUSSION_TEMPLATE/support.yml

@@ -0,0 +1,61 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### Before opening a discussion:
+
+        - Check the [common issues guide](https://beszel.dev/guide/common-issues).
+        - Search existing [issues](https://github.com/henrygd/beszel/issues) and [discussions](https://github.com/henrygd/beszel/discussions) (including closed).
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of the issue or question. If applicable, add screenshots to help explain your problem.
+    validations:
+      required: true
+  - type: input
+    id: system
+    attributes:
+      label: OS / Architecture
+      placeholder: linux/amd64 (agent), freebsd/arm64 (hub)
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Beszel version
+      placeholder: 0.9.1
+    validations:
+      required: true
+  - type: dropdown
+    id: install-method
+    attributes:
+      label: Installation method
+      options:
+        - Docker
+        - Binary
+        - Nix
+        - Unraid
+        - Coolify
+        - Other (please describe above)
+    validations:
+      required: true
+  - type: textarea
+    id: config
+    attributes:
+      label: Configuration
+      description: Please provide any relevant service configuration
+      render: yaml
+  - type: textarea
+    id: hub-logs
+    attributes:
+      label: Hub Logs
+      description: Check the logs page in PocketBase (`/_/#/logs`) for relevant errors (copy JSON).
+      render: json
+  - type: textarea
+    id: agent-logs
+    attributes:
+      label: Agent Logs
+      description: Please provide any logs from the agent, if relevant. Use `LOG_LEVEL=debug` for more info.
+      render: shell

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,91 @@
+name: 🐛 Bug report
+description: Report a new bug or issue.
+title: '[Bug]: '
+labels: ['bug']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### Thanks for taking the time to fill out this bug report!
+
+        - For more general support, please [start a support thread](https://github.com/henrygd/beszel/discussions/new?category=support).
+        - To request a change or feature, use the [feature request form](https://github.com/henrygd/beszel/issues/new?template=feature_request.yml).
+        - Please do not submit bugs that are specific to ZFS. We plan to add integration with ZFS utilities in the near future.
+
+        ### Before submitting a bug report:
+
+        - Check the [common issues guide](https://beszel.dev/guide/common-issues).
+        - Search existing [issues](https://github.com/henrygd/beszel/issues) and [discussions](https://github.com/henrygd/beszel/discussions) (including closed).
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Explain the issue you experienced clearly and concisely.
+      placeholder: I went to the coffee pot and it was empty.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: In a perfect world, what should have happened?
+      placeholder: When I got to the coffee pot, it should have been full.
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: Describe how to reproduce the issue in repeatable steps.
+      placeholder: |
+        1. Go to the coffee pot.
+        2. Make more coffee.
+        3. Pour it into a cup.
+    validations:
+      required: true
+  - type: input
+    id: system
+    attributes:
+      label: OS / Architecture
+      placeholder: linux/amd64 (agent), freebsd/arm64 (hub)
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Beszel version
+      placeholder: 0.9.1
+    validations:
+      required: true
+  - type: dropdown
+    id: install-method
+    attributes:
+      label: Installation method
+      default: 0
+      options:
+        - Docker
+        - Binary
+        - Nix
+        - Unraid
+        - Coolify
+        - Other (please describe above)
+    validations:
+      required: true
+  - type: textarea
+    id: config
+    attributes:
+      label: Configuration
+      description: Please provide any relevant service configuration
+      render: yaml
+  - type: textarea
+    id: hub-logs
+    attributes:
+      label: Hub Logs
+      description: Check the logs page in PocketBase (`/_/#/logs`) for relevant errors (copy JSON).
+      render: json
+  - type: textarea
+    id: agent-logs
+    attributes:
+      label: Agent Logs
+      description: Please provide any logs from the agent, if relevant. Use `LOG_LEVEL=debug` for more info.
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 Support and questions
+    url: https://github.com/henrygd/beszel/discussions
+    about: Ask and answer questions here.
+  - name: ℹ️ View the Common Issues page
+    url: https://beszel.dev/guide/common-issues
+    about: Find information about commonly encountered problems.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,18 @@
+name: 🚀 Feature request
+description: Request a new feature or change.
+title: "[Feature]: "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: Before submitting, please search existing [issues](https://github.com/henrygd/beszel/issues) and [discussions](https://github.com/henrygd/beszel/discussions) (including closed).
+  - type: textarea
+    attributes:
+      label: Describe the feature you would like to see
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe how you would like to see this feature implemented
+    validations:
+      required: true

.github/funding.yml

@@ -0,0 +1 @@
+buy_me_a_coffee: henrygd

.github/workflows/docker-images.yml

@@ -15,9 +15,27 @@ jobs:
           - image: henrygd/beszel
             context: ./beszel
             dockerfile: ./beszel/dockerfile_Hub
+            registry: docker.io
+            username_secret: DOCKERHUB_USERNAME
+            password_secret: DOCKERHUB_TOKEN
           - image: henrygd/beszel-agent
             context: ./beszel
             dockerfile: ./beszel/dockerfile_Agent
+            registry: docker.io
+            username_secret: DOCKERHUB_USERNAME
+            password_secret: DOCKERHUB_TOKEN
+          - image: ghcr.io/${{ github.repository }}/beszel
+            context: ./beszel
+            dockerfile: ./beszel/dockerfile_Hub
+            registry: ghcr.io
+            username: ${{ github.actor }}
+            password_secret: GITHUB_TOKEN
+          - image: ghcr.io/${{ github.repository }}/beszel-agent
+            context: ./beszel
+            dockerfile: ./beszel/dockerfile_Agent
+            registry: ghcr.io
+            username: ${{ github.actor }}
+            password_secret: GITHUB_TOKEN
     permissions:
       contents: read
       packages: write
@@ -57,8 +75,9 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ matrix.username || secrets[matrix.username_secret] }}
+          password: ${{ secrets[matrix.password_secret] }}
+          registry: ${{ matrix.registry }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action

.gitignore

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

beszel/.goreleaser.yml

@@ -29,14 +29,22 @@ builds:
       - linux
       - darwin
       - freebsd
+      - windows
     goarch:
       - amd64
       - arm64
       - arm
       - mips64
+      - riscv64
     ignore:
       - goos: freebsd
         goarch: arm
+      - goos: windows
+        goarch: arm
+      - goos: darwin
+        goarch: riscv64
+      - goos: windows
+        goarch: riscv64
 
 archives:
   - id: beszel
@@ -47,6 +55,10 @@ archives:
       {{ .Binary }}_
       {{- .Os }}_
       {{- .Arch }}
+    format_overrides:
+      - goos: windows
+        format: zip
+
   - id: beszel-agent
     format: tar.gz
     builds:
@@ -55,10 +67,52 @@ archives:
       {{ .Binary }}_
       {{- .Os }}_
       {{- .Arch }}
-    # use zip for windows archives
-    # format_overrides:
-    #   - goos: windows
-    #     format: zip
+
+nfpms:
+  - id: beszel-agent
+    package_name: beszel-agent
+    description: |-
+      Agent for Beszel
+      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.
+    maintainer: henrygd <hank@henrygd.me>
+    section: net
+    builds:
+      - 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
+        packager: deb
+      - src: ../supplemental/debian/copyright
+        dst: usr/share/doc/beszel-agent/copyright
+        packager: deb
+      - src: ../supplemental/debian/lintian-overrides
+        dst: usr/share/lintian/overrides/beszel-agent
+        packager: deb
+    scripts:
+      postinstall: ../supplemental/debian/postinstall.sh
+      preremove: ../supplemental/debian/prerm.sh
+      postremove: ../supplemental/debian/postrm.sh
+    deb:
+      predepends:
+        - adduser
+        - debconf
+      scripts:
+        templates: ../supplemental/debian/templates
+        # Currently broken due to a bug in goreleaser
+        # https://github.com/goreleaser/goreleaser/issues/5487
+        #config: ../supplemental/debian/config.sh
+
+release:
+  draft: true
 
 changelog:
   disable: true

beszel/Makefile

@@ -14,6 +14,10 @@ clean:
 lint:
 	golangci-lint run
 
+test: export GOEXPERIMENT=synctest
+test:
+	go test -tags=testing ./...
+
 tidy:
 	go mod tidy
 
@@ -48,6 +52,7 @@ dev-server: generate-locales
 		cd ./site && npm run dev; \
 	fi
 
+dev-hub: export ENV=dev
 dev-hub:
 	mkdir -p ./site/dist && touch ./site/dist/index.html
 	@if command -v entr >/dev/null 2>&1; then \

beszel/cmd/agent/agent.go

@@ -3,39 +3,120 @@ package main
 import (
 	"beszel"
 	"beszel/internal/agent"
+	"flag"
 	"fmt"
 	"log"
 	"os"
-	"strings"
+
+	"golang.org/x/crypto/ssh"
 )
 
-func main() {
-	// handle flags / subcommands
-	if len(os.Args) > 1 {
-		switch os.Args[1] {
-		case "-v":
-			fmt.Println(beszel.AppName+"-agent", beszel.Version)
-		case "update":
-			agent.Update()
-		}
-		os.Exit(0)
-	}
-
-	var pubKey []byte
-	if pubKeyEnv, exists := os.LookupEnv("KEY"); exists {
-		pubKey = []byte(pubKeyEnv)
-	} else {
-		log.Fatal("KEY environment variable is not set")
-	}
-
-	addr := ":45876"
-	if portEnvVar, exists := os.LookupEnv("PORT"); exists {
-		// allow passing an address in the form of "127.0.0.1:45876"
-		if !strings.Contains(portEnvVar, ":") {
-			portEnvVar = ":" + portEnvVar
-		}
-		addr = portEnvVar
-	}
-
-	agent.NewAgent().Run(pubKey, addr)
+// 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.
+}
+
+// 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 {
+	flag.StringVar(&opts.key, "key", "", "Public key(s) for SSH authentication")
+	flag.StringVar(&opts.listen, "listen", "", "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:")
+		flag.PrintDefaults()
+	}
+
+	subcommand := ""
+	if len(os.Args) > 1 {
+		subcommand = os.Args[1]
+	}
+
+	switch subcommand {
+	case "-v", "version":
+		fmt.Println(beszel.AppName+"-agent", beszel.Version)
+		return true
+	case "help":
+		flag.Usage()
+		return true
+	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
+	}
+
+	flag.Parse()
+	return false
+}
+
+// loadPublicKeys loads the public keys from the command line flag, environment variable, or key file.
+func (opts *cmdOptions) loadPublicKeys() ([]ssh.PublicKey, error) {
+	// Try command line flag first
+	if opts.key != "" {
+		return agent.ParseKeys(opts.key)
+	}
+
+	// Try environment variable
+	if key, ok := agent.GetEnv("KEY"); ok && key != "" {
+		return agent.ParseKeys(key)
+	}
+
+	// Try key file
+	keyFile, ok := agent.GetEnv("KEY_FILE")
+	if !ok {
+		return nil, fmt.Errorf("no key provided: must set -key flag, KEY env var, or KEY_FILE env var. Use 'beszel-agent help' for usage")
+	}
+
+	pubKey, err := os.ReadFile(keyFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read key file: %w", err)
+	}
+	return agent.ParseKeys(string(pubKey))
+}
+
+func (opts *cmdOptions) getAddress() string {
+	return agent.GetAddress(opts.listen)
+}
+
+func main() {
+	var opts cmdOptions
+	subcommandHandled := opts.parse()
+
+	if subcommandHandled {
+		return
+	}
+
+	var serverConfig agent.ServerOptions
+	var err error
+	serverConfig.Keys, err = opts.loadPublicKeys()
+	if err != nil {
+		log.Fatal("Failed to load public keys:", err)
+	}
+
+	addr := opts.getAddress()
+	serverConfig.Addr = addr
+	serverConfig.Network = agent.GetNetwork(addr)
+
+	agent := agent.NewAgent()
+	if err := agent.StartServer(serverConfig); err != nil {
+		log.Fatal("Failed to start server:", err)
+	}
 }

beszel/cmd/agent/agent_test.go

@@ -0,0 +1,303 @@
+package main
+
+import (
+	"beszel/internal/agent"
+	"crypto/ed25519"
+	"flag"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/crypto/ssh"
+)
+
+func TestGetAddress(t *testing.T) {
+	tests := []struct {
+		name     string
+		opts     cmdOptions
+		envVars  map[string]string
+		expected string
+	}{
+		{
+			name:     "default port when no config",
+			opts:     cmdOptions{},
+			expected: ":45876",
+		},
+		{
+			name: "use address from flag",
+			opts: cmdOptions{
+				listen: "8080",
+			},
+			expected: ":8080",
+		},
+		{
+			name: "use unix socket from flag",
+			opts: cmdOptions{
+				listen: "/tmp/beszel.sock",
+			},
+			expected: "/tmp/beszel.sock",
+		},
+		{
+			name: "use LISTEN env var",
+			opts: cmdOptions{},
+			envVars: map[string]string{
+				"LISTEN": "1.2.3.4:9090",
+			},
+			expected: "1.2.3.4:9090",
+		},
+		{
+			name: "use legacy PORT env var",
+			opts: cmdOptions{},
+			envVars: map[string]string{
+				"PORT": "7070",
+			},
+			expected: ":7070",
+		},
+		{
+			name: "use unix socket from env var",
+			opts: cmdOptions{
+				listen: "",
+			},
+			envVars: map[string]string{
+				"LISTEN": "/tmp/beszel.sock",
+			},
+			expected: "/tmp/beszel.sock",
+		},
+		{
+			name: "flag takes precedence over env vars",
+			opts: cmdOptions{
+				listen: ":8080",
+			},
+			envVars: map[string]string{
+				"LISTEN": ":9090",
+				"PORT":   "7070",
+			},
+			expected: ":8080",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Setup environment
+			for k, v := range tt.envVars {
+				t.Setenv(k, v)
+			}
+
+			addr := tt.opts.getAddress()
+			assert.Equal(t, tt.expected, addr)
+		})
+	}
+}
+
+func TestLoadPublicKeys(t *testing.T) {
+	// Generate a test key
+	_, priv, err := ed25519.GenerateKey(nil)
+	require.NoError(t, err)
+	signer, err := ssh.NewSignerFromKey(priv)
+	require.NoError(t, err)
+	pubKey := ssh.MarshalAuthorizedKey(signer.PublicKey())
+
+	tests := []struct {
+		name        string
+		opts        cmdOptions
+		envVars     map[string]string
+		setupFiles  map[string][]byte
+		wantErr     bool
+		errContains string
+	}{
+		{
+			name: "load key from flag",
+			opts: cmdOptions{
+				key: string(pubKey),
+			},
+		},
+		{
+			name: "load key from env var",
+			envVars: map[string]string{
+				"KEY": string(pubKey),
+			},
+		},
+		{
+			name: "load key from file",
+			envVars: map[string]string{
+				"KEY_FILE": "testkey.pub",
+			},
+			setupFiles: map[string][]byte{
+				"testkey.pub": pubKey,
+			},
+		},
+		{
+			name:        "error when no key provided",
+			wantErr:     true,
+			errContains: "no key provided",
+		},
+		{
+			name: "error on invalid key file",
+			envVars: map[string]string{
+				"KEY_FILE": "nonexistent.pub",
+			},
+			wantErr:     true,
+			errContains: "failed to read key file",
+		},
+		{
+			name: "error on invalid key data",
+			opts: cmdOptions{
+				key: "invalid-key-data",
+			},
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create a temporary directory for test files
+			if len(tt.setupFiles) > 0 {
+				tmpDir := t.TempDir()
+				for name, content := range tt.setupFiles {
+					path := filepath.Join(tmpDir, name)
+					err := os.WriteFile(path, content, 0600)
+					require.NoError(t, err)
+					if tt.envVars != nil {
+						tt.envVars["KEY_FILE"] = path
+					}
+				}
+			}
+
+			// Set up environment
+			for k, v := range tt.envVars {
+				t.Setenv(k, v)
+			}
+
+			keys, err := tt.opts.loadPublicKeys()
+			if tt.wantErr {
+				assert.Error(t, err)
+				if tt.errContains != "" {
+					assert.Contains(t, err.Error(), tt.errContains)
+				}
+				return
+			}
+
+			require.NoError(t, err)
+			assert.Len(t, keys, 1)
+			assert.Equal(t, signer.PublicKey().Type(), keys[0].Type())
+		})
+	}
+}
+
+func TestGetNetwork(t *testing.T) {
+	tests := []struct {
+		name     string
+		opts     cmdOptions
+		envVars  map[string]string
+		expected string
+	}{
+		{
+			name: "NETWORK env var",
+			envVars: map[string]string{
+				"NETWORK": "tcp4",
+			},
+			expected: "tcp4",
+		},
+		{
+			name:     "only port",
+			opts:     cmdOptions{listen: "8080"},
+			expected: "tcp",
+		},
+		{
+			name:     "ipv4 address",
+			opts:     cmdOptions{listen: "1.2.3.4:8080"},
+			expected: "tcp",
+		},
+		{
+			name:     "ipv6 address",
+			opts:     cmdOptions{listen: "[2001:db8::1]:8080"},
+			expected: "tcp",
+		},
+		{
+			name:     "unix network",
+			opts:     cmdOptions{listen: "/tmp/beszel.sock"},
+			expected: "unix",
+		},
+		{
+			name:     "env var network",
+			opts:     cmdOptions{listen: ":8080"},
+			envVars:  map[string]string{"NETWORK": "tcp4"},
+			expected: "tcp4",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Setup environment
+			for k, v := range tt.envVars {
+				t.Setenv(k, v)
+			}
+			network := agent.GetNetwork(tt.opts.listen)
+			assert.Equal(t, tt.expected, network)
+		})
+	}
+}
+
+func TestParseFlags(t *testing.T) {
+	// Save original command line arguments and restore after test
+	oldArgs := os.Args
+	defer func() {
+		os.Args = oldArgs
+		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
+	}()
+
+	tests := []struct {
+		name     string
+		args     []string
+		expected cmdOptions
+	}{
+		{
+			name: "no flags",
+			args: []string{"cmd"},
+			expected: cmdOptions{
+				key:    "",
+				listen: "",
+			},
+		},
+		{
+			name: "key flag only",
+			args: []string{"cmd", "-key", "testkey"},
+			expected: cmdOptions{
+				key:    "testkey",
+				listen: "",
+			},
+		},
+		{
+			name: "addr flag only",
+			args: []string{"cmd", "-listen", ":8080"},
+			expected: cmdOptions{
+				key:    "",
+				listen: ":8080",
+			},
+		},
+		{
+			name: "both flags",
+			args: []string{"cmd", "-key", "testkey", "-listen", ":8080"},
+			expected: cmdOptions{
+				key:    "testkey",
+				listen: ":8080",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Reset flags for each test
+			flag.CommandLine = flag.NewFlagSet(tt.args[0], flag.ExitOnError)
+			os.Args = tt.args
+
+			var opts cmdOptions
+			opts.parse()
+			flag.Parse()
+
+			assert.Equal(t, tt.expected, opts)
+		})
+	}
+}

beszel/cmd/hub/hub.go

@@ -3,27 +3,97 @@ 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() {
-	app := pocketbase.NewWithConfig(pocketbase.Config{
-		DefaultDataDir: beszel.AppName + "_data",
-	})
-	app.RootCmd.Version = beszel.Version
-	app.RootCmd.Use = beszel.AppName
-	app.RootCmd.Short = ""
+	// 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
-	app.RootCmd.AddCommand(&cobra.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())
 
-	hub.NewHub(app).Run()
+	// 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
 }

beszel/go.mod

@@ -1,77 +1,72 @@
 module beszel
 
-go 1.23
-
-toolchain go1.23.2
+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.4
+	github.com/goccy/go-json v0.10.5
 	github.com/pocketbase/dbx v1.11.0
-	github.com/pocketbase/pocketbase v0.24.1
+	github.com/pocketbase/pocketbase v0.25.9
 	github.com/rhysd/go-github-selfupdate v1.2.3
-	github.com/shirou/gopsutil/v4 v4.24.12
+	github.com/shirou/gopsutil/v4 v4.25.2
 	github.com/spf13/cast v1.7.1
-	github.com/spf13/cobra v1.8.1
-	golang.org/x/crypto v0.31.0
-	golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
+	github.com/spf13/cobra v1.9.1
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/crypto v0.35.0
+	golang.org/x/exp v0.0.0-20250228200357-dead58393ab7
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
 	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.32.7 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.28.7 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.48 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.45 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.3 // indirect
-	github.com/aws/smithy-go v1.22.1 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.29.8 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.61 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.64 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.78.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.25.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.16 // indirect
+	github.com/aws/smithy-go v1.22.3 // 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.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.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/golang-jwt/jwt/v4 v4.5.1 // 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/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/lufia/plan9stats v0.0.0-20250224150550-a661cff19cfb // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/spf13/pflag v1.0.5 // 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.14 // indirect
 	github.com/tklauser/numcpus v0.9.0 // indirect
@@ -79,23 +74,19 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	gocloud.dev v0.40.0 // indirect
-	golang.org/x/image v0.23.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/oauth2 v0.25.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/image v0.24.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.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.214.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
-	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/protobuf v1.36.1 // indirect
-	modernc.org/gc/v3 v3.0.0-20250105121824-520be1a3aee6 // indirect
-	modernc.org/libc v1.55.3 // indirect
+	google.golang.org/api v0.223.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
+	modernc.org/libc v1.61.13 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
-	modernc.org/memory v1.8.1 // indirect
-	modernc.org/sqlite v1.34.4 // indirect
-	modernc.org/strutil v1.2.1 // indirect
-	modernc.org/token v1.1.0 // indirect
+	modernc.org/memory v1.8.2 // indirect
+	modernc.org/sqlite v1.35.0 // indirect
 )

beszel/go.sum

@@ -1,10 +1,10 @@
 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.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs=
-cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q=
-cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=
-cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
+cloud.google.com/go/auth v0.15.0 h1:Ly0u4aA5vG/fsSsxu98qCQBemXtAtJf+95z9HK+cxps=
+cloud.google.com/go/auth v0.15.0/go.mod h1:WJDGqZ1o9E9wKIL+IwStfyn/+s59zl4Bi+1KQNVXLZ8=
+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=
@@ -14,11 +14,7 @@ cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyX
 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/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
-github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
-github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 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=
@@ -26,44 +22,44 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/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.32.7 h1:ky5o35oENWi0JYWUZkB7WYvVPP+bcRF5/Iq7JWSb5Rw=
-github.com/aws/aws-sdk-go-v2 v1.32.7/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc=
-github.com/aws/aws-sdk-go-v2/config v1.28.7 h1:GduUnoTXlhkgnxTD93g1nv4tVPILbdNQOzav+Wpg7AE=
-github.com/aws/aws-sdk-go-v2/config v1.28.7/go.mod h1:vZGX6GVkIE8uECSUHB6MWAUsd4ZcG2Yq/dMa4refR3M=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.48 h1:IYdLD1qTJ0zanRavulofmqut4afs45mOWEI+MzZtTfQ=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.48/go.mod h1:tOscxHN3CGmuX9idQ3+qbkzrjVIx32lqDSU1/0d/qXs=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 h1:kqOrpojG71DxJm/KDPO+Z/y1phm1JlC8/iT+5XRmAn8=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22/go.mod h1:NtSFajXVVL8TA2QNngagVZmUtXciyrHOt7xgz4faS/M=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.45 h1:ZxB8WFVYwolhDZxuZXoesHkl+L9cXLWy0K/G0QkNATc=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.45/go.mod h1:1krrbyoFFDqaNldmltPTP+mK3sAXLHPoaFtISOw2Hkk=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 h1:I/5wmGMffY4happ8NOCuIUEWGUvvFp5NSeQcXl9RHcI=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26/go.mod h1:FR8f4turZtNy6baO0KJ5FJUmXH/cSkI9fOngs0yl6mA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 h1:zXFLuEuMMUOvEARXFUVJdfqZ4bvvSgdGRq/ATcrQxzM=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26/go.mod h1:3o2Wpy0bogG1kyOPrgkXA8pgIfEEv0+m19O9D5+W8y8=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 h1:GeNJsIFHB+WW5ap2Tec4K6dzcVTsRbsT1Lra46Hv9ME=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26/go.mod h1:zfgMpwHDXX2WGoG84xG2H+ZlPTkJUU4YUvx2svLQYWo=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 h1:tB4tNw83KcajNAzaIMhkhVI2Nt8fAZd5A5ro113FEMY=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7/go.mod h1:lvpyBGkZ3tZ9iSsUIcC2EWp+0ywa7aK3BLT+FwZi+mQ=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 h1:8eUsivBQzZHqe/3FE+cqwfH+0p5Jo8PFM/QYQSmeZ+M=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7/go.mod h1:kLPQvGUmxn/fqiCrDeohwG33bq2pQpGeY62yRO6Nrh0=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 h1:Hi0KGbrnr57bEHWM0bJ1QcBzxLrL/k2DHvGYhb8+W1w=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7/go.mod h1:wKNgWgExdjjrm4qvfbTorkvocEstaoDl4WCvGfeCy9c=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0 h1:SAfh4pNx5LuTafKKWR02Y+hL3A+3TX8cTKG1OIAJaBk=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0/go.mod h1:r+xl5yzMk9083rMR+sJ5TYj9Tihvf/l1oxzZXDgGj2Q=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 h1:CvuUmnXI7ebaUAhbJcDy9YQx8wHR69eZ9I7q5hszt/g=
-github.com/aws/aws-sdk-go-v2/service/sso v1.24.8/go.mod h1:XDeGv1opzwm8ubxddF0cgqkZWsyOtw4lr6dxwmb6YQg=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 h1:F2rBfNAL5UyswqoeWv9zs74N/NanhK16ydHW1pahX6E=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7/go.mod h1:JfyQ0g2JG8+Krq0EuZNnRwX0mU0HrwY/tG6JNfcqh4k=
-github.com/aws/aws-sdk-go-v2/service/sts v1.33.3 h1:Xgv/hyNgvLda/M9l9qxXc4UFSgppnRczLxlMs5Ae/QY=
-github.com/aws/aws-sdk-go-v2/service/sts v1.33.3/go.mod h1:5Gn+d+VaaRgsjewpMvGazt0WfcFO+Md4wLOuBfGR9Bc=
-github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
-github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
+github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM=
+github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14=
+github.com/aws/aws-sdk-go-v2/config v1.29.8 h1:RpwAfYcV2lr/yRc4lWhUM9JRPQqKgKWmou3LV7UfWP4=
+github.com/aws/aws-sdk-go-v2/config v1.29.8/go.mod h1:t+G7Fq1OcO8cXTPPXzxQSnj/5Xzdc9jAAD3Xrn9/Mgo=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.61 h1:Hd/uX6Wo2iUW1JWII+rmyCD7MMhOe7ALwQXN6sKDd1o=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.61/go.mod h1:L7vaLkwHY1qgW0gG1zG0z/X0sQ5tpIY5iI13+j3qI80=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.64 h1:RTko0AQ0i1vWXDM97DkuW6zskgOxFxm4RqC0kmBJFkE=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.64/go.mod h1:ty968MpOa5CoQ/ALWNB8Gmfoehof2nRHDR/DZDPfimE=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.2 h1:t/gZFyrijKuSU0elA5kRngP/oU3mc0I+Dvp8HwRE4c0=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.2/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.78.0 h1:EBm8lXevBWe+kK9VOU/IBeOI189WPRwPUc3LvJK9GOs=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.78.0/go.mod h1:4qzsZSzB/KiX2EzDjs9D7A8rI/WGJxZceVJIHqtJjIU=
+github.com/aws/aws-sdk-go-v2/service/sso v1.25.0 h1:2U9sF8nKy7UgyEeLiZTRg6ShBS22z8UnYpV6aRFL0is=
+github.com/aws/aws-sdk-go-v2/service/sso v1.25.0/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0 h1:wjAdc85cXdQR5uLx5FwWvGIHm4OPJhTyzUHU8craXtE=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.16 h1:BHEK2Q/7CMRMCb3nySi/w8UbIcPhKvYP5s1xf8/izn0=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.16/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
+github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k=
+github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
 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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -71,9 +67,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 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/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
-github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -84,8 +78,8 @@ github.com/domodwyer/mailyak/v3 v3.6.2 h1:x3tGMsyFhTCaxp6ycgR0FE/bu5QiNp+hetUuCO
 github.com/domodwyer/mailyak/v3 v3.6.2/go.mod h1:lOm/u9CyCVWHeaAmHIdF4RiKVxKUT/H5XX10lIKAL6c=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+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=
@@ -117,10 +111,10 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
 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.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
-github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+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.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=
@@ -145,8 +139,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 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.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-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 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=
@@ -154,8 +148,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 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.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
-github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
+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=
@@ -165,10 +159,6 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gT
 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/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
-github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
 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=
@@ -178,8 +168,6 @@ github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nu
 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/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 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=
@@ -187,18 +175,12 @@ 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-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.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/lufia/plan9stats v0.0.0-20250224150550-a661cff19cfb h1:YU0XAr3+rMpM8fP80KEesn32Qa9qkbquokvuwzWyYuA=
+github.com/lufia/plan9stats v0.0.0-20250224150550-a661cff19cfb/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
+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/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
-github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
-github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 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/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
@@ -213,8 +195,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pocketbase/dbx v1.11.0 h1:LpZezioMfT3K4tLrqA55wWFw1EtH1pM4tzSVa7kgszU=
 github.com/pocketbase/dbx v1.11.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs=
-github.com/pocketbase/pocketbase v0.24.1 h1:Hhx3L4eap7g3kyBQ8OuWneZo7mYu1lrMvqQpxjK+zcs=
-github.com/pocketbase/pocketbase v0.24.1/go.mod h1:VVaUmgKgjCBW3s/ob2SSHuDNtTboTbwK/VyTUguTt3o=
+github.com/pocketbase/pocketbase v0.25.9 h1:/PSJcy39vEGv4lsBG4HV0ZFLcFsTdK9oMkJbxVlVJSs=
+github.com/pocketbase/pocketbase v0.25.9/go.mod h1:gOnPr+g/GS+iqKh5XYXycdRWVGhiHY4c1H4TGjU9DDw=
 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=
@@ -225,19 +207,18 @@ 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.24.12 h1:qvePBOk20e0IKA1QXrIIU+jmk+zEiYVVx06WjBRlZo4=
-github.com/shirou/gopsutil/v4 v4.24.12/go.mod h1:DCtMPAad2XceTeIAbGyVfycbYQNBGk2P8cvDi7/VN9o=
+github.com/shirou/gopsutil/v4 v4.25.2 h1:NMscG3l2CqtWFS86kj3vP7soOczqrQYIEhO/pMvvQkk=
+github.com/shirou/gopsutil/v4 v4.25.2/go.mod h1:34gBYJzyqCDT11b6bMHP0XCvWeU3J61XRT7a2EmCRTA=
 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.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 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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=
@@ -252,45 +233,44 @@ github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS
 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/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
-go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=
-go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE=
-go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE=
-go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY=
-go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk=
-go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0=
-go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
-go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
-go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys=
-go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
+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.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+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.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
-golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
+golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 h1:aWwlzYV971S4BXRS9AmqwDLAD85ouC6X+pocatKY58c=
+golang.org/x/exp v0.0.0-20250228200357-dead58393ab7/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
+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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.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=
@@ -298,70 +278,53 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 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.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
 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.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
-golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
+golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+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-20190222072716-a9d3bda3a223/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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+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.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+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.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
+golang.org/x/time v0.10.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.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.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 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.214.0 h1:h2Gkq07OYi6kusGOaT/9rnNljuXmqPnaig7WGPmKbwA=
-google.golang.org/api v0.214.0/go.mod h1:bYPpLG8AyeMWwDU6NXoB00xC0DFkikVvd5MfwoxjLqE=
+google.golang.org/api v0.223.0 h1:JUTaWEriXmEy5AhvdMgksGGPEFsYfUKaPEYXd4c3Wvc=
+google.golang.org/api v0.223.0/go.mod h1:C+RS7Z+dDwds2b+zoAk5hN/eSfsiCn0UDrYof/M4d2M=
 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=
@@ -373,15 +336,15 @@ google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 h1:CT2Thj5AuPV9phr
 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-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e h1:YA5lmSs3zc/5w+xsRcHqpETkaYyK63ivEPzNTcUUlSA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
 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.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+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=
@@ -391,8 +354,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 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.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/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=
@@ -405,28 +368,26 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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/cc/v4 v4.24.4 h1:TFkx1s6dCkQpd6dKurBNmpo+G8Zl4Sq/ztJ+2+DEsh0=
+modernc.org/cc/v4 v4.24.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/ccgo/v4 v4.23.16 h1:Z2N+kk38b7SfySC1ZkpGLN2vthNJP1+ZzGZIlH7uBxo=
+modernc.org/ccgo/v4 v4.23.16/go.mod h1:nNma8goMTY7aQZQNTyN9AIoJfxav4nvTnvKThAeMDdo=
 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/gc/v3 v3.0.0-20250105121824-520be1a3aee6 h1:JoKwHjIFumiKrjMbp1cNbC5E9UyCgA/ZcID0xOWQ2N8=
-modernc.org/gc/v3 v3.0.0-20250105121824-520be1a3aee6/go.mod h1:LG5UO1Ran4OO0JRKz2oNiXhR5nNrgz0PzH7UKhz0aMU=
-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/gc/v2 v2.6.3 h1:aJVhcqAte49LF+mGveZ5KPlsp4tdGdAOT4sipJXADjw=
+modernc.org/gc/v2 v2.6.3/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/libc v1.61.13 h1:3LRd6ZO1ezsFiX1y+bHd1ipyEHIJKvuprv0sLTBwLW8=
+modernc.org/libc v1.61.13/go.mod h1:8F/uJWL/3nNil0Lgt1Dpz+GgkApWh04N3el3hxJcA6E=
 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.8.1 h1:HS1HRg1jEohnuONobEq2WrLEhLyw8+J42yLFTnllm2A=
-modernc.org/memory v1.8.1/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.4 h1:sjdARozcL5KJBvYQvLlZEmctRgW9xqIZc2ncN7PU0P8=
-modernc.org/sqlite v1.34.4/go.mod h1:3QQFCG2SEMtc2nv+Wq4cQCH7Hjcg+p/RMlS1XK+zwbk=
+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.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.35.0 h1:yQps4fegMnZFdphtzlfQTCNBWtS0CZv48pRpW3RFHRw=
+modernc.org/sqlite v1.35.0/go.mod h1:9cr2sicr7jIaWTBKQmAxQLfBv9LL0su4ZTEV+utt3ic=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

beszel/internal/agent/agent.go

@@ -8,11 +8,14 @@ import (
 	"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
@@ -23,24 +26,25 @@ type Agent struct {
 	dockerManager    *dockerManager             // Manages Docker API requests
 	sensorsContext   context.Context            // Sensors context to override sys location
 	sensorsWhitelist map[string]struct{}        // List of sensors to monitor
+	primarySensor    string                     // Value of PRIMARY_SENSOR env var
 	systemInfo       system.Info                // Host system info
 	gpuManager       *GPUManager                // Manages GPU data
+	cache            *SessionCache              // Cache for system stats based on primary session ID
 }
 
 func NewAgent() *Agent {
-	return &Agent{
+	agent := &Agent{
 		sensorsContext: context.Background(),
-		memCalc:        os.Getenv("MEM_CALC"),
 		fsStats:        make(map[string]*system.FsStats),
+		cache:          NewSessionCache(69 * time.Second),
 	}
-}
-
-func (a *Agent) Run(pubKey []byte, addr string) {
+	agent.memCalc, _ = GetEnv("MEM_CALC")
+	agent.primarySensor, _ = GetEnv("PRIMARY_SENSOR")
 	// Set up slog with a log level determined by the LOG_LEVEL env var
-	if logLevelStr, exists := os.LookupEnv("LOG_LEVEL"); exists {
+	if logLevelStr, exists := GetEnv("LOG_LEVEL"); exists {
 		switch strings.ToLower(logLevelStr) {
 		case "debug":
-			a.debug = true
+			agent.debug = true
 			slog.SetLogLoggerLevel(slog.LevelDebug)
 		case "warn":
 			slog.SetLogLoggerLevel(slog.LevelWarn)
@@ -52,65 +56,84 @@ func (a *Agent) Run(pubKey []byte, addr string) {
 	slog.Debug(beszel.Version)
 
 	// Set sensors context (allows overriding sys location for sensors)
-	if sysSensors, exists := os.LookupEnv("SYS_SENSORS"); exists {
+	if sysSensors, exists := GetEnv("SYS_SENSORS"); exists {
 		slog.Info("SYS_SENSORS", "path", sysSensors)
-		a.sensorsContext = context.WithValue(a.sensorsContext,
+		agent.sensorsContext = context.WithValue(agent.sensorsContext,
 			common.EnvKey, common.EnvMap{common.HostSysEnvKey: sysSensors},
 		)
 	}
 
 	// Set sensors whitelist
-	if sensors, exists := os.LookupEnv("SENSORS"); exists {
-		a.sensorsWhitelist = make(map[string]struct{})
-		for _, sensor := range strings.Split(sensors, ",") {
+	if sensors, exists := GetEnv("SENSORS"); exists {
+		agent.sensorsWhitelist = make(map[string]struct{})
+		for sensor := range strings.SplitSeq(sensors, ",") {
 			if sensor != "" {
-				a.sensorsWhitelist[sensor] = struct{}{}
+				agent.sensorsWhitelist[sensor] = struct{}{}
 			}
 		}
 	}
 
 	// initialize system info / docker manager
-	a.initializeSystemInfo()
-	a.initializeDiskInfo()
-	a.initializeNetIoStats()
-	a.dockerManager = newDockerManager(a)
+	agent.initializeSystemInfo()
+	agent.initializeDiskInfo()
+	agent.initializeNetIoStats()
+	agent.dockerManager = newDockerManager(agent)
 
 	// initialize GPU manager
 	if gm, err := NewGPUManager(); err != nil {
 		slog.Debug("GPU", "err", err)
 	} else {
-		a.gpuManager = gm
+		agent.gpuManager = gm
 	}
 
 	// if debugging, print stats
-	if a.debug {
-		slog.Debug("Stats", "data", a.gatherStats())
+	if agent.debug {
+		slog.Debug("Stats", "data", agent.gatherStats(""))
 	}
 
-	a.startServer(pubKey, addr)
+	return agent
 }
 
-func (a *Agent) gatherStats() system.CombinedData {
-	slog.Debug("Getting stats")
-	systemData := system.CombinedData{
+// GetEnv retrieves an environment variable with a "BESZEL_AGENT_" prefix, or falls back to the unprefixed key.
+func GetEnv(key string) (value string, exists bool) {
+	if value, exists = os.LookupEnv("BESZEL_AGENT_" + key); exists {
+		return value, exists
+	}
+	// Fallback to the old unprefixed key
+	return os.LookupEnv(key)
+}
+
+func (a *Agent) gatherStats(sessionID string) *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{
 		Stats: a.getSystemStats(),
 		Info:  a.systemInfo,
 	}
-	slog.Debug("System stats", "data", systemData)
-	// add docker stats
+	slog.Debug("System stats", "data", cachedData)
+
 	if containerStats, err := a.dockerManager.getDockerStats(); err == nil {
-		systemData.Containers = containerStats
-		slog.Debug("Docker stats", "data", systemData.Containers)
+		cachedData.Containers = containerStats
+		slog.Debug("Docker stats", "data", cachedData.Containers)
 	} else {
-		slog.Debug("Error getting docker stats", "err", err)
+		slog.Debug("Docker stats", "err", err)
 	}
-	// add extra filesystems
-	systemData.Stats.ExtraFs = make(map[string]*system.FsStats)
+
+	cachedData.Stats.ExtraFs = make(map[string]*system.FsStats)
 	for name, stats := range a.fsStats {
 		if !stats.Root && stats.DiskTotal > 0 {
-			systemData.Stats.ExtraFs[name] = stats
+			cachedData.Stats.ExtraFs[name] = stats
 		}
 	}
-	slog.Debug("Extra filesystems", "data", systemData.Stats.ExtraFs)
-	return systemData
+	slog.Debug("Extra filesystems", "data", cachedData.Stats.ExtraFs)
+
+	a.cache.Set(sessionID, cachedData)
+	return cachedData
 }

beszel/internal/agent/agent_cache.go

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,85 @@
+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

@@ -3,18 +3,17 @@ package agent
 import (
 	"beszel/internal/entities/system"
 	"log/slog"
-	"time"
-
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/shirou/gopsutil/v4/disk"
 )
 
 // Sets up the filesystems to monitor for disk usage and I/O.
 func (a *Agent) initializeDiskInfo() {
-	filesystem := os.Getenv("FILESYSTEM")
+	filesystem, _ := GetEnv("FILESYSTEM")
 	efPath := "/extra-filesystems"
 	hasRoot := false
 
@@ -79,7 +78,7 @@ func (a *Agent) initializeDiskInfo() {
 	}
 
 	// Add EXTRA_FILESYSTEMS env var values to fsStats
-	if extraFilesystems, exists := os.LookupEnv("EXTRA_FILESYSTEMS"); exists {
+	if extraFilesystems, exists := GetEnv("EXTRA_FILESYSTEMS"); exists {
 		for _, fs := range strings.Split(extraFilesystems, ",") {
 			found := false
 			for _, p := range partitions {

beszel/internal/agent/docker.go

@@ -22,12 +22,24 @@ 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
+	apiContainerList    []*container.ApiInfo        // List of containers from Docker API (no pointer)
 	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)
 }
 
+// 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
 func (d *dockerManager) queue() {
 	d.wg.Add(1)
@@ -52,11 +64,12 @@ 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
 	}
 
-	containersLength := len(*dm.apiContainerList)
+	containersLength := len(dm.apiContainerList)
 
 	// store valid ids to clean up old container ids from map
 	if dm.validIds == nil {
@@ -65,9 +78,10 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 		clear(dm.validIds)
 	}
 
-	var failedContainters []container.ApiInfo
+	var failedContainers []*container.ApiInfo
 
-	for _, ctr := range *dm.apiContainerList {
+	for i := range dm.apiContainerList {
+		ctr := dm.apiContainerList[i]
 		ctr.IdShort = ctr.Id[:12]
 		dm.validIds[ctr.IdShort] = struct{}{}
 		// check if container is less than 1 minute old (possible restart)
@@ -84,7 +98,7 @@ func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
 			if err != nil {
 				dm.containerStatsMutex.Lock()
 				delete(dm.containerStatsMap, ctr.IdShort)
-				failedContainters = append(failedContainters, ctr)
+				failedContainers = append(failedContainers, ctr)
 				dm.containerStatsMutex.Unlock()
 			}
 		}()
@@ -93,9 +107,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(failedContainters) > 0 {
-		slog.Debug("Retrying failed containers", "count", len(failedContainters))
-		for _, ctr := range failedContainters {
+	if len(failedContainers) > 0 {
+		slog.Debug("Retrying failed containers", "count", len(failedContainers))
+		for _, ctr := range failedContainers {
 			dm.queue()
 			go func() {
 				defer dm.dequeue()
@@ -122,7 +136,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")
@@ -208,7 +222,7 @@ func (dm *dockerManager) deleteContainerStatsSync(id string) {
 
 // Creates a new http client for Docker or Podman API
 func newDockerManager(a *Agent) *dockerManager {
-	dockerHost, exists := os.LookupEnv("DOCKER_HOST")
+	dockerHost, exists := GetEnv("DOCKER_HOST")
 	if exists {
 		slog.Info("DOCKER_HOST", "host", dockerHost)
 	} else {
@@ -242,7 +256,7 @@ func newDockerManager(a *Agent) *dockerManager {
 
 	// configurable timeout
 	timeout := time.Millisecond * 2100
-	if t, set := os.LookupEnv("DOCKER_TIMEOUT"); set {
+	if t, set := GetEnv("DOCKER_TIMEOUT"); set {
 		timeout, err = time.ParseDuration(t)
 		if err != nil {
 			slog.Error(err.Error())
@@ -251,20 +265,27 @@ func newDockerManager(a *Agent) *dockerManager {
 		slog.Info("DOCKER_TIMEOUT", "timeout", timeout)
 	}
 
-	dockerClient := &dockerManager{
+	// Custom user-agent to avoid docker bug: https://github.com/docker/for-mac/issues/7575
+	userAgentTransport := &userAgentRoundTripper{
+		rt:        transport,
+		userAgent: "Docker-Client/",
+	}
+
+	manager := &dockerManager{
 		client: &http.Client{
 			Timeout:   timeout,
-			Transport: transport,
+			Transport: userAgentTransport,
 		},
 		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
-		dockerClient.goodDockerVersion = true
-		return dockerClient
+		manager.goodDockerVersion = true
+		return manager
 	}
 
 	// Check docker version
@@ -272,23 +293,24 @@ func newDockerManager(a *Agent) *dockerManager {
 	var versionInfo struct {
 		Version string `json:"Version"`
 	}
-	resp, err := dockerClient.client.Get("http://localhost/version")
+	resp, err := manager.client.Get("http://localhost/version")
 	if err != nil {
-		return dockerClient
+		return manager
 	}
+	defer resp.Body.Close()
 
 	if err := json.NewDecoder(resp.Body).Decode(&versionInfo); err != nil {
-		return dockerClient
+		return manager
 	}
 
 	// 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 {
-		dockerClient.goodDockerVersion = true
+		manager.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 dockerClient
+	return manager
 }
 
 // Test docker / podman sockets and return if one exists

beszel/internal/agent/gpu.go

@@ -3,9 +3,11 @@ package agent
 import (
 	"beszel/internal/entities/system"
 	"bufio"
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -14,30 +16,55 @@ 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
 	nvidiaSmi  bool
 	rocmSmi    bool
+	tegrastats bool
 	GpuDataMap map[string]*system.GPUData
-	mutex      sync.Mutex
 }
 
 // RocmSmiJson represents the JSON structure of rocm-smi output
 type RocmSmiJson struct {
-	ID          string `json:"GUID"`
-	Name        string `json:"Card series"`
-	Temperature string `json:"Temperature (Sensor edge) (C)"`
-	MemoryUsed  string `json:"VRAM Total Used Memory (B)"`
-	MemoryTotal string `json:"VRAM Total Memory (B)"`
-	Usage       string `json:"GPU use (%)"`
-	Power       string `json:"Current Socket Graphics Package Power (W)"`
+	ID           string `json:"GUID"`
+	Name         string `json:"Card series"`
+	Temperature  string `json:"Temperature (Sensor edge) (C)"`
+	MemoryUsed   string `json:"VRAM Total Used Memory (B)"`
+	MemoryTotal  string `json:"VRAM Total Memory (B)"`
+	Usage        string `json:"GPU use (%)"`
+	PowerPackage string `json:"Average Graphics Package Power (W)"`
+	PowerSocket  string `json:"Current Socket Graphics Package Power (W)"`
 }
 
 // gpuCollector defines a collector for a specific GPU management utility (nvidia-smi or rocm-smi)
 type gpuCollector struct {
-	name  string
-	cmd   *exec.Cmd
-	parse func([]byte) bool // returns true if valid data was found
+	name    string
+	cmdArgs []string
+	parse   func([]byte) bool // returns true if valid data was found
+	buf     []byte
 }
 
 var errNoValidData = fmt.Errorf("no valid GPU data found") // Error for missing data
@@ -52,7 +79,7 @@ func (c *gpuCollector) start() {
 				break
 			}
 			slog.Warn(c.name+" failed, restarting", "err", err)
-			time.Sleep(time.Second * 5)
+			time.Sleep(retryWaitTime)
 			continue
 		}
 	}
@@ -60,71 +87,120 @@ func (c *gpuCollector) start() {
 
 // collect executes the command, parses output with the assigned parser function
 func (c *gpuCollector) collect() error {
-	stdout, err := c.cmd.StdoutPipe()
+	cmd := exec.Command(c.name, c.cmdArgs...)
+	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		return err
 	}
-	if err := c.cmd.Start(); err != nil {
+	if err := cmd.Start(); err != nil {
 		return err
 	}
 
 	scanner := bufio.NewScanner(stdout)
-	buf := make([]byte, 0, 8*1024)
-	scanner.Buffer(buf, bufio.MaxScanTokenSize)
-
-	hasValidData := false
-	for scanner.Scan() {
-		if c.parse(scanner.Bytes()) {
-			hasValidData = true
-		}
+	if c.buf == nil {
+		c.buf = make([]byte, 0, cmdBufferSize)
 	}
+	scanner.Buffer(c.buf, bufio.MaxScanTokenSize)
 
-	if !hasValidData {
-		return errNoValidData
+	for scanner.Scan() {
+		hasValidData := c.parse(scanner.Bytes())
+		if !hasValidData {
+			return errNoValidData
+		}
 	}
 
 	if err := scanner.Err(); err != nil {
 		return fmt.Errorf("scanner error: %w", err)
 	}
-	return c.cmd.Wait()
+	return cmd.Wait()
+}
+
+// getJetsonParser returns a function to parse the output of tegrastats and update the GPUData map
+func (gm *GPUManager) getJetsonParser() func(output []byte) bool {
+	// use closure to avoid recompiling the regex
+	ramPattern := regexp.MustCompile(`RAM (\d+)/(\d+)MB`)
+	gr3dPattern := regexp.MustCompile(`GR3D_FREQ (\d+)%`)
+	tempPattern := regexp.MustCompile(`tj@(\d+\.?\d*)C`)
+	// Orin Nano / NX do not have GPU specific power monitor
+	// 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`)
+
+	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
+		}
+		// Parse RAM usage
+		ramMatches := ramPattern.FindSubmatch(output)
+		if ramMatches != nil {
+			gpuData.MemoryUsed, _ = strconv.ParseFloat(string(ramMatches[1]), 64)
+			gpuData.MemoryTotal, _ = strconv.ParseFloat(string(ramMatches[2]), 64)
+		}
+		// Parse GR3D (GPU) usage
+		gr3dMatches := gr3dPattern.FindSubmatch(output)
+		if gr3dMatches != nil {
+			gr3dUsage, _ := strconv.ParseFloat(string(gr3dMatches[1]), 64)
+			gpuData.Usage += gr3dUsage
+		}
+		// Parse temperature
+		tempMatches := tempPattern.FindSubmatch(output)
+		if tempMatches != nil {
+			gpuData.Temperature, _ = strconv.ParseFloat(string(tempMatches[1]), 64)
+		}
+		// Parse power usage
+		powerMatches := powerPattern.FindSubmatch(output)
+		if powerMatches != nil {
+			power, _ := strconv.ParseFloat(string(powerMatches[2]), 64)
+			gpuData.Power += power / milliwattsInAWatt
+		}
+		gpuData.Count++
+		return true
+	}
 }
 
 // parseNvidiaData parses the output of nvidia-smi and updates the GPUData map
 func (gm *GPUManager) parseNvidiaData(output []byte) bool {
-	fields := strings.Split(string(output), ", ")
-	if len(fields) < 7 {
-		return false
-	}
-	gm.mutex.Lock()
-	defer gm.mutex.Unlock()
-	lines := strings.Split(string(output), "\n")
-	for _, line := range lines {
-		if line != "" {
-			fields := strings.Split(line, ", ")
-			if len(fields) >= 7 {
-				id := fields[0]
-				temp, _ := strconv.ParseFloat(fields[2], 64)
-				memoryUsage, _ := strconv.ParseFloat(fields[3], 64)
-				totalMemory, _ := strconv.ParseFloat(fields[4], 64)
-				usage, _ := strconv.ParseFloat(fields[5], 64)
-				power, _ := strconv.ParseFloat(fields[6], 64)
-				// add gpu if not exists
-				if _, ok := gm.GpuDataMap[id]; !ok {
-					name := strings.TrimPrefix(fields[1], "NVIDIA ")
-					gm.GpuDataMap[id] = &system.GPUData{Name: strings.TrimSuffix(name, " Laptop GPU")}
-				}
-				// update gpu data
-				gpu := gm.GpuDataMap[id]
-				gpu.Temperature = temp
-				gpu.MemoryUsed = memoryUsage / 1.024
-				gpu.MemoryTotal = totalMemory / 1.024
-				gpu.Usage += usage
-				gpu.Power += power
-				gpu.Count++
+	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
+		fields := strings.Split(strings.TrimSpace(line), ", ")
+		if len(fields) < 7 {
+			continue
+		}
+		valid = true
+		id := fields[0]
+		temp, _ := strconv.ParseFloat(fields[2], 64)
+		memoryUsage, _ := strconv.ParseFloat(fields[3], 64)
+		totalMemory, _ := strconv.ParseFloat(fields[4], 64)
+		usage, _ := strconv.ParseFloat(fields[5], 64)
+		power, _ := strconv.ParseFloat(fields[6], 64)
+		// add gpu if not exists
+		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.Usage += usage
+		gpu.Power += power
+		gpu.Count++
 	}
-	return true
+	return valid
 }
 
 // parseAmdData parses the output of rocm-smi and updates the GPUData map
@@ -133,24 +209,26 @@ func (gm *GPUManager) parseAmdData(output []byte) bool {
 	if err := json.Unmarshal(output, &rocmSmiInfo); err != nil || len(rocmSmiInfo) == 0 {
 		return false
 	}
-	gm.mutex.Lock()
-	defer gm.mutex.Unlock()
+	gm.Lock()
+	defer gm.Unlock()
 	for _, v := range rocmSmiInfo {
-		temp, _ := strconv.ParseFloat(v.Temperature, 64)
+		var power float64
+		if v.PowerPackage != "" {
+			power, _ = strconv.ParseFloat(v.PowerPackage, 64)
+		} else {
+			power, _ = strconv.ParseFloat(v.PowerSocket, 64)
+		}
 		memoryUsage, _ := strconv.ParseFloat(v.MemoryUsed, 64)
 		totalMemory, _ := strconv.ParseFloat(v.MemoryTotal, 64)
 		usage, _ := strconv.ParseFloat(v.Usage, 64)
-		power, _ := strconv.ParseFloat(v.Power, 64)
-		memoryUsage = bytesToMegabytes(memoryUsage)
-		totalMemory = bytesToMegabytes(totalMemory)
 
 		if _, ok := gm.GpuDataMap[v.ID]; !ok {
 			gm.GpuDataMap[v.ID] = &system.GPUData{Name: v.Name}
 		}
 		gpu := gm.GpuDataMap[v.ID]
-		gpu.Temperature = temp
-		gpu.MemoryUsed = memoryUsage
-		gpu.MemoryTotal = totalMemory
+		gpu.Temperature, _ = strconv.ParseFloat(v.Temperature, 64)
+		gpu.MemoryUsed = bytesToMegabytes(memoryUsage)
+		gpu.MemoryTotal = bytesToMegabytes(totalMemory)
 		gpu.Usage += usage
 		gpu.Power += power
 		gpu.Count++
@@ -160,8 +238,8 @@ func (gm *GPUManager) parseAmdData(output []byte) bool {
 
 // sums and resets the current GPU utilization data since the last update
 func (gm *GPUManager) GetCurrentData() map[string]system.GPUData {
-	gm.mutex.Lock()
-	defer gm.mutex.Unlock()
+	gm.Lock()
+	defer gm.Unlock()
 
 	// check for GPUs with the same name
 	nameCounts := make(map[string]int)
@@ -188,44 +266,62 @@ func (gm *GPUManager) GetCurrentData() map[string]system.GPUData {
 		}
 		gpuData[id] = gpuCopy
 	}
+	slog.Debug("GPU", "data", gpuData)
 	return gpuData
 }
 
-// detectGPUs returns the GPU brand (nvidia or amd) or an error if none is found
-// todo: make sure there's actually a GPU, not just if the command exists
+// detectGPUs checks for the presence of GPU management tools (nvidia-smi, rocm-smi, tegrastats)
+// in the system path. It sets the corresponding flags in the GPUManager struct if any of these
+// 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.Command("nvidia-smi").Run(); err == nil {
+	if _, err := exec.LookPath(nvidiaSmiCmd); err == nil {
 		gm.nvidiaSmi = true
 	}
-	if err := exec.Command("rocm-smi").Run(); err == nil {
+	if _, err := exec.LookPath(rocmSmiCmd); err == nil {
 		gm.rocmSmi = true
 	}
-	if gm.nvidiaSmi || gm.rocmSmi {
+	if _, err := exec.LookPath(tegraStatsCmd); err == nil {
+		gm.tegrastats = true
+	}
+	if gm.nvidiaSmi || gm.rocmSmi || gm.tegrastats {
 		return nil
 	}
-	return fmt.Errorf("no GPU found - install nvidia-smi or rocm-smi")
+	return fmt.Errorf("no GPU found - install nvidia-smi, rocm-smi, or tegrastats")
 }
 
 // startCollector starts the appropriate GPU data collector based on the command
 func (gm *GPUManager) startCollector(command string) {
+	collector := gpuCollector{
+		name: command,
+	}
 	switch command {
-	case "nvidia-smi":
-		nvidia := gpuCollector{
-			name: "nvidia-smi",
-			cmd: exec.Command("nvidia-smi", "-l", "4",
-				"--query-gpu=index,name,temperature.gpu,memory.used,memory.total,utilization.gpu,power.draw",
-				"--format=csv,noheader,nounits"),
-			parse: gm.parseNvidiaData,
-		}
-		go nvidia.start()
-	case "rocm-smi":
-		amdCollector := gpuCollector{
-			name: "rocm-smi",
-			cmd: exec.Command("/bin/sh", "-c",
-				"while true; do rocm-smi --showid --showtemp --showuse --showpower --showproductname --showmeminfo vram --json; sleep 4.3; done"),
-			parse: gm.parseAmdData,
-		}
-		go amdCollector.start()
+	case nvidiaSmiCmd:
+		collector.cmdArgs = []string{"-l", nvidiaSmiInterval,
+			"--query-gpu=index,name,temperature.gpu,memory.used,memory.total,utilization.gpu,power.draw",
+			"--format=csv,noheader,nounits"}
+		collector.parse = gm.parseNvidiaData
+		go collector.start()
+	case tegraStatsCmd:
+		collector.cmdArgs = []string{"--interval", tegraStatsInterval}
+		collector.parse = gm.getJetsonParser()
+		go collector.start()
+	case rocmSmiCmd:
+		collector.cmdArgs = []string{"--showid", "--showtemp", "--showuse", "--showpower", "--showproductname", "--showmeminfo", "vram", "--json"}
+		collector.parse = gm.parseAmdData
+		go func() {
+			failures := 0
+			for {
+				if err := collector.collect(); err != nil {
+					failures++
+					if failures > maxFailureRetries {
+						break
+					}
+					slog.Warn("Error collecting AMD GPU data", "err", err)
+				}
+				time.Sleep(rocmSmiInterval)
+			}
+		}()
 	}
 }
 
@@ -235,13 +331,16 @@ func NewGPUManager() (*GPUManager, error) {
 	if err := gm.detectGPUs(); err != nil {
 		return nil, err
 	}
-	gm.GpuDataMap = make(map[string]*system.GPUData, 1)
+	gm.GpuDataMap = make(map[string]*system.GPUData)
 
 	if gm.nvidiaSmi {
-		gm.startCollector("nvidia-smi")
+		gm.startCollector(nvidiaSmiCmd)
 	}
 	if gm.rocmSmi {
-		gm.startCollector("rocm-smi")
+		gm.startCollector(rocmSmiCmd)
+	}
+	if gm.tegrastats {
+		gm.startCollector(tegraStatsCmd)
 	}
 
 	return &gm, nil

beszel/internal/agent/gpu_test.go

@@ -0,0 +1,742 @@
+//go:build testing
+// +build testing
+
+package agent
+
+import (
+	"beszel/internal/entities/system"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestParseNvidiaData(t *testing.T) {
+	tests := []struct {
+		name      string
+		input     string
+		wantData  map[string]system.GPUData
+		wantValid bool
+	}{
+		{
+			name:  "valid multi-gpu data",
+			input: "0, NVIDIA GeForce RTX 3050 Ti Laptop GPU, 48, 12, 4096, 26.3, 12.73\n1, NVIDIA A100-PCIE-40GB, 38, 74, 40960, [N/A], 36.79",
+			wantData: map[string]system.GPUData{
+				"0": {
+					Name:        "GeForce RTX 3050 Ti",
+					Temperature: 48.0,
+					MemoryUsed:  12.0 / 1.024,
+					MemoryTotal: 4096.0 / 1.024,
+					Usage:       26.3,
+					Power:       12.73,
+					Count:       1,
+				},
+				"1": {
+					Name:        "A100-PCIE-40GB",
+					Temperature: 38.0,
+					MemoryUsed:  74.0 / 1.024,
+					MemoryTotal: 40960.0 / 1.024,
+					Usage:       0.0,
+					Power:       36.79,
+					Count:       1,
+				},
+			},
+			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:     "",
+			wantData:  map[string]system.GPUData{},
+			wantValid: false,
+		},
+		{
+			name:      "malformed data",
+			input:     "bad, data, here",
+			wantData:  map[string]system.GPUData{},
+			wantValid: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gm := &GPUManager{
+				GpuDataMap: make(map[string]*system.GPUData),
+			}
+			valid := gm.parseNvidiaData([]byte(tt.input))
+			assert.Equal(t, tt.wantValid, valid)
+
+			if tt.wantValid {
+				for id, want := range tt.wantData {
+					got := gm.GpuDataMap[id]
+					require.NotNil(t, got)
+					assert.Equal(t, want.Name, got.Name)
+					assert.InDelta(t, want.Temperature, got.Temperature, 0.01)
+					assert.InDelta(t, want.MemoryUsed, got.MemoryUsed, 0.01)
+					assert.InDelta(t, want.MemoryTotal, got.MemoryTotal, 0.01)
+					assert.InDelta(t, want.Usage, got.Usage, 0.01)
+					assert.InDelta(t, want.Power, got.Power, 0.01)
+					assert.Equal(t, want.Count, got.Count)
+				}
+			}
+		})
+	}
+}
+
+func TestParseAmdData(t *testing.T) {
+	tests := []struct {
+		name      string
+		input     string
+		wantData  map[string]system.GPUData
+		wantValid bool
+	}{
+		{
+			name: "valid single gpu data",
+			input: `{
+				"card0": {
+					"GUID": "34756",
+					"Temperature (Sensor edge) (C)": "47.0",
+					"Current Socket Graphics Package Power (W)": "9.215",
+					"GPU use (%)": "0",
+					"VRAM Total Memory (B)": "536870912",
+					"VRAM Total Used Memory (B)": "482263040",
+					"Card Series": "Rembrandt [Radeon 680M]"
+				}
+			}`,
+			wantData: map[string]system.GPUData{
+				"34756": {
+					Name:        "Rembrandt [Radeon 680M]",
+					Temperature: 47.0,
+					MemoryUsed:  482263040.0 / (1024 * 1024),
+					MemoryTotal: 536870912.0 / (1024 * 1024),
+					Usage:       0.0,
+					Power:       9.215,
+					Count:       1,
+				},
+			},
+			wantValid: true,
+		},
+		{
+			name: "valid multi gpu data",
+			input: `{
+				"card0": {
+					"GUID": "34756",
+					"Temperature (Sensor edge) (C)": "47.0",
+					"Current Socket Graphics Package Power (W)": "9.215",
+					"GPU use (%)": "0",
+					"VRAM Total Memory (B)": "536870912",
+					"VRAM Total Used Memory (B)": "482263040",
+					"Card Series": "Rembrandt [Radeon 680M]"
+				},
+				"card1": {
+					"GUID": "38294",
+					"Temperature (Sensor edge) (C)": "49.0",
+					"Temperature (Sensor junction) (C)": "49.0",
+					"Temperature (Sensor memory) (C)": "62.0",
+					"Average Graphics Package Power (W)": "19.0",
+					"GPU use (%)": "20.3",
+					"VRAM Total Memory (B)": "25753026560",
+					"VRAM Total Used Memory (B)": "794341376",
+					"Card Series": "Navi 31 [Radeon RX 7900 XT]"
+				}
+			}`,
+			wantData: map[string]system.GPUData{
+				"34756": {
+					Name:        "Rembrandt [Radeon 680M]",
+					Temperature: 47.0,
+					MemoryUsed:  482263040.0 / (1024 * 1024),
+					MemoryTotal: 536870912.0 / (1024 * 1024),
+					Usage:       0.0,
+					Power:       9.215,
+					Count:       1,
+				},
+				"38294": {
+					Name:        "Navi 31 [Radeon RX 7900 XT]",
+					Temperature: 49.0,
+					MemoryUsed:  794341376.0 / (1024 * 1024),
+					MemoryTotal: 25753026560.0 / (1024 * 1024),
+					Usage:       20.3,
+					Power:       19.0,
+					Count:       1,
+				},
+			},
+			wantValid: true,
+		},
+		{
+			name:  "invalid json",
+			input: "{bad json",
+		},
+		{
+			name:      "invalid json",
+			input:     "{bad json",
+			wantData:  map[string]system.GPUData{},
+			wantValid: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gm := &GPUManager{
+				GpuDataMap: make(map[string]*system.GPUData),
+			}
+			valid := gm.parseAmdData([]byte(tt.input))
+			assert.Equal(t, tt.wantValid, valid)
+
+			if tt.wantValid {
+				for id, want := range tt.wantData {
+					got := gm.GpuDataMap[id]
+					require.NotNil(t, got)
+					assert.Equal(t, want.Name, got.Name)
+					assert.InDelta(t, want.Temperature, got.Temperature, 0.01)
+					assert.InDelta(t, want.MemoryUsed, got.MemoryUsed, 0.01)
+					assert.InDelta(t, want.MemoryTotal, got.MemoryTotal, 0.01)
+					assert.InDelta(t, want.Usage, got.Usage, 0.01)
+					assert.InDelta(t, want.Power, got.Power, 0.01)
+					assert.Equal(t, want.Count, got.Count)
+				}
+			}
+		})
+	}
+}
+
+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",
+			wantMetrics: &system.GPUData{
+				Name:        "Jetson",
+				MemoryUsed:  4300.0,
+				MemoryTotal: 30698.0,
+				Usage:       45.0,
+				Temperature: 52.468,
+				Power:       2.171,
+				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:        "Jetson",
+				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",
+			wantMetrics: &system.GPUData{
+				Name:        "Jetson",
+				MemoryUsed:  4300.0,
+				MemoryTotal: 30698.0,
+				Usage:       45.0,
+				Power:       2.171,
+				Count:       1,
+			},
+		},
+		{
+			name:  "no gpu defined by nvidia-smi",
+			input: "11-14-2024 22:54:33 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) {
+			if tt.gm != nil {
+				// should return if no gpu set by nvidia-smi
+				assert.Empty(t, tt.gm.GpuDataMap)
+				return
+			}
+			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 := 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)
+			assert.InDelta(t, tt.wantMetrics.MemoryTotal, got.MemoryTotal, 0.01)
+			assert.InDelta(t, tt.wantMetrics.Usage, got.Usage, 0.01)
+			if tt.wantMetrics.Temperature > 0 {
+				assert.InDelta(t, tt.wantMetrics.Temperature, got.Temperature, 0.01)
+			}
+			assert.InDelta(t, tt.wantMetrics.Power, got.Power, 0.01)
+			assert.Equal(t, tt.wantMetrics.Count, got.Count)
+		})
+	}
+}
+
+func TestGetCurrentData(t *testing.T) {
+	gm := &GPUManager{
+		GpuDataMap: map[string]*system.GPUData{
+			"0": {
+				Name:        "GPU1",
+				Temperature: 50,
+				MemoryUsed:  2048,
+				MemoryTotal: 4096,
+				Usage:       100, // 100 over 2 counts = 50 avg
+				Power:       200, // 200 over 2 counts = 100 avg
+				Count:       2,
+			},
+			"1": {
+				Name:        "GPU1",
+				Temperature: 60,
+				MemoryUsed:  3072,
+				MemoryTotal: 8192,
+				Usage:       30,
+				Power:       60,
+				Count:       1,
+			},
+		},
+	}
+
+	result := gm.GetCurrentData()
+
+	// Verify name disambiguation
+	assert.Equal(t, "GPU1 0", result["0"].Name)
+	assert.Equal(t, "GPU1 1", result["1"].Name)
+
+	// Check averaged values
+	assert.InDelta(t, 50.0, result["0"].Usage, 0.01)
+	assert.InDelta(t, 100.0, result["0"].Power, 0.01)
+	assert.InDelta(t, 30.0, result["1"].Usage, 0.01)
+	assert.InDelta(t, 60.0, result["1"].Power, 0.01)
+
+	// Verify reset counts
+	assert.Equal(t, float64(1), gm.GpuDataMap["0"].Count)
+	assert.Equal(t, float64(1), gm.GpuDataMap["1"].Count)
+}
+
+func TestDetectGPUs(t *testing.T) {
+	// Save original PATH
+	origPath := os.Getenv("PATH")
+	defer os.Setenv("PATH", origPath)
+
+	// Set up temp dir with the commands
+	tempDir := t.TempDir()
+	os.Setenv("PATH", tempDir)
+
+	tests := []struct {
+		name           string
+		setupCommands  func() error
+		wantNvidiaSmi  bool
+		wantRocmSmi    bool
+		wantTegrastats bool
+		wantErr        bool
+	}{
+		{
+			name: "nvidia-smi not available",
+			setupCommands: func() error {
+				return nil
+			},
+			wantNvidiaSmi:  false,
+			wantRocmSmi:    false,
+			wantTegrastats: false,
+			wantErr:        true,
+		},
+		{
+			name: "nvidia-smi available",
+			setupCommands: func() error {
+				path := filepath.Join(tempDir, "nvidia-smi")
+				script := `#!/bin/sh
+echo "test"`
+				if err := os.WriteFile(path, []byte(script), 0755); err != nil {
+					return err
+				}
+				return nil
+			},
+			wantNvidiaSmi:  true,
+			wantTegrastats: false,
+			wantRocmSmi:    false,
+			wantErr:        false,
+		},
+		{
+			name: "rocm-smi available",
+			setupCommands: func() error {
+				path := filepath.Join(tempDir, "rocm-smi")
+				script := `#!/bin/sh
+echo "test"`
+				if err := os.WriteFile(path, []byte(script), 0755); err != nil {
+					return err
+				}
+				return nil
+			},
+			wantNvidiaSmi:  true,
+			wantRocmSmi:    true,
+			wantTegrastats: false,
+			wantErr:        false,
+		},
+		{
+			name: "tegrastats available",
+			setupCommands: func() error {
+				path := filepath.Join(tempDir, "tegrastats")
+				script := `#!/bin/sh
+echo "test"`
+				if err := os.WriteFile(path, []byte(script), 0755); err != nil {
+					return err
+				}
+				return nil
+			},
+			wantNvidiaSmi:  true,
+			wantRocmSmi:    true,
+			wantTegrastats: true,
+			wantErr:        false,
+		},
+		{
+			name: "no gpu tools available",
+			setupCommands: func() error {
+				os.Setenv("PATH", "")
+				return nil
+			},
+			wantErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := tt.setupCommands(); err != nil {
+				t.Fatal(err)
+			}
+
+			gm := &GPUManager{}
+			err := gm.detectGPUs()
+
+			t.Logf("nvidiaSmi: %v, rocmSmi: %v, tegrastats: %v", gm.nvidiaSmi, gm.rocmSmi, gm.tegrastats)
+
+			if tt.wantErr {
+				assert.Error(t, err)
+				return
+			}
+
+			assert.NoError(t, err)
+			assert.Equal(t, tt.wantNvidiaSmi, gm.nvidiaSmi)
+			assert.Equal(t, tt.wantRocmSmi, gm.rocmSmi)
+			assert.Equal(t, tt.wantTegrastats, gm.tegrastats)
+		})
+	}
+}
+
+func TestStartCollector(t *testing.T) {
+	// Save original PATH
+	origPath := os.Getenv("PATH")
+	defer os.Setenv("PATH", origPath)
+
+	// Set up temp dir with the commands
+	dir := t.TempDir()
+	os.Setenv("PATH", dir)
+
+	tests := []struct {
+		name     string
+		command  string
+		setup    func(t *testing.T) error
+		validate func(t *testing.T, gm *GPUManager)
+		gm       *GPUManager
+	}{
+		{
+			name:    "nvidia-smi collector",
+			command: "nvidia-smi",
+			setup: func(t *testing.T) error {
+				path := filepath.Join(dir, "nvidia-smi")
+				script := `#!/bin/sh
+echo "0, NVIDIA Test GPU, 50, 1024, 4096, 25, 100"`
+				if err := os.WriteFile(path, []byte(script), 0755); err != nil {
+					return err
+				}
+				return nil
+			},
+			validate: func(t *testing.T, gm *GPUManager) {
+				gpu, exists := gm.GpuDataMap["0"]
+				assert.True(t, exists)
+				if exists {
+					assert.Equal(t, "Test GPU", gpu.Name)
+					assert.Equal(t, 50.0, gpu.Temperature)
+
+				}
+			},
+		},
+		{
+			name:    "rocm-smi collector",
+			command: "rocm-smi",
+			setup: func(t *testing.T) error {
+				path := filepath.Join(dir, "rocm-smi")
+				script := `#!/bin/sh
+echo '{"card0": {"Temperature (Sensor edge) (C)": "49.0", "Current Socket Graphics Package Power (W)": "28.159", "GPU use (%)": "0", "VRAM Total Memory (B)": "536870912", "VRAM Total Used Memory (B)": "445550592", "Card Series": "Rembrandt [Radeon 680M]", "Card Model": "0x1681", "Card Vendor": "Advanced Micro Devices, Inc. [AMD/ATI]", "Card SKU": "REMBRANDT", "Subsystem ID": "0x8a22", "Device Rev": "0xc8", "Node ID": "1", "GUID": "34756", "GFX Version": "gfx1035"}}'`
+				if err := os.WriteFile(path, []byte(script), 0755); err != nil {
+					return err
+				}
+				return nil
+			},
+			validate: func(t *testing.T, gm *GPUManager) {
+				gpu, exists := gm.GpuDataMap["34756"]
+				assert.True(t, exists)
+				if exists {
+					assert.Equal(t, "Rembrandt [Radeon 680M]", gpu.Name)
+					assert.InDelta(t, 49.0, gpu.Temperature, 0.01)
+					assert.InDelta(t, 28.159, gpu.Power, 0.01)
+				}
+			},
+		},
+		{
+			name:    "tegrastats collector",
+			command: "tegrastats",
+			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"`
+				if err := os.WriteFile(path, []byte(script), 0755); err != nil {
+					return err
+				}
+				return nil
+			},
+			validate: func(t *testing.T, gm *GPUManager) {
+				gpu, exists := gm.GpuDataMap["0"]
+				assert.True(t, exists)
+				if exists {
+					assert.InDelta(t, 70.0, gpu.Temperature, 0.1)
+				}
+			},
+			gm: &GPUManager{
+				GpuDataMap: map[string]*system.GPUData{
+					"0": {},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := tt.setup(t); err != nil {
+				t.Fatal(err)
+			}
+			if tt.gm == nil {
+				tt.gm = &GPUManager{
+					GpuDataMap: make(map[string]*system.GPUData),
+				}
+			}
+			tt.gm.startCollector(tt.command)
+			time.Sleep(50 * time.Millisecond) // Give collector time to run
+			tt.validate(t, tt.gm)
+		})
+	}
+}
+
+// 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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,118 @@
+//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

@@ -2,7 +2,6 @@ package agent
 
 import (
 	"log/slog"
-	"os"
 	"strings"
 	"time"
 
@@ -15,10 +14,10 @@ func (a *Agent) initializeNetIoStats() {
 
 	// map of network interface names passed in via NICS env var
 	var nicsMap map[string]struct{}
-	nics, nicsEnvExists := os.LookupEnv("NICS")
+	nics, nicsEnvExists := GetEnv("NICS")
 	if nicsEnvExists {
 		nicsMap = make(map[string]struct{}, 0)
-		for _, nic := range strings.Split(nics, ",") {
+		for nic := range strings.SplitSeq(nics, ",") {
 			nicsMap[nic] = struct{}{}
 		}
 	}

beszel/internal/agent/server.go

@@ -2,33 +2,110 @@ package agent
 
 import (
 	"encoding/json"
+	"fmt"
 	"log/slog"
+	"net"
 	"os"
+	"strings"
 
 	sshServer "github.com/gliderlabs/ssh"
+	"golang.org/x/crypto/ssh"
 )
 
-func (a *Agent) startServer(pubKey []byte, addr string) {
+type ServerOptions struct {
+	Addr    string
+	Network string
+	Keys    []ssh.PublicKey
+}
+
+func (a *Agent) StartServer(opts ServerOptions) error {
 	sshServer.Handle(a.handleSession)
 
-	slog.Info("Starting SSH server", "address", addr)
-	if err := sshServer.ListenAndServe(addr, nil, sshServer.NoPty(),
-		sshServer.PublicKeyAuth(func(ctx sshServer.Context, key sshServer.PublicKey) bool {
-			allowed, _, _, _, _ := sshServer.ParseAuthorizedKey(pubKey)
-			return sshServer.KeysEqual(key, allowed)
-		}),
-	); err != nil {
-		slog.Error("Error starting SSH server", "err", err)
-		os.Exit(1)
+	slog.Info("Starting SSH server", "addr", opts.Addr, "network", opts.Network)
+
+	if opts.Network == "unix" {
+		// remove existing socket file if it exists
+		if err := os.Remove(opts.Addr); err != nil && !os.IsNotExist(err) {
+			return err
+		}
 	}
+
+	// start listening on the address
+	ln, err := net.Listen(opts.Network, opts.Addr)
+	if err != nil {
+		return err
+	}
+	defer ln.Close()
+
+	// Start SSH server on the listener
+	return sshServer.Serve(ln, nil, sshServer.NoPty(),
+		sshServer.PublicKeyAuth(func(ctx sshServer.Context, key sshServer.PublicKey) bool {
+			for _, pubKey := range opts.Keys {
+				if sshServer.KeysEqual(key, pubKey) {
+					return true
+				}
+			}
+			return false
+		}),
+	)
 }
 
 func (a *Agent) handleSession(s sshServer.Session) {
-	stats := a.gatherStats()
+	slog.Debug("New session", "client", s.RemoteAddr())
+	stats := a.gatherStats(s.Context().SessionID())
 	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) ([]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 := ssh.ParseAuthorizedKey([]byte(line))
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse key: %s, error: %w", line, err)
+		}
+		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

@@ -0,0 +1,289 @@
+package agent
+
+import (
+	"crypto/ed25519"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/crypto/ssh"
+)
+
+func TestStartServer(t *testing.T) {
+	// Generate a test key pair
+	pubKey, privKey, err := ed25519.GenerateKey(nil)
+	require.NoError(t, err)
+	signer, err := ssh.NewSignerFromKey(privKey)
+	require.NoError(t, err)
+	sshPubKey, err := ssh.NewPublicKey(pubKey)
+	require.NoError(t, err)
+
+	// Generate a different key pair for bad key test
+	badPubKey, badPrivKey, err := ed25519.GenerateKey(nil)
+	require.NoError(t, err)
+	badSigner, err := ssh.NewSignerFromKey(badPrivKey)
+	require.NoError(t, err)
+	sshBadPubKey, err := ssh.NewPublicKey(badPubKey)
+	require.NoError(t, err)
+
+	socketFile := filepath.Join(t.TempDir(), "beszel-test.sock")
+
+	tests := []struct {
+		name        string
+		config      ServerOptions
+		wantErr     bool
+		errContains string
+		setup       func() error
+		cleanup     func() error
+	}{
+		{
+			name: "tcp port only",
+			config: ServerOptions{
+				Network: "tcp",
+				Addr:    ":45987",
+				Keys:    []ssh.PublicKey{sshPubKey},
+			},
+		},
+		{
+			name: "tcp with ipv4",
+			config: ServerOptions{
+				Network: "tcp4",
+				Addr:    "127.0.0.1:45988",
+				Keys:    []ssh.PublicKey{sshPubKey},
+			},
+		},
+		{
+			name: "tcp with ipv6",
+			config: ServerOptions{
+				Network: "tcp6",
+				Addr:    "[::1]:45989",
+				Keys:    []ssh.PublicKey{sshPubKey},
+			},
+		},
+		{
+			name: "unix socket",
+			config: ServerOptions{
+				Network: "unix",
+				Addr:    socketFile,
+				Keys:    []ssh.PublicKey{sshPubKey},
+			},
+			setup: func() error {
+				// Create a socket file that should be removed
+				f, err := os.Create(socketFile)
+				if err != nil {
+					return err
+				}
+				return f.Close()
+			},
+			cleanup: func() error {
+				return os.Remove(socketFile)
+			},
+		},
+		{
+			name: "bad key should fail",
+			config: ServerOptions{
+				Network: "tcp",
+				Addr:    ":45987",
+				Keys:    []ssh.PublicKey{sshBadPubKey},
+			},
+			wantErr:     true,
+			errContains: "ssh: handshake failed",
+		},
+		{
+			name: "good key still good",
+			config: ServerOptions{
+				Network: "tcp",
+				Addr:    ":45987",
+				Keys:    []ssh.PublicKey{sshPubKey},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.setup != nil {
+				err := tt.setup()
+				require.NoError(t, err)
+			}
+
+			if tt.cleanup != nil {
+				defer tt.cleanup()
+			}
+
+			agent := NewAgent()
+
+			// Start server in a goroutine since it blocks
+			errChan := make(chan error, 1)
+			go func() {
+				errChan <- agent.StartServer(tt.config)
+			}()
+
+			// Add a short delay to allow the server to start
+			time.Sleep(100 * time.Millisecond)
+
+			// Try to connect to verify server is running
+			var client *ssh.Client
+			var err error
+
+			// Choose the appropriate signer based on the test case
+			testSigner := signer
+			if tt.name == "bad key should fail" {
+				testSigner = badSigner
+			}
+
+			sshClientConfig := &ssh.ClientConfig{
+				User: "a",
+				Auth: []ssh.AuthMethod{
+					ssh.PublicKeys(testSigner),
+				},
+				HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+				Timeout:         4 * time.Second,
+			}
+
+			switch tt.config.Network {
+			case "unix":
+				client, err = ssh.Dial("unix", tt.config.Addr, sshClientConfig)
+			default:
+				if !strings.Contains(tt.config.Addr, ":") {
+					tt.config.Addr = ":" + tt.config.Addr
+				}
+				client, err = ssh.Dial("tcp", tt.config.Addr, sshClientConfig)
+			}
+
+			if tt.wantErr {
+				assert.Error(t, err)
+				if tt.errContains != "" {
+					assert.Contains(t, err.Error(), tt.errContains)
+				}
+				return
+			}
+
+			require.NoError(t, err)
+			require.NotNil(t, client)
+			client.Close()
+		})
+	}
+}
+
+/////////////////////////////////////////////////////////////////
+//////////////////// ParseKeys Tests ////////////////////////////
+/////////////////////////////////////////////////////////////////
+
+// Helper function to generate a temporary file with content
+func createTempFile(content string) (string, error) {
+	tmpFile, err := os.CreateTemp("", "ssh_keys_*.txt")
+	if err != nil {
+		return "", fmt.Errorf("failed to create temp file: %w", err)
+	}
+	defer tmpFile.Close()
+
+	if _, err := tmpFile.WriteString(content); err != nil {
+		return "", fmt.Errorf("failed to write to temp file: %w", err)
+	}
+
+	return tmpFile.Name(), nil
+}
+
+// Test case 1: String with a single SSH key
+func TestParseSingleKeyFromString(t *testing.T) {
+	input := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCBM91kukN7hbvFKtbpEeo2JXjCcNxXcdBH7V7ADMBo"
+	keys, err := ParseKeys(input)
+	if err != nil {
+		t.Fatalf("Expected no error, got: %v", err)
+	}
+	if len(keys) != 1 {
+		t.Fatalf("Expected 1 key, got %d keys", len(keys))
+	}
+	if keys[0].Type() != "ssh-ed25519" {
+		t.Fatalf("Expected key type 'ssh-ed25519', got '%s'", keys[0].Type())
+	}
+}
+
+// Test case 2: String with multiple SSH keys
+func TestParseMultipleKeysFromString(t *testing.T) {
+	input := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCBM91kukN7hbvFKtbpEeo2JXjCcNxXcdBH7V7ADMBo\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMtAOQfxDlCxe+A5lVbUY/DHxK1LAF2Z3AV0FYv36D \n #comment\n ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMtAOQfxDlCxe+A5lVbUY/DHxK1LAF2Z3AV0FYv36D"
+	keys, err := ParseKeys(input)
+	if err != nil {
+		t.Fatalf("Expected no error, got: %v", err)
+	}
+	if len(keys) != 3 {
+		t.Fatalf("Expected 3 keys, got %d keys", len(keys))
+	}
+	if keys[0].Type() != "ssh-ed25519" || keys[1].Type() != "ssh-ed25519" || keys[2].Type() != "ssh-ed25519" {
+		t.Fatalf("Unexpected key types: %s, %s, %s", keys[0].Type(), keys[1].Type(), keys[2].Type())
+	}
+}
+
+// Test case 3: File with a single SSH key
+func TestParseSingleKeyFromFile(t *testing.T) {
+	content := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCBM91kukN7hbvFKtbpEeo2JXjCcNxXcdBH7V7ADMBo"
+	filePath, err := createTempFile(content)
+	if err != nil {
+		t.Fatalf("Failed to create temp file: %v", err)
+	}
+	defer os.Remove(filePath) // Clean up the file after the test
+
+	// Read the file content
+	fileContent, err := os.ReadFile(filePath)
+	if err != nil {
+		t.Fatalf("Failed to read temp file: %v", err)
+	}
+
+	// Parse the keys
+	keys, err := ParseKeys(string(fileContent))
+	if err != nil {
+		t.Fatalf("Expected no error, got: %v", err)
+	}
+	if len(keys) != 1 {
+		t.Fatalf("Expected 1 key, got %d keys", len(keys))
+	}
+	if keys[0].Type() != "ssh-ed25519" {
+		t.Fatalf("Expected key type 'ssh-ed25519', got '%s'", keys[0].Type())
+	}
+}
+
+// Test case 4: File with multiple SSH keys
+func TestParseMultipleKeysFromFile(t *testing.T) {
+	content := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCBM91kukN7hbvFKtbpEeo2JXjCcNxXcdBH7V7ADMBo\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMtAOQfxDlCxe+A5lVbUY/DHxK1LAF2Z3AV0FYv36D \n #comment\n ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMtAOQfxDlCxe+A5lVbUY/DHxK1LAF2Z3AV0FYv36D"
+	filePath, err := createTempFile(content)
+	if err != nil {
+		t.Fatalf("Failed to create temp file: %v", err)
+	}
+	// defer os.Remove(filePath) // Clean up the file after the test
+
+	// Read the file content
+	fileContent, err := os.ReadFile(filePath)
+	if err != nil {
+		t.Fatalf("Failed to read temp file: %v", err)
+	}
+
+	// Parse the keys
+	keys, err := ParseKeys(string(fileContent))
+	if err != nil {
+		t.Fatalf("Expected no error, got: %v", err)
+	}
+	if len(keys) != 3 {
+		t.Fatalf("Expected 3 keys, got %d keys", len(keys))
+	}
+	if keys[0].Type() != "ssh-ed25519" || keys[1].Type() != "ssh-ed25519" || keys[2].Type() != "ssh-ed25519" {
+		t.Fatalf("Unexpected key types: %s, %s, %s", keys[0].Type(), keys[1].Type(), keys[2].Type())
+	}
+}
+
+// Test case 5: Invalid SSH key input
+func TestParseInvalidKey(t *testing.T) {
+	input := "invalid-key-data"
+	_, err := ParseKeys(input)
+	if err == nil {
+		t.Fatalf("Expected an error for invalid key, got nil")
+	}
+	expectedErrMsg := "failed to parse key"
+	if !strings.Contains(err.Error(), expectedErrMsg) {
+		t.Fatalf("Expected error message to contain '%s', got: %v", expectedErrMsg, err)
+	}
+}

beszel/internal/agent/system.go

@@ -138,6 +138,13 @@ func (a *Agent) getSystemStats() system.Stats {
 	}
 
 	// network stats
+	if len(a.netInterfaces) == 0 {
+		// if no network interfaces, initialize again
+		// this is a fix if agent started before network is online (#466)
+		// maybe refactor this in the future to not cache interface names at all so we
+		// don't miss an interface that's been added after agent started in any circumstance
+		a.initializeNetIoStats()
+	}
 	if netIO, err := psutilNet.IOCounters(true); err == nil {
 		secondsElapsed := time.Since(a.netIoStats.Time).Seconds()
 		a.netIoStats.Time = time.Now()
@@ -177,45 +184,18 @@ func (a *Agent) getSystemStats() system.Stats {
 		}
 	}
 
-	// temperatures (skip if sensors whitelist is set to empty string)
-	if a.sensorsWhitelist != nil && len(a.sensorsWhitelist) == 0 {
-		slog.Debug("Skipping temperature collection")
-	} else {
-		temps, err := sensors.TemperaturesWithContext(a.sensorsContext)
-		if err != nil {
-			slog.Debug("Sensor error", "err", err)
-		}
-		slog.Debug("Temperature", "sensors", temps)
-		if len(temps) > 0 {
-			systemStats.Temperatures = make(map[string]float64, len(temps))
-			for i, sensor := range temps {
-				// skip if temperature is 0
-				if sensor.Temperature <= 0 || sensor.Temperature >= 200 {
-					continue
-				}
-				if _, ok := systemStats.Temperatures[sensor.SensorKey]; ok {
-					// if key already exists, append int to key
-					systemStats.Temperatures[sensor.SensorKey+"_"+strconv.Itoa(i)] = twoDecimals(sensor.Temperature)
-				} else {
-					systemStats.Temperatures[sensor.SensorKey] = twoDecimals(sensor.Temperature)
-				}
-			}
-			// remove sensors from systemStats if whitelist exists and sensor is not in whitelist
-			// (do this here instead of in initial loop so we have correct keys if int was appended)
-			if a.sensorsWhitelist != nil {
-				for key := range systemStats.Temperatures {
-					if _, nameInWhitelist := a.sensorsWhitelist[key]; !nameInWhitelist {
-						delete(systemStats.Temperatures, key)
-					}
-				}
-			}
-		}
-	}
+	// temperatures
+	// TODO: maybe refactor to methods on systemStats
+	a.updateTemperatures(&systemStats)
 
 	// GPU data
 	if a.gpuManager != nil {
+		// reset high gpu percent
+		a.systemInfo.GpuPct = 0
+		// get current GPU data
 		if gpuData := a.gpuManager.GetCurrentData(); len(gpuData) > 0 {
 			systemStats.GPUData = gpuData
+
 			// add temperatures
 			if systemStats.Temperatures == nil {
 				systemStats.Temperatures = make(map[string]float64, len(gpuData))
@@ -223,7 +203,12 @@ func (a *Agent) getSystemStats() system.Stats {
 			for _, gpu := range gpuData {
 				if gpu.Temperature > 0 {
 					systemStats.Temperatures[gpu.Name] = gpu.Temperature
+					if a.primarySensor == gpu.Name {
+						a.systemInfo.DashboardTemp = gpu.Temperature
+					}
 				}
+				// update high gpu percent for dashboard
+				a.systemInfo.GpuPct = max(a.systemInfo.GpuPct, gpu.Usage)
 			}
 		}
 	}
@@ -239,6 +224,52 @@ func (a *Agent) getSystemStats() system.Stats {
 	return systemStats
 }
 
+func (a *Agent) updateTemperatures(systemStats *system.Stats) {
+	// skip if sensors whitelist is set to empty string
+	if a.sensorsWhitelist != nil && len(a.sensorsWhitelist) == 0 {
+		slog.Debug("Skipping temperature collection")
+		return
+	}
+
+	// reset high temp
+	a.systemInfo.DashboardTemp = 0
+
+	// get sensor data
+	temps, _ := sensors.TemperaturesWithContext(a.sensorsContext)
+	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 {
+		// 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 a.primarySensor == "" {
+			a.systemInfo.DashboardTemp = max(a.systemInfo.DashboardTemp, sensor.Temperature)
+		} else if a.primarySensor == sensorName {
+			a.systemInfo.DashboardTemp = sensor.Temperature
+		}
+		systemStats.Temperatures[sensorName] = twoDecimals(sensor.Temperature)
+	}
+}
+
 // 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

@@ -2,26 +2,24 @@
 package alerts
 
 import (
-	"beszel/internal/entities/system"
 	"fmt"
 	"net/mail"
 	"net/url"
-	"strings"
+	"sync"
 	"time"
 
 	"github.com/containrrr/shoutrrr"
-	"github.com/goccy/go-json"
 	"github.com/pocketbase/dbx"
-	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
 	"github.com/pocketbase/pocketbase/tools/mailer"
-	"github.com/pocketbase/pocketbase/tools/types"
-	"github.com/spf13/cast"
 )
 
 type AlertManager struct {
-	app *pocketbase.PocketBase
+	app           core.App
+	alertQueue    chan alertTask
+	stopChan      chan struct{}
+	pendingAlerts sync.Map
 }
 
 type AlertMessageData struct {
@@ -61,351 +59,43 @@ type SystemAlertData struct {
 	descriptor   string // override descriptor in notification body (for temp sensor, disk partition, etc)
 }
 
-func NewAlertManager(app *pocketbase.PocketBase) *AlertManager {
-	return &AlertManager{
-		app: app,
-	}
+// notification services that support title param
+var supportsTitle = map[string]struct{}{
+	"bark":       {},
+	"discord":    {},
+	"gotify":     {},
+	"ifttt":      {},
+	"join":       {},
+	"matrix":     {},
+	"ntfy":       {},
+	"opsgenie":   {},
+	"pushbullet": {},
+	"pushover":   {},
+	"slack":      {},
+	"teams":      {},
+	"telegram":   {},
+	"zulip":      {},
 }
 
-func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, systemInfo system.Info, temperatures map[string]float64, extraFs map[string]*system.FsStats) error {
-	// start := time.Now()
-	// defer func() {
-	// 	log.Println("alert stats took", time.Since(start))
-	// }()
-	alertRecords, err := am.app.FindAllRecords("alerts",
-		dbx.NewExp("system={:system}", dbx.Params{"system": systemRecord.Id}),
-	)
-	if err != nil || len(alertRecords) == 0 {
-		// log.Println("no alerts found for system")
-		return nil
+// NewAlertManager creates a new AlertManager instance.
+func NewAlertManager(app core.App) *AlertManager {
+	am := &AlertManager{
+		app:        app,
+		alertQueue: make(chan alertTask),
+		stopChan:   make(chan struct{}),
 	}
-
-	var validAlerts []SystemAlertData
-	now := systemRecord.GetDateTime("updated").Time().UTC()
-	oldestTime := now
-
-	for _, alertRecord := range alertRecords {
-		name := alertRecord.GetString("name")
-		var val float64
-		unit := "%"
-
-		switch name {
-		case "CPU":
-			val = systemInfo.Cpu
-		case "Memory":
-			val = systemInfo.MemPct
-		case "Bandwidth":
-			val = systemInfo.Bandwidth
-			unit = " MB/s"
-		case "Disk":
-			maxUsedPct := systemInfo.DiskPct
-			for _, fs := range extraFs {
-				usedPct := fs.DiskUsed / fs.DiskTotal * 100
-				if usedPct > maxUsedPct {
-					maxUsedPct = usedPct
-				}
-			}
-			val = maxUsedPct
-		case "Temperature":
-			if temperatures == nil {
-				continue
-			}
-			for _, temp := range temperatures {
-				if temp > val {
-					val = temp
-				}
-			}
-			unit = "°C"
-		}
-
-		triggered := alertRecord.GetBool("triggered")
-		threshold := alertRecord.GetFloat("value")
-
-		// CONTINUE
-		// IF alert is not triggered and curValue is less than threshold
-		// OR alert is triggered and curValue is greater than threshold
-		if (!triggered && val <= threshold) || (triggered && val > threshold) {
-			// log.Printf("Skipping alert %s: val %f | threshold %f | triggered %v\n", name, val, threshold, triggered)
-			continue
-		}
-
-		min := max(1, cast.ToUint8(alertRecord.Get("min")))
-		// 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
-		}
-
-		validAlerts = append(validAlerts, SystemAlertData{
-			systemRecord: systemRecord,
-			alertRecord:  alertRecord,
-			name:         name,
-			unit:         unit,
-			val:          val,
-			threshold:    threshold,
-			triggered:    triggered,
-			time:         time,
-			min:          min,
-		})
-	}
-
-	systemStats := []struct {
-		Stats   []byte         `db:"stats"`
-		Created types.DateTime `db:"created"`
-	}{}
-
-	err = am.app.DB().
-		Select("stats", "created").
-		From("system_stats").
-		Where(dbx.NewExp(
-			"system={:system} AND type='1m' AND created > {:created}",
-			dbx.Params{
-				"system": systemRecord.Id,
-				// subtract some time to give us a bit of buffer
-				"created": oldestTime.Add(-time.Second * 90),
-			},
-		)).
-		OrderBy("created").
-		All(&systemStats)
-
-	if err != nil {
-		return err
-	}
-
-	// get oldest record creation time from first record in the slice
-	oldestRecordTime := systemStats[0].Created.Time()
-	// log.Println("oldestRecordTime", oldestRecordTime.String())
-
-	// delete from validAlerts if time is older than oldestRecord
-	for i := 0; i < len(validAlerts); i++ {
-		if validAlerts[i].time.Before(oldestRecordTime) {
-			// log.Println("deleting alert - time is older than oldestRecord", validAlerts[i].name, oldestRecordTime, validAlerts[i].time)
-			validAlerts = append(validAlerts[:i], validAlerts[i+1:]...)
-		}
-	}
-
-	if len(validAlerts) == 0 {
-		// log.Println("no valid alerts found")
-		return nil
-	}
-
-	var stats SystemAlertStats
-
-	// we can skip the latest systemStats record since it's the current value
-	for i := 0; i < len(systemStats); i++ {
-		stat := systemStats[i]
-		// subtract 10 seconds to give a small time buffer
-		systemStatsCreation := stat.Created.Time().Add(-time.Second * 10)
-		if err := json.Unmarshal(stat.Stats, &stats); err != nil {
-			return err
-		}
-		// log.Println("stats", stats)
-		for j := range validAlerts {
-			alert := &validAlerts[j]
-			// reset alert val on first iteration
-			if i == 0 {
-				alert.val = 0
-			}
-			// continue if system_stats is older than alert time range
-			if systemStatsCreation.Before(alert.time) {
-				continue
-			}
-			// add to alert value
-			switch alert.name {
-			case "CPU":
-				alert.val += stats.Cpu
-			case "Memory":
-				alert.val += stats.Mem
-			case "Bandwidth":
-				alert.val += stats.NetSent + stats.NetRecv
-			case "Disk":
-				if alert.mapSums == nil {
-					alert.mapSums = make(map[string]float32, len(extraFs)+1)
-				}
-				// add root disk
-				if _, ok := alert.mapSums["root"]; !ok {
-					alert.mapSums["root"] = 0.0
-				}
-				alert.mapSums["root"] += float32(stats.Disk)
-				// add extra disks
-				for key, fs := range extraFs {
-					if _, ok := alert.mapSums[key]; !ok {
-						alert.mapSums[key] = 0.0
-					}
-					alert.mapSums[key] += float32(fs.DiskUsed / fs.DiskTotal * 100)
-				}
-			case "Temperature":
-				if alert.mapSums == nil {
-					alert.mapSums = make(map[string]float32, len(stats.Temperatures))
-				}
-				for key, temp := range stats.Temperatures {
-					if _, ok := alert.mapSums[key]; !ok {
-						alert.mapSums[key] = float32(0)
-					}
-					alert.mapSums[key] += temp
-				}
-			default:
-				continue
-			}
-			alert.count++
-		}
-	}
-	// sum up vals for each alert
-	for _, alert := range validAlerts {
-		switch alert.name {
-		case "Disk":
-			maxPct := float32(0)
-			for key, value := range alert.mapSums {
-				sumPct := float32(value)
-				if sumPct > maxPct {
-					maxPct = sumPct
-					alert.descriptor = fmt.Sprintf("Usage of %s", key)
-				}
-			}
-			alert.val = float64(maxPct / float32(alert.count))
-		case "Temperature":
-			maxTemp := float32(0)
-			for key, value := range alert.mapSums {
-				sumTemp := float32(value) / float32(alert.count)
-				if sumTemp > maxTemp {
-					maxTemp = sumTemp
-					alert.descriptor = fmt.Sprintf("Highest sensor %s", key)
-				}
-			}
-			alert.val = float64(maxTemp)
-		default:
-			alert.val = alert.val / float64(alert.count)
-		}
-		minCount := float32(alert.min) / 1.2
-		// log.Println("alert", alert.name, "val", alert.val, "threshold", alert.threshold, "triggered", alert.triggered)
-		// log.Printf("%s: val %f | count %d | min-count %f | threshold %f\n", alert.name, alert.val, alert.count, minCount, alert.threshold)
-		// pass through alert if count is greater than or equal to minCount
-		if float32(alert.count) >= minCount {
-			if !alert.triggered && alert.val > alert.threshold {
-				alert.triggered = true
-				go am.sendSystemAlert(alert)
-			} else if alert.triggered && alert.val <= alert.threshold {
-				alert.triggered = false
-				go am.sendSystemAlert(alert)
-			}
-		}
-	}
-	return nil
+	go am.startWorker()
+	return am
 }
 
-func (am *AlertManager) sendSystemAlert(alert SystemAlertData) {
-	// log.Printf("Sending alert %s: val %f | count %d | threshold %f\n", alert.name, alert.val, alert.count, alert.threshold)
-	systemName := alert.systemRecord.GetString("name")
-
-	// change Disk to Disk usage
-	if alert.name == "Disk" {
-		alert.name += " usage"
-	}
-
-	// make title alert name lowercase if not CPU
-	titleAlertName := alert.name
-	if titleAlertName != "CPU" {
-		titleAlertName = strings.ToLower(titleAlertName)
-	}
-
-	var subject string
-	if alert.triggered {
-		subject = fmt.Sprintf("%s %s above threshold", systemName, titleAlertName)
-	} else {
-		subject = fmt.Sprintf("%s %s below threshold", systemName, titleAlertName)
-	}
-	minutesLabel := "minute"
-	if alert.min > 1 {
-		minutesLabel += "s"
-	}
-	if alert.descriptor == "" {
-		alert.descriptor = alert.name
-	}
-	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.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.app.ExpandRecord(alert.alertRecord, []string{"user"}, nil); len(errs) > 0 {
-		// app.Logger().Error("failed to expand user relation", "errs", errs)
-		return
-	}
-	if user := alert.alertRecord.ExpandedOne("user"); user != nil {
-		am.sendAlert(AlertMessageData{
-			UserID:   user.Id,
-			Title:    subject,
-			Message:  body,
-			Link:     am.app.Settings().Meta.AppURL + "/system/" + url.PathEscape(systemName),
-			LinkText: "View " + systemName,
-		})
-	}
-}
-
-// todo: allow x minutes downtime before sending alert
-func (am *AlertManager) HandleStatusAlerts(newStatus string, oldSystemRecord *core.Record) error {
-	var alertStatus string
-	switch newStatus {
-	case "up":
-		if oldSystemRecord.GetString("status") == "down" {
-			alertStatus = "up"
-		}
-	case "down":
-		if oldSystemRecord.GetString("status") == "up" {
-			alertStatus = "down"
-		}
-	}
-	if alertStatus == "" {
-		return nil
-	}
-	// check if use
-	alertRecords, err := am.app.FindAllRecords("alerts",
-		dbx.HashExp{
-			"system": oldSystemRecord.Id,
-			"name":   "Status",
-		},
-	)
-	if err != nil || len(alertRecords) == 0 {
-		// log.Println("no alerts found for system")
-		return nil
-	}
-	for _, alertRecord := range alertRecords {
-		// expand the user relation
-		if errs := am.app.ExpandRecord(alertRecord, []string{"user"}, nil); len(errs) > 0 {
-			return fmt.Errorf("failed to expand: %v", errs)
-		}
-		user := alertRecord.ExpandedOne("user")
-		if user == nil {
-			return nil
-		}
-		emoji := "\U0001F534"
-		if alertStatus == "up" {
-			emoji = "\u2705"
-		}
-		// send alert
-		systemName := oldSystemRecord.GetString("name")
-		am.sendAlert(AlertMessageData{
-			UserID:   user.Id,
-			Title:    fmt.Sprintf("Connection to %s is %s %v", systemName, alertStatus, emoji),
-			Message:  fmt.Sprintf("Connection to %s is %s", systemName, alertStatus),
-			Link:     am.app.Settings().Meta.AppURL + "/system/" + url.PathEscape(systemName),
-			LinkText: "View " + systemName,
-		})
-	}
-	return nil
-}
-
-func (am *AlertManager) sendAlert(data AlertMessageData) {
+func (am *AlertManager) SendAlert(data AlertMessageData) error {
 	// get user settings
 	record, err := am.app.FindFirstRecordByFilter(
 		"user_settings", "user={:user}",
 		dbx.Params{"user": data.UserID},
 	)
 	if err != nil {
-		am.app.Logger().Error("Failed to get user settings", "err", err.Error())
-		return
+		return err
 	}
 	// unmarshal user settings
 	userAlertSettings := UserNotificationSettings{
@@ -423,8 +113,7 @@ func (am *AlertManager) sendAlert(data AlertMessageData) {
 	}
 	// send alerts via email
 	if len(userAlertSettings.Emails) == 0 {
-		// log.Println("No email addresses found")
-		return
+		return nil
 	}
 	addresses := []mail.Address{}
 	for _, email := range userAlertSettings.Emails {
@@ -439,18 +128,16 @@ func (am *AlertManager) sendAlert(data AlertMessageData) {
 			Name:    am.app.Settings().Meta.SenderName,
 		},
 	}
-	if err := am.app.NewMailClient().Send(&message); err != nil {
-		am.app.Logger().Error("Failed to send alert: ", "err", err.Error())
-	} else {
-		am.app.Logger().Info("Sent email alert", "to", message.To, "subj", message.Subject)
+	err = am.app.NewMailClient().Send(&message)
+	if err != nil {
+		return err
 	}
+	am.app.Logger().Info("Sent email alert", "to", message.To, "subj", message.Subject)
+	return nil
 }
 
 // SendShoutrrrAlert sends an alert via a Shoutrrr URL
 func (am *AlertManager) SendShoutrrrAlert(notificationUrl, title, message, link, linkText string) error {
-	// services that support title param
-	supportsTitle := []string{"bark", "discord", "gotify", "ifttt", "join", "matrix", "ntfy", "opsgenie", "pushbullet", "pushover", "slack", "teams", "telegram", "zulip"}
-
 	// Parse the URL
 	parsedURL, err := url.Parse(notificationUrl)
 	if err != nil {
@@ -460,7 +147,7 @@ func (am *AlertManager) SendShoutrrrAlert(notificationUrl, title, message, link,
 	queryParams := parsedURL.Query()
 
 	// Add title
-	if sliceContains(supportsTitle, scheme) {
+	if _, ok := supportsTitle[scheme]; ok {
 		queryParams.Add("title", title)
 	} else if scheme == "mattermost" {
 		// use markdown title for mattermost
@@ -501,16 +188,6 @@ func (am *AlertManager) SendShoutrrrAlert(notificationUrl, title, message, link,
 	return nil
 }
 
-// Contains checks if a string is present in a slice of strings
-func sliceContains(slice []string, item string) bool {
-	for _, v := range slice {
-		if v == item {
-			return true
-		}
-	}
-	return false
-}
-
 func (am *AlertManager) SendTestNotification(e *core.RequestEvent) error {
 	info, _ := e.RequestInfo()
 	if info.Auth == nil {

beszel/internal/alerts/alerts_status.go

@@ -0,0 +1,165 @@
+package alerts
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/core"
+)
+
+type alertTask struct {
+	action      string // "schedule" or "cancel"
+	systemName  string
+	alertRecord *core.Record
+	delay       time.Duration
+}
+
+type alertInfo struct {
+	systemName  string
+	alertRecord *core.Record
+	expireTime  time.Time
+}
+
+// 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)
+	for {
+		select {
+		case <-am.stopChan:
+			return
+		case task := <-am.alertQueue:
+			switch task.action {
+			case "schedule":
+				am.pendingAlerts.Store(task.alertRecord.Id, &alertInfo{
+					systemName:  task.systemName,
+					alertRecord: task.alertRecord,
+					expireTime:  time.Now().Add(task.delay),
+				})
+			case "cancel":
+				am.pendingAlerts.Delete(task.alertRecord.Id)
+			}
+		case <-tick:
+			// Check for expired alerts every tick
+			now := time.Now()
+			for key, value := range am.pendingAlerts.Range {
+				info := value.(*alertInfo)
+				if now.After(info.expireTime) {
+					// Downtime delay has passed, process alert
+					am.sendStatusAlert("down", info.systemName, info.alertRecord)
+					am.pendingAlerts.Delete(key)
+				}
+			}
+		}
+	}
+}
+
+// StopWorker shuts down the AlertManager.worker goroutine
+func (am *AlertManager) StopWorker() {
+	close(am.stopChan)
+}
+
+// HandleStatusAlerts manages the logic when system status changes.
+func (am *AlertManager) HandleStatusAlerts(newStatus string, systemRecord *core.Record) error {
+	if newStatus != "up" && newStatus != "down" {
+		return nil
+	}
+
+	alertRecords, err := am.getSystemStatusAlerts(systemRecord.Id)
+	if err != nil {
+		return err
+	}
+	if len(alertRecords) == 0 {
+		return nil
+	}
+
+	systemName := systemRecord.GetString("name")
+	if newStatus == "down" {
+		am.handleSystemDown(systemName, alertRecords)
+	} else {
+		am.handleSystemUp(systemName, alertRecords)
+	}
+	return nil
+}
+
+// getSystemStatusAlerts retrieves all "Status" alert records for a given system ID.
+func (am *AlertManager) getSystemStatusAlerts(systemID string) ([]*core.Record, error) {
+	alertRecords, err := am.app.FindAllRecords("alerts", dbx.HashExp{
+		"system": systemID,
+		"name":   "Status",
+	})
+	if err != nil {
+		return nil, err
+	}
+	return alertRecords, nil
+}
+
+// Schedules delayed "down" alerts for each alert record.
+func (am *AlertManager) handleSystemDown(systemName string, alertRecords []*core.Record) {
+	for _, alertRecord := range alertRecords {
+		// Continue if alert is already scheduled
+		if _, exists := am.pendingAlerts.Load(alertRecord.Id); exists {
+			continue
+		}
+		// Schedule by adding to queue
+		min := max(1, alertRecord.GetInt("min"))
+		am.alertQueue <- alertTask{
+			action:      "schedule",
+			systemName:  systemName,
+			alertRecord: alertRecord,
+			delay:       time.Duration(min) * time.Minute,
+		}
+	}
+}
+
+// handleSystemUp manages the logic when a system status changes to "up".
+// It cancels any pending alerts and sends "up" alerts.
+func (am *AlertManager) handleSystemUp(systemName string, alertRecords []*core.Record) {
+	for _, alertRecord := range alertRecords {
+		alertRecordID := alertRecord.Id
+		// If alert exists for record, delete and continue (down alert not sent)
+		if _, exists := am.pendingAlerts.Load(alertRecordID); exists {
+			am.alertQueue <- alertTask{
+				action:      "cancel",
+				alertRecord: alertRecord,
+			}
+			continue
+		}
+		// No alert scheduled for this record, send "up" alert
+		if err := am.sendStatusAlert("up", systemName, alertRecord); err != nil {
+			am.app.Logger().Error("Failed to send alert", "err", err.Error())
+		}
+	}
+}
+
+// sendStatusAlert sends a status alert ("up" or "down") to the users associated with the alert records.
+func (am *AlertManager) sendStatusAlert(alertStatus string, systemName string, alertRecord *core.Record) error {
+	var emoji string
+	if alertStatus == "up" {
+		emoji = "\u2705" // Green checkmark emoji
+	} else {
+		emoji = "\U0001F534" // Red alert emoji
+	}
+
+	title := fmt.Sprintf("Connection to %s is %s %v", systemName, alertStatus, emoji)
+	message := strings.TrimSuffix(title, emoji)
+
+	if errs := am.app.ExpandRecord(alertRecord, []string{"user"}, nil); len(errs) > 0 {
+		return errs["user"]
+	}
+	user := alertRecord.ExpandedOne("user")
+	if user == nil {
+		return nil
+	}
+
+	return am.SendAlert(AlertMessageData{
+		UserID:   user.Id,
+		Title:    title,
+		Message:  message,
+		Link:     am.app.Settings().Meta.AppURL + "/system/" + url.PathEscape(systemName),
+		LinkText: "View " + systemName,
+	})
+}

beszel/internal/alerts/alerts_system.go

@@ -0,0 +1,292 @@
+package alerts
+
+import (
+	"beszel/internal/entities/system"
+	"fmt"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/goccy/go-json"
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/types"
+	"github.com/spf13/cast"
+)
+
+func (am *AlertManager) HandleSystemAlerts(systemRecord *core.Record, data *system.CombinedData) error {
+	alertRecords, err := am.app.FindAllRecords("alerts",
+		dbx.NewExp("system={:system}", dbx.Params{"system": systemRecord.Id}),
+	)
+	if err != nil || len(alertRecords) == 0 {
+		// log.Println("no alerts found for system")
+		return nil
+	}
+
+	var validAlerts []SystemAlertData
+	now := systemRecord.GetDateTime("updated").Time().UTC()
+	oldestTime := now
+
+	for _, alertRecord := range alertRecords {
+		name := alertRecord.GetString("name")
+		var val float64
+		unit := "%"
+
+		switch name {
+		case "CPU":
+			val = data.Info.Cpu
+		case "Memory":
+			val = data.Info.MemPct
+		case "Bandwidth":
+			val = data.Info.Bandwidth
+			unit = " MB/s"
+		case "Disk":
+			maxUsedPct := data.Info.DiskPct
+			for _, fs := range data.Stats.ExtraFs {
+				usedPct := fs.DiskUsed / fs.DiskTotal * 100
+				if usedPct > maxUsedPct {
+					maxUsedPct = usedPct
+				}
+			}
+			val = maxUsedPct
+		case "Temperature":
+			if data.Info.DashboardTemp < 1 {
+				continue
+			}
+			val = data.Info.DashboardTemp
+			unit = "°C"
+		}
+
+		triggered := alertRecord.GetBool("triggered")
+		threshold := alertRecord.GetFloat("value")
+
+		// CONTINUE
+		// IF alert is not triggered and curValue is less than threshold
+		// OR alert is triggered and curValue is greater than threshold
+		if (!triggered && val <= threshold) || (triggered && val > threshold) {
+			// log.Printf("Skipping alert %s: val %f | threshold %f | triggered %v\n", name, val, threshold, triggered)
+			continue
+		}
+
+		min := max(1, cast.ToUint8(alertRecord.Get("min")))
+
+		alert := SystemAlertData{
+			systemRecord: systemRecord,
+			alertRecord:  alertRecord,
+			name:         name,
+			unit:         unit,
+			val:          val,
+			threshold:    threshold,
+			triggered:    triggered,
+			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 {
+		Stats   []byte         `db:"stats"`
+		Created types.DateTime `db:"created"`
+	}{}
+
+	err = am.app.DB().
+		Select("stats", "created").
+		From("system_stats").
+		Where(dbx.NewExp(
+			"system={:system} AND type='1m' AND created > {:created}",
+			dbx.Params{
+				"system": systemRecord.Id,
+				// subtract some time to give us a bit of buffer
+				"created": oldestTime.Add(-time.Second * 90),
+			},
+		)).
+		OrderBy("created").
+		All(&systemStats)
+	if err != nil || len(systemStats) == 0 {
+		return err
+	}
+
+	// get oldest record creation time from first record in the slice
+	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)
+		}
+	}
+	validAlerts = filteredAlerts
+
+	if len(validAlerts) == 0 {
+		// log.Println("no valid alerts found")
+		return nil
+	}
+
+	var stats SystemAlertStats
+
+	// we can skip the latest systemStats record since it's the current value
+	for i := range systemStats {
+		stat := systemStats[i]
+		// subtract 10 seconds to give a small time buffer
+		systemStatsCreation := stat.Created.Time().Add(-time.Second * 10)
+		if err := json.Unmarshal(stat.Stats, &stats); err != nil {
+			return err
+		}
+		// log.Println("stats", stats)
+		for j := range validAlerts {
+			alert := &validAlerts[j]
+			// reset alert val on first iteration
+			if i == 0 {
+				alert.val = 0
+			}
+			// continue if system_stats is older than alert time range
+			if systemStatsCreation.Before(alert.time) {
+				continue
+			}
+			// add to alert value
+			switch alert.name {
+			case "CPU":
+				alert.val += stats.Cpu
+			case "Memory":
+				alert.val += stats.Mem
+			case "Bandwidth":
+				alert.val += stats.NetSent + stats.NetRecv
+			case "Disk":
+				if alert.mapSums == nil {
+					alert.mapSums = make(map[string]float32, len(data.Stats.ExtraFs)+1)
+				}
+				// add root disk
+				if _, ok := alert.mapSums["root"]; !ok {
+					alert.mapSums["root"] = 0.0
+				}
+				alert.mapSums["root"] += float32(stats.Disk)
+				// add extra disks
+				for key, fs := range data.Stats.ExtraFs {
+					if _, ok := alert.mapSums[key]; !ok {
+						alert.mapSums[key] = 0.0
+					}
+					alert.mapSums[key] += float32(fs.DiskUsed / fs.DiskTotal * 100)
+				}
+			case "Temperature":
+				if alert.mapSums == nil {
+					alert.mapSums = make(map[string]float32, len(stats.Temperatures))
+				}
+				for key, temp := range stats.Temperatures {
+					if _, ok := alert.mapSums[key]; !ok {
+						alert.mapSums[key] = float32(0)
+					}
+					alert.mapSums[key] += temp
+				}
+			default:
+				continue
+			}
+			alert.count++
+		}
+	}
+	// sum up vals for each alert
+	for _, alert := range validAlerts {
+		switch alert.name {
+		case "Disk":
+			maxPct := float32(0)
+			for key, value := range alert.mapSums {
+				sumPct := float32(value)
+				if sumPct > maxPct {
+					maxPct = sumPct
+					alert.descriptor = fmt.Sprintf("Usage of %s", key)
+				}
+			}
+			alert.val = float64(maxPct / float32(alert.count))
+		case "Temperature":
+			maxTemp := float32(0)
+			for key, value := range alert.mapSums {
+				sumTemp := float32(value) / float32(alert.count)
+				if sumTemp > maxTemp {
+					maxTemp = sumTemp
+					alert.descriptor = fmt.Sprintf("Highest sensor %s", key)
+				}
+			}
+			alert.val = float64(maxTemp)
+		default:
+			alert.val = alert.val / float64(alert.count)
+		}
+		minCount := float32(alert.min) / 1.2
+		// log.Println("alert", alert.name, "val", alert.val, "threshold", alert.threshold, "triggered", alert.triggered)
+		// log.Printf("%s: val %f | count %d | min-count %f | threshold %f\n", alert.name, alert.val, alert.count, minCount, alert.threshold)
+		// pass through alert if count is greater than or equal to minCount
+		if float32(alert.count) >= minCount {
+			if !alert.triggered && alert.val > alert.threshold {
+				alert.triggered = true
+				go am.sendSystemAlert(alert)
+			} else if alert.triggered && alert.val <= alert.threshold {
+				alert.triggered = false
+				go am.sendSystemAlert(alert)
+			}
+		}
+	}
+	return nil
+}
+
+func (am *AlertManager) sendSystemAlert(alert SystemAlertData) {
+	// log.Printf("Sending alert %s: val %f | count %d | threshold %f\n", alert.name, alert.val, alert.count, alert.threshold)
+	systemName := alert.systemRecord.GetString("name")
+
+	// change Disk to Disk usage
+	if alert.name == "Disk" {
+		alert.name += " usage"
+	}
+
+	// make title alert name lowercase if not CPU
+	titleAlertName := alert.name
+	if titleAlertName != "CPU" {
+		titleAlertName = strings.ToLower(titleAlertName)
+	}
+
+	var subject string
+	if alert.triggered {
+		subject = fmt.Sprintf("%s %s above threshold", systemName, titleAlertName)
+	} else {
+		subject = fmt.Sprintf("%s %s below threshold", systemName, titleAlertName)
+	}
+	minutesLabel := "minute"
+	if alert.min > 1 {
+		minutesLabel += "s"
+	}
+	if alert.descriptor == "" {
+		alert.descriptor = alert.name
+	}
+	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.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.app.ExpandRecord(alert.alertRecord, []string{"user"}, nil); len(errs) > 0 {
+		// app.Logger().Error("failed to expand user relation", "errs", errs)
+		return
+	}
+	if user := alert.alertRecord.ExpandedOne("user"); user != nil {
+		am.SendAlert(AlertMessageData{
+			UserID:   user.Id,
+			Title:    subject,
+			Message:  body,
+			Link:     am.app.Settings().Meta.AppURL + "/system/" + url.PathEscape(systemName),
+			LinkText: "View " + systemName,
+		})
+	}
+}

beszel/internal/entities/system/system.go

@@ -1,5 +1,7 @@
 package system
 
+// TODO: this is confusing, make common package with common/types common/helpers etc
+
 import (
 	"beszel/internal/entities/container"
 	"time"
@@ -75,6 +77,8 @@ type Info struct {
 	Bandwidth     float64 `json:"b"`
 	AgentVersion  string  `json:"v"`
 	Podman        bool    `json:"p,omitempty"`
+	GpuPct        float64 `json:"g,omitempty"`
+	DashboardTemp float64 `json:"dt,omitempty"`
 }
 
 // Final data structure to return to the hub

beszel/internal/hub/config.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"strconv"
 
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/apis"
@@ -22,13 +21,14 @@ type Config struct {
 type SystemConfig struct {
 	Name  string   `yaml:"name"`
 	Host  string   `yaml:"host"`
-	Port  uint16   `yaml:"port"`
+	Port  uint16   `yaml:"port,omitempty"`
 	Users []string `yaml:"users"`
 }
 
 // Syncs systems with the config.yml file
-func (h *Hub) syncSystemsWithConfig() error {
-	configPath := filepath.Join(h.app.DataDir(), "config.yml")
+func syncSystemsWithConfig(e *core.ServeEvent) error {
+	h := e.App
+	configPath := filepath.Join(h.DataDir(), "config.yml")
 	configData, err := os.ReadFile(configPath)
 	if err != nil {
 		return nil
@@ -49,7 +49,7 @@ func (h *Hub) syncSystemsWithConfig() error {
 
 	// Create a map of email to user ID
 	userEmailToID := make(map[string]string)
-	users, err := h.app.FindAllRecords("users", dbx.NewExp("id != ''"))
+	users, err := h.FindAllRecords("users", dbx.NewExp("id != ''"))
 	if err != nil {
 		return err
 	}
@@ -84,33 +84,33 @@ func (h *Hub) syncSystemsWithConfig() error {
 	}
 
 	// Get existing systems
-	existingSystems, err := h.app.FindAllRecords("systems", dbx.NewExp("id != ''"))
+	existingSystems, err := h.FindAllRecords("systems", dbx.NewExp("id != ''"))
 	if err != nil {
 		return err
 	}
 
-	// Create a map of existing systems for easy lookup
+	// Create a map of existing systems
 	existingSystemsMap := make(map[string]*core.Record)
 	for _, system := range existingSystems {
-		key := system.GetString("host") + ":" + system.GetString("port")
+		key := system.GetString("name") + system.GetString("host") + system.GetString("port")
 		existingSystemsMap[key] = system
 	}
 
 	// Process systems from config
 	for _, sysConfig := range config.Systems {
-		key := sysConfig.Host + ":" + strconv.Itoa(int(sysConfig.Port))
+		key := sysConfig.Name + sysConfig.Host + cast.ToString(sysConfig.Port)
 		if existingSystem, ok := existingSystemsMap[key]; ok {
 			// Update existing system
 			existingSystem.Set("name", sysConfig.Name)
 			existingSystem.Set("users", sysConfig.Users)
 			existingSystem.Set("port", sysConfig.Port)
-			if err := h.app.Save(existingSystem); err != nil {
+			if err := h.Save(existingSystem); err != nil {
 				return err
 			}
 			delete(existingSystemsMap, key)
 		} else {
 			// Create new system
-			systemsCollection, err := h.app.FindCollectionByNameOrId("systems")
+			systemsCollection, err := h.FindCollectionByNameOrId("systems")
 			if err != nil {
 				return fmt.Errorf("failed to find systems collection: %v", err)
 			}
@@ -121,7 +121,7 @@ func (h *Hub) syncSystemsWithConfig() error {
 			newSystem.Set("users", sysConfig.Users)
 			newSystem.Set("info", system.Info{})
 			newSystem.Set("status", "pending")
-			if err := h.app.Save(newSystem); err != nil {
+			if err := h.Save(newSystem); err != nil {
 				return fmt.Errorf("failed to create new system: %v", err)
 			}
 		}
@@ -129,7 +129,7 @@ func (h *Hub) syncSystemsWithConfig() error {
 
 	// Delete systems not in config
 	for _, system := range existingSystemsMap {
-		if err := h.app.Delete(system); err != nil {
+		if err := h.Delete(system); err != nil {
 			return err
 		}
 	}
@@ -141,7 +141,7 @@ func (h *Hub) syncSystemsWithConfig() error {
 // Generates content for the config.yml file as a YAML string
 func (h *Hub) generateConfigYAML() (string, error) {
 	// Fetch all systems from the database
-	systems, err := h.app.FindRecordsByFilter("systems", "id != ''", "name", -1, 0)
+	systems, err := h.FindRecordsByFilter("systems", "id != ''", "name", -1, 0)
 	if err != nil {
 		return "", err
 	}
@@ -194,7 +194,7 @@ func (h *Hub) generateConfigYAML() (string, error) {
 
 // New helper function to get a map of user IDs to emails
 func (h *Hub) getUserEmailMap(userIDs []string) (map[string]string, error) {
-	users, err := h.app.FindRecordsByIds("users", userIDs)
+	users, err := h.FindRecordsByIds("users", userIDs)
 	if err != nil {
 		return nil, err
 	}

beszel/internal/hub/hub.go

@@ -4,467 +4,248 @@ package hub
 import (
 	"beszel"
 	"beszel/internal/alerts"
-	"beszel/internal/entities/system"
+	"beszel/internal/hub/systems"
 	"beszel/internal/records"
 	"beszel/internal/users"
 	"beszel/site"
-
-	"context"
 	"crypto/ed25519"
 	"encoding/pem"
-	"fmt"
-	"log"
-	"net"
+	"io/fs"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
 	"os"
 	"strings"
-	"sync"
-	"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"
 	"golang.org/x/crypto/ssh"
 )
 
 type Hub struct {
-	app               *pocketbase.PocketBase
-	systemConnections sync.Map
-	sshClientConfig   *ssh.ClientConfig
-	pubKey            string
-	am                *alerts.AlertManager
-	um                *users.UserManager
-	rm                *records.RecordManager
-	systemStats       *core.Collection
-	containerStats    *core.Collection
+	core.App
+	*alerts.AlertManager
+	um     *users.UserManager
+	rm     *records.RecordManager
+	sm     *systems.SystemManager
+	pubKey string
+	appURL string
 }
 
-func NewHub(app *pocketbase.PocketBase) *Hub {
-	return &Hub{
-		app: app,
-		am:  alerts.NewAlertManager(app),
-		um:  users.NewUserManager(app),
-		rm:  records.NewRecordManager(app),
+// NewHub creates a new Hub instance with default configuration
+func NewHub(app core.App) *Hub {
+	hub := &Hub{}
+	hub.App = app
+
+	hub.AlertManager = 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
+}
+
+// GetEnv retrieves an environment variable with a "BESZEL_HUB_" prefix, or falls back to the unprefixed key.
+func GetEnv(key string) (value string, exists bool) {
+	if value, exists = os.LookupEnv("BESZEL_HUB_" + key); exists {
+		return value, exists
 	}
+	// Fallback to the old unprefixed key
+	return os.LookupEnv(key)
 }
 
-func (h *Hub) Run() {
-	// loosely check if it was executed using "go run"
-	isGoRun := strings.HasPrefix(os.Args[0], os.TempDir())
+func (h *Hub) StartHub() error {
 
-	// enable auto creation of migration files when making collection changes in the Admin UI
-	migratecmd.MustRegister(h.app, h.app.RootCmd, migratecmd.Config{
-		// (the isGoRun check is to enable it only during development)
-		Automigrate: isGoRun,
-		Dir:         "../../migrations",
-	})
-
-	// initial setup
-	h.app.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.app.Settings()
-		// batch requests (for global alerts)
-		settings.Batch.Enabled = true
-		// set auth settings
-		usersCollection, err := h.app.FindCollectionByNameOrId("users")
-		if err != nil {
-			return err
-		}
-		// disable email auth if DISABLE_PASSWORD_AUTH env var is set
-		usersCollection.PasswordAuth.Enabled = os.Getenv("DISABLE_PASSWORD_AUTH") != "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 os.Getenv("USER_CREATION") == "true" {
-			cr := "@request.context = 'oauth2'"
-			usersCollection.CreateRule = &cr
-		} else {
-			usersCollection.CreateRule = nil
-		}
-		if err := h.app.Save(usersCollection); err != nil {
+	h.App.OnServe().BindFunc(func(e *core.ServeEvent) error {
+		// initialize settings / collections
+		if err := h.initialize(e); err != nil {
 			return err
 		}
 		// sync systems with config
-		h.syncSystemsWithConfig()
-		return se.Next()
-	})
-
-	// serve web ui
-	h.app.OnServe().BindFunc(func(se *core.ServeEvent) error {
-		switch isGoRun {
-		case true:
-			proxy := httputil.NewSingleHostReverseProxy(&url.URL{
-				Scheme: "http",
-				Host:   "localhost:5173",
-			})
-			se.Router.Any("/", func(e *core.RequestEvent) error {
-				proxy.ServeHTTP(e.Response, e.Request)
-				return nil
-			})
-		default:
-			csp, cspExists := os.LookupEnv("CSP")
-			se.Router.Any("/{path...}", func(e *core.RequestEvent) error {
-				if cspExists {
-					e.Response.Header().Del("X-Frame-Options")
-					e.Response.Header().Set("Content-Security-Policy", csp)
-				}
-				indexFallback := !strings.HasPrefix(e.Request.URL.Path, "/static/")
-				return apis.Static(site.DistDirFS, indexFallback)(e)
-			})
+		if err := syncSystemsWithConfig(e); err != nil {
+			return err
 		}
-		return se.Next()
-	})
-
-	// set up scheduled jobs / ticker for system updates
-	h.app.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.app.Cron().MustAdd("delete old records", "8 * * * *", h.rm.DeleteOldRecords)
-		// create longer records every 10 minutes
-		h.app.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.app.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.app.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.app.CountRecords("users"); totalUsers == 0 {
-			se.Router.POST("/api/beszel/create-user", h.um.CreateFirstUser)
+		// register api routes
+		if err := h.registerApiRoutes(e); err != nil {
+			return err
+		}
+		// 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.app.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.app.OnRecordAfterCreateSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
-		go h.updateSystem(e.Record)
 		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)
+	h.App.OnRecordCreate("users").BindFunc(h.um.InitializeUserRole)
+	h.App.OnRecordCreate("user_settings").BindFunc(h.um.InitializeUserSettings)
 
-	// empty info for systems that are paused
-	h.app.OnRecordUpdate("systems").BindFunc(func(e *core.RecordEvent) error {
-		if e.Record.GetString("status") == "paused" {
-			e.Record.Set("info", system.Info{})
-		}
-		return e.Next()
-	})
-
-	// do things after a systems record is updated
-	h.app.OnRecordAfterUpdateSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
-		newRecord := e.Record.Fresh()
-		oldRecord := newRecord.Original()
-		newStatus := newRecord.GetString("status")
-
-		// if system is disconnected and connection exists, remove it
-		if newStatus == "down" || newStatus == "paused" {
-			h.deleteSystemConnection(newRecord)
-		}
-
-		// 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.app.OnRecordAfterDeleteSuccess("systems").BindFunc(func(e *core.RecordEvent) error {
-		h.deleteSystemConnection(e.Record)
-		return e.Next()
-	})
-
-	if err := h.app.Start(); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func (h *Hub) startSystemUpdateTicker() {
-	c := time.Tick(15 * time.Second)
-	for range c {
-		h.updateSystems()
-	}
-}
-
-func (h *Hub) updateSystems() {
-	records, err := h.app.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.app.Logger().Error("Failed to query systems")
-		return
-	}
-	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)
-	}
-}
-
-func (h *Hub) updateSystem(record *core.Record) {
-	var client *ssh.Client
-	var err error
-
-	// check if system connection exists
-	if existingClient, ok := h.systemConnections.Load(record.Id); ok {
-		client = existingClient.(*ssh.Client)
-	} else {
-		// create system connection
-		client, err = h.createSystemConnection(record)
+	if pb, ok := h.App.(*pocketbase.PocketBase); ok {
+		// log.Println("Starting pocketbase")
+		err := pb.Start()
 		if err != nil {
-			if record.GetString("status") != "down" {
-				h.app.Logger().Error("Failed to connect:", "err", err.Error(), "system", record.GetString("host"), "port", record.GetString("port"))
-				h.updateSystemStatus(record, "down")
-			}
-			return
+			return err
 		}
-		h.systemConnections.Store(record.Id, client)
-	}
-	// 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.app.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.app.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.app.SaveNoValidate(record); err != nil {
-		h.app.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.app.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.app.SaveNoValidate(systemStatsRecord); err != nil {
-			h.app.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.app.SaveNoValidate(containerStatsRecord); err != nil {
-				h.app.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.app.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.app.FindCollectionByNameOrId("system_stats")
-		if err != nil {
-			return nil, nil, err
-		}
-		h.systemStats = systemStats
-	}
-	if h.containerStats == nil {
-		containerStats, err := h.app.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.app.SaveNoValidate(record); err != nil {
-			h.app.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.systemConnections.Load(record.Id); ok {
-		if sshClient := client.(*ssh.Client); sshClient != nil {
-			sshClient.Close()
-		}
-		h.systemConnections.Delete(record.Id)
-	}
-}
-
-func (h *Hub) createSystemConnection(record *core.Record) (*ssh.Client, error) {
-	client, err := ssh.Dial("tcp", net.JoinHostPort(record.GetString("host"), record.GetString("port")), h.sshClientConfig)
-	if err != nil {
-		return nil, err
-	}
-	return client, nil
-}
-
-func (h *Hub) createSSHClientConfig() error {
-	key, err := h.getSSHKey()
-	if err != nil {
-		h.app.Logger().Error("Failed to get SSH key: ", "err", err.Error())
-		return err
-	}
-
-	// Create the Signer for this private key.
-	signer, err := ssh.ParsePrivateKey(key)
-	if err != nil {
-		return err
-	}
-
-	h.sshClientConfig = &ssh.ClientConfig{
-		User: "u",
-		Auth: []ssh.AuthMethod{
-			ssh.PublicKeys(signer),
-		},
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-		Timeout:         4 * time.Second,
-	}
-	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
-	}
-
-	if err := session.Shell(); err != nil {
-		return err
-	}
-
-	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
 }
 
-// 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")
+// 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
 	}
+	// set auth settings
+	usersCollection, err := e.App.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 := e.App.Save(usersCollection); err != nil {
+		return err
+	}
+	// allow all users to access systems if SHARE_ALL_SYSTEMS is set
+	systemsCollection, err := e.App.FindCachedCollectionByNameOrId("systems")
+	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"
+	}
+	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 err
+	}
+	return nil
 }
 
-func (h *Hub) getSSHKey() ([]byte, error) {
-	dataDir := h.app.DataDir()
+// startServer starts the server for the Beszel (not PocketBase)
+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)
+		})
+	}
+	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)
+	}
+	return nil
+}
+
+// generates key pair if it doesn't exist and returns private key bytes
+func (h *Hub) GetSSHKey() ([]byte, error) {
+	dataDir := h.DataDir()
 	// check if the key pair already exists
 	existingKey, err := os.ReadFile(dataDir + "/id_ed25519")
 	if err == nil {
-		if pubKey, err := os.ReadFile(h.app.DataDir() + "/id_ed25519.pub"); err == nil {
+		if pubKey, err := os.ReadFile(h.DataDir() + "/id_ed25519.pub"); err == nil {
 			h.pubKey = strings.TrimSuffix(string(pubKey), "\n")
 		}
 		// return existing private key
@@ -474,27 +255,27 @@ func (h *Hub) getSSHKey() ([]byte, error) {
 	// Generate the Ed25519 key pair
 	pubKey, privKey, err := ed25519.GenerateKey(nil)
 	if err != nil {
-		// h.app.Logger().Error("Error generating key pair:", "err", err.Error())
+		// h.Logger().Error("Error generating key pair:", "err", err.Error())
 		return nil, err
 	}
 
 	// Get the private key in OpenSSH format
 	privKeyBytes, err := ssh.MarshalPrivateKey(privKey, "")
 	if err != nil {
-		// h.app.Logger().Error("Error marshaling private key:", "err", err.Error())
+		// 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.app.Logger().Error("Error creating private key file:", "err", err.Error())
+		// 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.app.Logger().Error("Error writing private key to file:", "err", err.Error())
+		// h.Logger().Error("Error writing private key to file:", "err", err.Error())
 		return nil, err
 	}
 
@@ -518,9 +299,9 @@ func (h *Hub) getSSHKey() ([]byte, error) {
 		return nil, err
 	}
 
-	h.app.Logger().Info("ed25519 SSH key pair generated successfully.")
-	h.app.Logger().Info("Private key saved to: " + dataDir + "/id_ed25519")
-	h.app.Logger().Info("Public key saved to: " + dataDir + "/id_ed25519.pub")
+	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 {

beszel/internal/hub/systems/systems.go

@@ -0,0 +1,435 @@
+package systems
+
+import (
+	"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() ([]byte, 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
+	key, err := sm.hub.GetSSHKey()
+	if err != nil {
+		return err
+	}
+	if err := sm.createSSHClientConfig(key); 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)
+		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")
+}
+
+func (sm *SystemManager) createSSHClientConfig(key []byte) error {
+	signer, err := ssh.ParsePrivateKey(key)
+	if err != nil {
+		return err
+	}
+	sm.sshConfig = &ssh.ClientConfig{
+		User: "u",
+		Auth: []ssh.AuthMethod{
+			ssh.PublicKeys(signer),
+		},
+		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
+}

beszel/internal/hub/systems/systems_test.go

@@ -0,0 +1,440 @@
+//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

@@ -0,0 +1,117 @@
+//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,19 +4,19 @@ 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"
 	"github.com/pocketbase/pocketbase/core"
-	"github.com/pocketbase/pocketbase/tools/types"
 )
 
 type RecordManager struct {
-	app *pocketbase.PocketBase
+	app core.App
 }
 
 type LongerRecordData struct {
@@ -26,21 +26,16 @@ type LongerRecordData struct {
 	minShorterRecords  int
 }
 
-type RecordDeletionData struct {
-	recordType string
-	retention  time.Duration
-}
-
 type RecordStats []struct {
 	Stats []byte `db:"stats"`
 }
 
-func NewRecordManager(app *pocketbase.PocketBase) *RecordManager {
+func NewRecordManager(app core.App) *RecordManager {
 	return &RecordManager{app}
 }
 
 // Create longer records by averaging shorter records
-func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
+func (rm *RecordManager) CreateLongerRecords() {
 	// start := time.Now()
 	longerRecordData := []LongerRecordData{
 		{
@@ -71,14 +66,24 @@ func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
 	}
 	// wrap the operations in a transaction
 	rm.app.RunInTransaction(func(txApp core.App) error {
-		activeSystems, err := txApp.FindAllRecords("systems", dbx.NewExp("status = 'up'"))
+		var err error
+		collections := [2]*core.Collection{}
+		collections[0], err = txApp.FindCachedCollectionByNameOrId("system_stats")
 		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 activeSystems {
+		for _, system := range systems {
 			// log.Println("processing system", system.GetString("name"))
 			for i := range longerRecordData {
 				recordData := longerRecordData[i]
@@ -93,7 +98,7 @@ func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
 					if recordData.longerType != "10m" {
 						lastLongerRecord, err := txApp.FindFirstRecordByFilter(
 							collection.Id,
-							"type = {:type} && system = {:system} && created > {:created}",
+							"system = {:system} && type = {:type} && created > {:created}",
 							dbx.Params{"type": recordData.longerType, "system": system.Id, "created": longerRecordPeriod},
 						)
 						// continue if longer record exists
@@ -109,7 +114,7 @@ func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
 						Select("stats").
 						From(collection.Name).
 						AndWhere(dbx.NewExp(
-							"type={:type} AND system={:system} AND created > {:created}",
+							"system={:system} AND type={:type} AND created > {:created}",
 							dbx.Params{
 								"type":    recordData.shorterType,
 								"system":  system.Id,
@@ -120,7 +125,6 @@ func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
 
 					// 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
@@ -134,7 +138,7 @@ func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
 						longerRecord.Set("stats", rm.AverageContainerStats(stats))
 					}
 					if err := txApp.SaveNoValidate(longerRecord); err != nil {
-						log.Println("failed to save longer record", "err", err.Error())
+						log.Println("failed to save longer record", "err", err)
 					}
 				}
 			}
@@ -147,16 +151,20 @@ func (rm *RecordManager) CreateLongerRecords(collections []*core.Collection) {
 }
 
 // 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)
 
-	var stats system.Stats
+	// Temporary struct for unmarshaling
+	stats := &system.Stats{}
+
+	// Accumulate totals
 	for i := range records {
-		stats = system.Stats{} // Zero the struct before unmarshalling
-		json.Unmarshal(records[i].Stats, &stats)
+		*stats = system.Stats{} // Reset tempStats for unmarshaling
+		if err := json.Unmarshal(records[i].Stats, stats); err != nil {
+			continue
+		}
 		sum.Cpu += stats.Cpu
 		sum.Mem += stats.Mem
 		sum.MemUsed += stats.MemUsed
@@ -172,26 +180,25 @@ 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)
-		// add temps to sum
+
+		// Accumulate temperatures
 		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
 			}
 		}
-		// add extra fs to sum
+
+		// Accumulate extra filesystem stats
 		if stats.ExtraFs != nil {
 			if sum.ExtraFs == nil {
 				sum.ExtraFs = make(map[string]*system.FsStats, len(stats.ExtraFs))
@@ -200,25 +207,26 @@ func (rm *RecordManager) AverageSystemStats(records RecordStats) system.Stats {
 				if _, ok := sum.ExtraFs[key]; !ok {
 					sum.ExtraFs[key] = &system.FsStats{}
 				}
-				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)
+				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)
 			}
 		}
-		// add GPU data
+
+		// Accumulate 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 {
-				if _, ok := sum.GPUData[id]; !ok {
-					sum.GPUData[id] = system.GPUData{Name: value.Name}
+				gpu, ok := sum.GPUData[id]
+				if !ok {
+					gpu = system.GPUData{Name: value.Name}
 				}
-				gpu := sum.GPUData[id]
 				gpu.Temperature += value.Temperature
 				gpu.MemoryUsed += value.MemoryUsed
 				gpu.MemoryTotal += value.MemoryTotal
@@ -230,76 +238,67 @@ func (rm *RecordManager) AverageSystemStats(records RecordStats) system.Stats {
 		}
 	}
 
-	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,
-	}
+	// 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)
 
-	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 temperatures
+		if sum.Temperatures != nil && tempCount > 0 {
+			for key := range sum.Temperatures {
+				sum.Temperatures[key] = twoDecimals(sum.Temperatures[key] / tempCount)
+			}
 		}
-	}
 
-	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,
+		// 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.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
+	return sum
 }
 
 // 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))
-
-	var containerStats []container.Stats
+	containerStats := make([]container.Stats, 0, 50)
 	for i := range records {
-		// Reset the slice length to 0, but keep the capacity
+		// reset slice
 		containerStats = containerStats[:0]
 		if err := json.Unmarshal(records[i].Stats, &containerStats); err != nil {
 			return []container.Stats{}
@@ -331,38 +330,45 @@ 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"}
-	recordData := []RecordDeletionData{
-		{
-			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,
-		},
+
+	// Define record types and their retention periods
+	type RecordDeletionData struct {
+		recordType string
+		retention  time.Duration
 	}
-	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())
-			}
+	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
+	}
+
+	// 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)
 		}
 	}
 }

beszel/internal/tests/hub.go

@@ -0,0 +1,58 @@
+// 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/internal/users/users.go

@@ -5,14 +5,12 @@ import (
 	"beszel/migrations"
 	"log"
 	"net/http"
-	"strings"
 
-	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/core"
 )
 
 type UserManager struct {
-	app *pocketbase.PocketBase
+	app core.App
 }
 
 type UserSettings struct {
@@ -22,7 +20,7 @@ type UserSettings struct {
 	// Language             string   `json:"lang"`
 }
 
-func NewUserManager(app *pocketbase.PocketBase) *UserManager {
+func NewUserManager(app core.App) *UserManager {
 	return &UserManager{
 		app: app,
 	}
@@ -98,9 +96,6 @@ func (um *UserManager) CreateFirstUser(e *core.RequestEvent) error {
 	user.SetPassword(data.Password)
 	user.Set("role", "admin")
 	user.Set("verified", true)
-	if username := strings.Split(data.Email, "@")[0]; len(username) > 2 {
-		user.Set("username", username)
-	}
 	if err := um.app.Save(user); err != nil {
 		return e.JSON(http.StatusInternalServerError, map[string]string{"err": err.Error()})
 	}

beszel/migrations/collections_snapshot_0_10_2.go

@@ -0,0 +1,676 @@
+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

@@ -1,10 +1,17 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en" dir="ltr">
 	<head>
 		<meta charset="UTF-8" />
-		<link rel="icon" type="image/svg+xml" href="/static/favicon.svg" />
+		<link rel="manifest" href="./static/manifest.json" />
+		<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>
 	</head>
 	<body>
 		<div id="app"></div>

beszel/site/lingui.config.ts

@@ -1,9 +1,10 @@
-import type { LinguiConfig } from "@lingui/conf"
+import { defineConfig } from "@lingui/cli"
 
-const config: LinguiConfig = {
+export default defineConfig({
 	locales: [
 		"en",
 		"ar",
+		"bg",
 		"cs",
 		"da",
 		"de",
@@ -11,10 +12,13 @@ const config: LinguiConfig = {
 		"fa",
 		"fr",
 		"hr",
+		"hu",
 		"it",
+		"is",
 		"ja",
 		"ko",
 		"nl",
+		"no",
 		"pl",
 		"pt",
 		"tr",
@@ -23,6 +27,7 @@ const config: LinguiConfig = {
 		"sv",
 		"uk",
 		"vi",
+		"zh",
 		"zh-CN",
 		"zh-HK",
 	],
@@ -34,6 +39,4 @@ const config: LinguiConfig = {
 			include: ["src"],
 		},
 	],
-}
-
-export default config
+})

beszel/site/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "beszel",
 	"private": true,
-	"version": "0.0.0",
+	"version": "0.10.2",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
@@ -12,54 +12,55 @@
 	},
 	"dependencies": {
 		"@henrygd/queue": "^1.0.7",
-		"@lingui/detect-locale": "^4.14.1",
-		"@lingui/macro": "^4.14.1",
-		"@lingui/react": "^4.14.1",
+		"@henrygd/semaphore": "^0.0.2",
+		"@lingui/detect-locale": "^5.2.0",
+		"@lingui/macro": "^5.2.0",
+		"@lingui/react": "^5.2.0",
 		"@nanostores/react": "^0.7.3",
 		"@nanostores/router": "^0.11.0",
-		"@radix-ui/react-alert-dialog": "^1.1.4",
-		"@radix-ui/react-checkbox": "^1.1.3",
-		"@radix-ui/react-dialog": "^1.1.4",
+		"@radix-ui/react-alert-dialog": "^1.1.6",
+		"@radix-ui/react-checkbox": "^1.1.4",
+		"@radix-ui/react-dialog": "^1.1.6",
 		"@radix-ui/react-direction": "^1.1.0",
-		"@radix-ui/react-dropdown-menu": "^2.1.4",
-		"@radix-ui/react-label": "^2.1.1",
-		"@radix-ui/react-select": "^2.1.4",
-		"@radix-ui/react-separator": "^1.1.1",
-		"@radix-ui/react-slider": "^1.2.2",
-		"@radix-ui/react-slot": "^1.1.1",
-		"@radix-ui/react-switch": "^1.1.2",
-		"@radix-ui/react-tabs": "^1.1.2",
-		"@radix-ui/react-toast": "^1.2.4",
-		"@radix-ui/react-tooltip": "^1.1.6",
-		"@tanstack/react-table": "^8.20.6",
+		"@radix-ui/react-dropdown-menu": "^2.1.6",
+		"@radix-ui/react-label": "^2.1.2",
+		"@radix-ui/react-select": "^2.1.6",
+		"@radix-ui/react-separator": "^1.1.2",
+		"@radix-ui/react-slider": "^1.2.3",
+		"@radix-ui/react-slot": "^1.1.2",
+		"@radix-ui/react-switch": "^1.1.3",
+		"@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",
 		"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.3",
-		"pocketbase": "^0.22.1",
+		"nanostores": "^0.11.4",
+		"pocketbase": "^0.25.2",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
-		"recharts": "^2.15.0",
-		"tailwind-merge": "^2.5.5",
+		"recharts": "^2.15.1",
+		"tailwind-merge": "^2.6.0",
 		"tailwindcss-animate": "^1.0.7",
-		"valibot": "^0.36.0"
+		"valibot": "^0.42.0"
 	},
 	"devDependencies": {
-		"@lingui/cli": "^4.14.1",
-		"@lingui/swc-plugin": "^4.1.0",
-		"@lingui/vite-plugin": "^4.14.1",
-		"@types/bun": "^1.1.14",
-		"@types/react": "^18.3.17",
-		"@types/react-dom": "^18.3.5",
-		"@vitejs/plugin-react-swc": "^3.7.2",
+		"@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",
 		"autoprefixer": "^10.4.20",
-		"postcss": "^8.4.49",
+		"postcss": "^8.5.3",
 		"tailwindcss": "^3.4.17",
 		"tailwindcss-rtl": "^0.9.0",
-		"typescript": "^5.7.2",
-		"vite": "^5.4.11"
+		"typescript": "^5.8.2",
+		"vite": "^6.2.0"
 	},
 	"overrides": {
 		"@nanostores/router": {

beszel/site/public/static/lock.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24"><rect width="18" height="11" x="3" y="11" rx="2" ry="2"/><path d="M7 11V7a5 5 0 0 1 10 0v4"/></svg>

beszel/site/public/static/manifest.json

@@ -0,0 +1,14 @@
+{
+	"name": "Beszel",
+	"icons": [
+		{
+			"src": "icon.png",
+			"sizes": "512x512",
+			"type": "image/png"
+		}
+	],
+  "start_url": "../",
+	"display": "standalone",
+	"background_color": "#202225",
+	"theme_color": "#202225"
+}

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

@@ -1,3 +1,5 @@
+import { Trans } from "@lingui/react/macro";
+import { t } from "@lingui/core/macro";
 import { Button } from "@/components/ui/button"
 import {
 	Dialog,
@@ -8,63 +10,26 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog"
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
 
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { $publicKey, pb } from "@/lib/stores"
-import { Copy, PlusIcon } from "lucide-react"
-import { useState, useRef, MutableRefObject } from "react"
-import { useStore } from "@nanostores/react"
-import { cn, copyToClipboard, isReadOnlyUser } from "@/lib/utils"
-import { navigate } from "./router"
-import { Trans } from "@lingui/macro"
+import { cn, copyToClipboard, isReadOnlyUser, useLocalStorage } from "@/lib/utils"
 import { i18n } from "@lingui/core"
+import { useStore } from "@nanostores/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"
 
 export function AddSystemButton({ className }: { className?: string }) {
 	const [open, setOpen] = useState(false)
-	const port = useRef() as MutableRefObject<HTMLInputElement>
-	const publicKey = useStore($publicKey)
-
-	function copyDockerCompose(port: string) {
-		copyToClipboard(`services:
-  beszel-agent:
-    image: "henrygd/beszel-agent"
-    container_name: "beszel-agent"
-    restart: unless-stopped
-    network_mode: host
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      # monitor other disks / partitions by mounting a folder in /extra-filesystems
-      # - /mnt/disk/.beszel:/extra-filesystems/sda1:ro
-    environment:
-      PORT: ${port}
-      KEY: "${publicKey}"`)
-	}
-
-	function copyInstallCommand(port: 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)
-	}
-
-	async function handleSubmit(e: SubmitEvent) {
-		e.preventDefault()
-		const formData = new FormData(e.target as HTMLFormElement)
-		const data = Object.fromEntries(formData) as Record<string, any>
-		data.users = pb.authStore.record!.id
-		try {
-			setOpen(false)
-			await pb.collection("systems").create(data)
-			navigate("/")
-			// console.log(record)
-		} catch (e) {
-			console.log(e)
-		}
+	let opened = useRef(false)
+	if (open) {
+		opened.current = true
 	}
 
 	return (
@@ -80,106 +45,231 @@ export function AddSystemButton({ className }: { className?: string }) {
 					</Trans>
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="w-[90%] sm:max-w-[440px] rounded-lg">
-				<Tabs defaultValue="docker">
-					<DialogHeader>
-						<DialogTitle className="mb-2">
-							<Trans>Add New System</Trans>
-						</DialogTitle>
-						<TabsList className="grid w-full grid-cols-2">
-							<TabsTrigger value="docker">Docker</TabsTrigger>
-							<TabsTrigger value="binary">
-								<Trans>Binary</Trans>
-							</TabsTrigger>
-						</TabsList>
-					</DialogHeader>
-					{/* Docker */}
-					<TabsContent value="docker">
-						<DialogDescription className="mb-4 leading-normal">
-							<Trans>
-								The agent must be running on the system to connect. Copy the
-								<code className="bg-muted px-1 rounded-sm leading-3">docker-compose.yml</code> for the agent below.
-							</Trans>
-						</DialogDescription>
-					</TabsContent>
-					{/* Binary */}
-					<TabsContent value="binary">
-						<DialogDescription className="mb-4 leading-normal">
-							<Trans>
-								The agent must be running on the system to connect. Copy the installation command for the agent below.
-							</Trans>
-						</DialogDescription>
-					</TabsContent>
-					<form onSubmit={handleSubmit as any}>
-						<div className="grid xs:grid-cols-[auto_1fr] gap-y-3 gap-x-4 items-center mt-1 mb-4">
-							<Label htmlFor="name" className="xs:text-end">
-								<Trans>Name</Trans>
-							</Label>
-							<Input id="name" name="name" className="" required />
-							<Label htmlFor="host" className="xs:text-end">
-								<Trans>Host / IP</Trans>
-							</Label>
-							<Input id="host" name="host" className="" required />
-							<Label htmlFor="port" className="xs:text-end">
-								<Trans>Port</Trans>
-							</Label>
-							<Input ref={port} name="port" id="port" defaultValue="45876" className="" required />
-							<Label htmlFor="pkey" className="xs:text-end whitespace-pre">
-								<Trans comment="Use 'Key' if your language requires many more characters">Public Key</Trans>
-							</Label>
-							<div className="relative">
-								<Input readOnly id="pkey" value={publicKey} className="" required></Input>
-								<div
-									className={
-										"h-6 w-24 bg-gradient-to-r rtl:bg-gradient-to-l from-transparent to-background to-65% absolute top-2 end-1 pointer-events-none"
-									}
-								></div>
-								<TooltipProvider delayDuration={100}>
-									<Tooltip>
-										<TooltipTrigger asChild>
-											<Button
-												type="button"
-												variant={"link"}
-												className="absolute end-0 top-0"
-												onClick={() => copyToClipboard(publicKey)}
-											>
-												<Copy className="h-4 w-4 " />
-											</Button>
-										</TooltipTrigger>
-										<TooltipContent>
-											<p>
-												<Trans>Click to copy</Trans>
-											</p>
-										</TooltipContent>
-									</Tooltip>
-								</TooltipProvider>
-							</div>
-						</div>
-						{/* Docker */}
-						<TabsContent value="docker">
-							<DialogFooter className="flex justify-end gap-2 sm:w-[calc(100%+20px)] sm:-ms-[20px]">
-								<Button type="button" variant={"ghost"} onClick={() => copyDockerCompose(port.current.value)}>
-									<Trans>Copy</Trans> docker compose
-								</Button>
-								<Button>
-									<Trans>Add system</Trans>
-								</Button>
-							</DialogFooter>
-						</TabsContent>
-						{/* Binary */}
-						<TabsContent value="binary">
-							<DialogFooter className="flex justify-end gap-2 sm:w-[calc(100%+20px)] sm:-ms-[20px]">
-								<Button type="button" variant={"ghost"} onClick={() => copyInstallCommand(port.current.value)}>
-									<Trans>Copy Linux command</Trans>
-								</Button>
-								<Button>
-									<Trans>Add system</Trans>
-								</Button>
-							</DialogFooter>
-						</TabsContent>
-					</form>
-				</Tabs>
-			</DialogContent>
+			{opened.current && <SystemDialog setOpen={setOpen} />}
 		</Dialog>
 	)
 }
+
+function copyDockerCompose(port = "45876", publicKey: string) {
+	copyToClipboard(`services:
+  beszel-agent:
+    image: "henrygd/beszel-agent"
+    container_name: "beszel-agent"
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      # monitor other disks / partitions by mounting a folder in /extra-filesystems
+      # - /mnt/disk/.beszel:/extra-filesystems/sda1:ro
+    environment:
+      LISTEN: ${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`
+	)
+}
+
+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)
+}
+
+/**
+ * SystemDialog component for adding or editing a system.
+ * @param {Object} props - The component props.
+ * @param {function} props.setOpen - Function to set the open state of the dialog.
+ * @param {SystemRecord} [props.system] - Optional system record for editing an existing system.
+ */
+export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean) => void; system?: SystemRecord }) => {
+	const publicKey = useStore($publicKey)
+	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()
+		const formData = new FormData(e.target as HTMLFormElement)
+		const data = Object.fromEntries(formData) as Record<string, any>
+		data.users = pb.authStore.record!.id
+		try {
+			setOpen(false)
+			if (system) {
+				await pb.collection("systems").update(system.id, { ...data, status: "pending" })
+			} else {
+				await pb.collection("systems").create(data)
+			}
+			navigate(basePath)
+			// console.log(record)
+		} catch (e) {
+			console.log(e)
+		}
+	}
+
+	return (
+		<DialogContent
+			className="w-[90%] sm:w-auto sm:ns-dialog max-w-full rounded-lg"
+			onCloseAutoFocus={() => {
+				setHostValue(system?.host ?? "")
+			}}
+		>
+			<Tabs defaultValue={tab} onValueChange={setTab}>
+				<DialogHeader>
+					<DialogTitle className="mb-2">
+						{system ? `${t`Edit`} ${system?.name}` : <Trans>Add New System</Trans>}
+					</DialogTitle>
+					<TabsList className="grid w-full grid-cols-2">
+						<TabsTrigger value="docker">Docker</TabsTrigger>
+						<TabsTrigger value="binary">
+							<Trans>Binary</Trans>
+						</TabsTrigger>
+					</TabsList>
+				</DialogHeader>
+				{/* Docker (set tab index to prevent auto focusing content in edit system dialog) */}
+				<TabsContent value="docker" tabIndex={-1}>
+					<DialogDescription className="mb-4 leading-normal w-0 min-w-full">
+						<Trans>
+							The agent must be running on the system to connect. Copy the
+							<code className="bg-muted px-1 rounded-sm leading-3">docker-compose.yml</code> for the agent below.
+						</Trans>
+					</DialogDescription>
+				</TabsContent>
+				{/* Binary */}
+				<TabsContent value="binary" tabIndex={-1}>
+					<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.
+						</Trans>
+					</DialogDescription>
+				</TabsContent>
+				<form onSubmit={handleSubmit as any}>
+					<div className="grid xs:grid-cols-[auto_1fr] gap-y-3 gap-x-4 items-center mt-1 mb-4">
+						<Label htmlFor="name" className="xs:text-end">
+							<Trans>Name</Trans>
+						</Label>
+						<Input id="name" name="name" defaultValue={system?.name} required />
+						<Label htmlFor="host" className="xs:text-end">
+							<Trans>Host / IP</Trans>
+						</Label>
+						<Input
+							id="host"
+							name="host"
+							value={hostValue}
+							required
+							onChange={(e) => {
+								setHostValue(e.target.value)
+							}}
+						/>
+						<Label htmlFor="port" className={cn("xs:text-end", isUnixSocket && "hidden")}>
+							<Trans>Port</Trans>
+						</Label>
+						<Input
+							ref={port}
+							name="port"
+							id="port"
+							defaultValue={system?.port || "45876"}
+							required={!isUnixSocket}
+							className={cn(isUnixSocket && "hidden")}
+						/>
+						<Label htmlFor="pkey" className="xs:text-end whitespace-pre">
+							<Trans comment="Use 'Key' if your language requires many more characters">Public Key</Trans>
+						</Label>
+						<div className="relative">
+							<Input readOnly id="pkey" value={publicKey} required></Input>
+							<div
+								className={
+									"h-6 w-24 bg-gradient-to-r rtl:bg-gradient-to-l from-transparent to-background to-65% absolute top-2 end-1 pointer-events-none"
+								}
+							></div>
+							<TooltipProvider delayDuration={100}>
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<Button
+											type="button"
+											variant={"link"}
+											className="absolute end-0 top-0"
+											onClick={() => copyToClipboard(publicKey)}
+										>
+											<Copy className="h-4 w-4 " />
+										</Button>
+									</TooltipTrigger>
+									<TooltipContent>
+										<p>
+											<Trans>Click to copy</Trans>
+										</p>
+									</TooltipContent>
+								</Tooltip>
+							</TooltipProvider>
+						</div>
+					</div>
+					<DialogFooter className="flex justify-end gap-x-2 gap-y-3 flex-col mt-5">
+						{/* Docker */}
+						<TabsContent value="docker" className="contents">
+							<CopyButton
+								text={t`Copy` + " docker compose"}
+								onClick={() => copyDockerCompose(isUnixSocket ? hostValue : port.current?.value, publicKey)}
+								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`}
+								onClick={() => copyInstallCommand(isUnixSocket ? hostValue : port.current?.value, publicKey)}
+								dropdownText={t`Manual setup instructions`}
+								dropdownUrl="https://beszel.dev/guide/agent-installation#binary"
+							/>
+						</TabsContent>
+						{/* Save */}
+						<Button>{system ? <Trans>Save system</Trans> : <Trans>Add system</Trans>}</Button>
+					</DialogFooter>
+				</form>
+			</Tabs>
+		</DialogContent>
+	)
+})
+
+interface CopyButtonProps {
+	text: string
+	onClick: () => void
+	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">
+				{props.text}
+			</Button>
+			<div className="w-px h-full bg-muted"></div>
+			<DropdownMenu>
+				<DropdownMenuTrigger asChild>
+					<Button variant="outline" className={"px-2 rounded-s-none border-s-0"}>
+						<ChevronDownIcon />
+					</Button>
+				</DropdownMenuTrigger>
+				<DropdownMenuContent align="end">
+					{props.dropdownUrl ? (
+						<DropdownMenuItem asChild>
+							<a href={props.dropdownUrl} className="cursor-pointer" target="_blank" rel="noopener noreferrer">
+								{props.dropdownText}
+							</a>
+						</DropdownMenuItem>
+					) : (
+						<DropdownMenuItem onClick={props.dropdownOnClick} className="cursor-pointer">{props.dropdownText}</DropdownMenuItem>
+					)}
+				</DropdownMenuContent>
+			</DropdownMenu>
+		</div>
+	)
+})

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

@@ -1,6 +1,8 @@
-import { memo, useState } from "react"
+import { t } from "@lingui/core/macro";
+import { Trans } from "@lingui/react/macro";
+import { memo, useMemo, useState } from "react"
 import { useStore } from "@nanostores/react"
-import { $alerts, $systems } from "@/lib/stores"
+import { $alerts } from "@/lib/stores"
 import {
 	Dialog,
 	DialogTrigger,
@@ -17,104 +19,114 @@ 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 { Trans, t } from "@lingui/macro"
 
 export default memo(function AlertsButton({ system }: { system: SystemRecord }) {
 	const alerts = useStore($alerts)
 	const [opened, setOpened] = useState(false)
 
-	const systemAlerts = alerts.filter((alert) => alert.system === system.id) as AlertRecord[]
-	const active = systemAlerts.length > 0
+	const hasAlert = alerts.some((alert) => alert.system === system.id)
 
-	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>
+	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]
 	)
 })
 
-function TheContent({
-	data: { system, alerts, systemAlerts },
-}: {
-	data: { system: SystemRecord; alerts: AlertRecord[]; systemAlerts: AlertRecord[] }
-}) {
+function AlertDialogContent({ system }: { system: SystemRecord }) {
+	const alerts = useStore($alerts)
 	const [overwriteExisting, setOverwriteExisting] = useState<boolean | "indeterminate">(false)
-	const systems = $systems.get()
 
-	const data = Object.keys(alertInfo).map((key) => {
-		const alert = alertInfo[key as keyof typeof alertInfo]
-		return {
-			key: key as keyof typeof alertInfo,
-			alert,
-			system,
+	// 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
 		}
-	})
+		return false
+	}) as AlertRecord[]
 
-	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>
-		</>
-	)
+	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="/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.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])
 }

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

@@ -1,18 +1,20 @@
-import { pb } from "@/lib/stores"
+import { t } from "@lingui/core/macro"
+import { Trans, Plural } from "@lingui/react/macro"
+import { $alerts, $systems, 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, useRef, useState } from "react"
+import { lazy, Suspense, useMemo, useState } from "react"
 import { toast } from "../ui/use-toast"
-import { RecordOptions } from "pocketbase"
-import { Trans, t, Plural } from "@lingui/macro"
+import { BatchService } from "pocketbase"
+import { getSemaphore } from "@henrygd/semaphore"
 
 interface AlertData {
 	checked?: boolean
 	val?: number
 	min?: number
 	updateAlert?: (checked: boolean, value: number, min: number) => void
-	key: keyof typeof alertInfo
+	name: keyof typeof alertInfo
 	alert: AlertInfo
 	system: SystemRecord
 }
@@ -35,7 +37,7 @@ export function SystemAlert({
 	systemAlerts: AlertRecord[]
 	data: AlertData
 }) {
-	const alert = systemAlerts.find((alert) => alert.name === data.key)
+	const alert = systemAlerts.find((alert) => alert.name === data.name)
 
 	data.updateAlert = async (checked: boolean, value: number, min: number) => {
 		try {
@@ -47,7 +49,7 @@ export function SystemAlert({
 				pb.collection("alerts").create({
 					system: system.id,
 					user: pb.authStore.record!.id,
-					name: data.key,
+					name: data.name,
 					value: value,
 					min: min,
 				})
@@ -66,175 +68,235 @@ export function SystemAlert({
 	return <AlertContent data={data} />
 }
 
-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,
-	})
-
+export const SystemAlertGlobal = ({ data, overwrite }: { data: AlertData; overwrite: boolean | "indeterminate" }) => {
 	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 { set, populatedSet } = systemsWithExistingAlerts.current
+		const sem = getSemaphore("alerts")
+		await sem.acquire()
+		try {
+			// if another update is waiting behind, don't start this one
+			if (sem.size() > 1) {
+				return
+			}
 
-		// if overwrite checked, make sure all alerts will be overwritten
-		if (overwrite) {
-			set.clear()
-		}
+			const recordData: Partial<AlertRecord> = {
+				value,
+				min,
+				triggered: false,
+			}
 
-		const recordData: Partial<AlertRecord> = {
-			value,
-			min,
-			triggered: false,
-		}
+			const batch = batchWrapper("alerts", 25)
+			const systems = $systems.get()
+			const currentAlerts = $alerts.get()
 
-		// we can only send 50 in one batch
-		let done = 0
-
-		while (done < systems.length) {
-			const batch = pb.createBatch()
-			let batchSize = 0
-
-			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
+			// 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)
 				}
-				// 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,
+			}
+
+			if (overwrite) {
+				existingAlertsSystems.clear()
+			}
+
+			const processSystem = async (system: SystemRecord): Promise<void> => {
+				const existingAlert = existingAlertsSystems.has(system.id)
+
+				if (!overwrite && existingAlert) {
+					return
 				}
 
-				// checked - make sure alert is created or updated
+				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) {
-					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)
+					// create new alert if checked and not existing
+					return batch.create({
+						system: system.id,
+						user: pb.authStore.record!.id,
+						name: data.name,
+						...recordData,
+					})
 				}
 			}
-			try {
-				batchSize && batch.send()
-			} catch (e) {
-				failedUpdateToast()
-			} finally {
-				done += 50
+
+			// 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) {
+					continue
+				}
+				if (sem.size() > 1) {
+					return
+				}
+				await processSystem(system)
 			}
+			await batch.send()
+		} finally {
+			sem.release()
 		}
-		systemsWithExistingAlerts.current.populatedSet = true
 	}
 
 	return <AlertContent data={data} />
 }
 
-function AlertContent({ data }: { data: AlertData }) {
-	const { key } = 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 hasSliders = !("single" in data.alert)
+	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 singleDescription = data.alert.singleDesc?.()
 
 	const [checked, setChecked] = useState(data.checked || false)
-	const [min, setMin] = useState(data.min || (hasSliders ? 10 : 0))
-	const [value, setValue] = useState(data.val || (hasSliders ? 80 : 0))
+	const [min, setMin] = useState(data.min || 10)
+	const [value, setValue] = useState(data.val || (singleDescription ? 0 : 80))
 
-	const showSliders = checked && hasSliders
-
-	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)
+	const Icon = alertInfo[name].icon
 
 	return (
 		<div className="rounded-lg border border-muted-foreground/15 hover:border-muted-foreground/20 transition-colors duration-100 group">
 			<label
-				htmlFor={`s${key}`}
+				htmlFor={`s${name}`}
 				className={cn("flex flex-row items-center justify-between gap-4 cursor-pointer p-4", {
-					"pb-0": showSliders,
+					"pb-0": checked,
 				})}
 			>
 				<div className="grid gap-1 select-none">
 					<p className="font-semibold flex gap-3 items-center">
 						<Icon className="h-4 w-4 opacity-85" /> {data.alert.name()}
 					</p>
-					{!showSliders && <span className="block text-sm text-muted-foreground">{data.alert.desc()}</span>}
+					{!checked && <span className="block text-sm text-muted-foreground">{data.alert.desc()}</span>}
 				</div>
 				<Switch
-					id={`s${key}`}
+					id={`s${name}`}
 					checked={checked}
-					onCheckedChange={(checked) => {
-						setChecked(checked)
-						updateAlert(checked)
+					onCheckedChange={(newChecked) => {
+						setChecked(newChecked)
+						data.updateAlert?.(newChecked, value, min)
 					}}
 				/>
 			</label>
-			{showSliders && (
+			{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" />}>
-						<div>
-							<p id={`v${key}`} 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${key}`}
-									defaultValue={[value]}
-									onValueCommit={(val) => (newValue.current = val[0]) && updateAlert()}
-									onValueChange={(val) => setValue(val[0])}
-									min={1}
-									max={alertInfo[key].max ?? 99}
-								/>
+						{!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>
-						<div>
-							<p id={`t${key}`} className="text-sm block h-8">
+						)}
+						<div className={cn(singleDescription && "col-span-full lowercase")}>
+							<p id={`t${name}`} 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" />
+									<Plural value={min} one="minute" other="minutes" />
 								</Trans>
 							</p>
 							<div className="flex gap-3">
 								<Slider
-									aria-labelledby={`v${key}`}
+									aria-labelledby={`v${name}`}
 									defaultValue={[min]}
-									onValueCommit={(val) => (newMin.current = val[0]) && updateAlert()}
-									onValueChange={(val) => setMin(val[0])}
+									onValueCommit={(min) => {
+										data.updateAlert?.(true, value, min[0])
+									}}
+									onValueChange={(val) => {
+										setMin(val[0])
+									}}
 									min={1}
 									max={60}
 								/>

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

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

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

@@ -1,5 +1,4 @@
 import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
-
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import {
 	useYAxisWidth,
@@ -12,8 +11,7 @@ import {
 } from "@/lib/utils"
 import { ChartData } from "@/types"
 import { memo } from "react"
-import { t } from "@lingui/macro"
-import { useLingui } from "@lingui/react"
+import { useLingui } from "@lingui/react/macro"
 
 export default memo(function DiskChart({
 	dataKey,
@@ -25,7 +23,7 @@ export default memo(function DiskChart({
 	chartData: ChartData
 }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
-	const { _ } = useLingui()
+	const { t } = useLingui()
 
 	// round to nearest GB
 	if (diskSize >= 100) {
@@ -76,7 +74,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,15 +1,13 @@
 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 { t } from "@lingui/macro"
-import { useLingui } from "@lingui/react"
+import { useLingui } from "@lingui/react/macro"
 
 export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
-	const { _ } = useLingui()
+	const { t } = useLingui()
 
 	const totalMem = toFixedFloat(chartData.systemStats.at(-1)?.stats.m ?? 0, 1)
 
@@ -62,7 +60,7 @@ export default memo(function MemChart({ chartData }: { chartData: ChartData }) {
 						}
 					/>
 					<Area
-						name={_(t`Used`)}
+						name={t`Used`}
 						order={3}
 						dataKey="stats.mu"
 						type="monotoneX"
@@ -86,7 +84,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,5 +1,6 @@
-import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
+import { t } from "@lingui/core/macro";
 
+import { Area, AreaChart, CartesianGrid, YAxis } from "recharts"
 import { ChartContainer, ChartTooltip, ChartTooltipContent, xAxis } from "@/components/ui/chart"
 import {
 	useYAxisWidth,
@@ -11,7 +12,6 @@ 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/command-palette.tsx

@@ -19,16 +19,15 @@ import {
 	CommandSeparator,
 	CommandShortcut,
 } from "@/components/ui/command"
-import { useEffect } from "react"
-import { useStore } from "@nanostores/react"
+import { memo, useEffect, useMemo } from "react"
 import { $systems } from "@/lib/stores"
-import { isAdmin } from "@/lib/utils"
-import { navigate } from "./router"
-import { Trans, t } from "@lingui/macro"
-
-export default function CommandPalette({ open, setOpen }: { open: boolean; setOpen: (open: boolean) => void }) {
-	const systems = useStore($systems)
+import { getHostDisplayValue, isAdmin, listen } from "@/lib/utils"
+import { $router, basePath, navigate } from "./router"
+import { Trans } from "@lingui/react/macro"
+import { t } from "@lingui/core/macro"
+import { getPagePath } from "@nanostores/router"
 
+export default memo(function CommandPalette({ open, setOpen }: { open: boolean; setOpen: (open: boolean) => void }) {
 	useEffect(() => {
 		const down = (e: KeyboardEvent) => {
 			if (e.key === "k" && (e.metaKey || e.ctrlKey)) {
@@ -36,162 +35,163 @@ export default function CommandPalette({ open, setOpen }: { open: boolean; setOp
 				setOpen(!open)
 			}
 		}
-
-		document.addEventListener("keydown", down)
-		return () => document.removeEventListener("keydown", down)
+		return listen(document, "keydown", down)
 	}, [open, setOpen])
 
-	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) => (
+	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`}>
 								<CommandItem
-									key={system.id}
+									keywords={["pocketbase"]}
 									onSelect={() => {
-										navigate(`/system/${encodeURIComponent(system.name)}`)
 										setOpen(false)
+										window.open("/_/", "_blank")
 									}}
 								>
-									<Server className="me-2 h-4 w-4" />
-									<span>{system.name}</span>
-									<CommandShortcut>{system.host}</CommandShortcut>
+									<UsersIcon className="me-2 h-4 w-4" />
+									<span>
+										<Trans>Users</Trans>
+									</span>
+									<CommandShortcut>
+										<Trans>Admin</Trans>
+									</CommandShortcut>
 								</CommandItem>
-							))}
-						</CommandGroup>
-						<CommandSeparator className="mb-1.5" />
-					</>
-				)}
-				<CommandGroup heading={t`Pages / Settings`}>
-					<CommandItem
-						keywords={["home"]}
-						onSelect={() => {
-							navigate("/")
-							setOpen(false)
-						}}
-					>
-						<LayoutDashboard className="me-2 h-4 w-4" />
-						<span>
-							<Trans>Dashboard</Trans>
-						</span>
-						<CommandShortcut>
-							<Trans>Page</Trans>
-						</CommandShortcut>
-					</CommandItem>
-					<CommandItem
-						onSelect={() => {
-							navigate("/settings/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("/settings/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>
-	)
-}
+								<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>
+		)
+	}, [open])
+})

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"
+import { useLingui } from "@lingui/react/macro"
 import { dynamicActivate } from "@/lib/i18n"
 
 export function LangToggle() {

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

@@ -1,3 +1,5 @@
+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"
@@ -7,14 +9,18 @@ import { $authenticated, pb } from "@/lib/stores"
 import * as v from "valibot"
 import { toast } from "../ui/use-toast"
 import { Dialog, DialogContent, DialogTrigger, DialogHeader, DialogTitle } from "@/components/ui/dialog"
-import { useCallback, useState } from "react"
-import { AuthMethodsList, OAuth2AuthConfig } from "pocketbase"
-import { Link } from "../router"
-import { Trans, t } from "@lingui/macro"
+import { useCallback, useEffect, useState } from "react"
+import { AuthMethodsList, AuthProviderInfo, OAuth2AuthConfig } from "pocketbase"
+import { $router, Link, prependBasePath } from "../router"
+import { getPagePath } from "@nanostores/router"
 
 const honeypot = v.literal("")
 const emailSchema = v.pipe(v.string(), v.email(t`Invalid email address.`))
-const passwordSchema = v.pipe(v.string(), v.minLength(8, t`Password must be at least 8 characters.`))
+const passwordSchema = v.pipe(
+	v.string(),
+	v.minLength(8, t`Password must be at least 8 characters.`),
+	v.maxBytes(72, t`Password must be less than 72 bytes.`)
+)
 
 const LoginSchema = v.looseObject({
 	name: honeypot,
@@ -113,12 +119,54 @@ export function UserAuthForm({
 		return null
 	}
 
-	const oauthEnabled = authMethods.oauth2.enabled && authMethods.oauth2.providers.length > 0
+	const authProviders = authMethods.oauth2.providers ?? []
+	const oauthEnabled = authMethods.oauth2.enabled && authProviders.length > 0
 	const passwordEnabled = authMethods.password.enabled
 
+	function loginWithOauth(provider: AuthProviderInfo, forcePopup = false) {
+		setIsOauthLoading(true)
+		const oAuthOpts: OAuth2AuthConfig = {
+			provider: provider.name,
+		}
+		// https://github.com/pocketbase/pocketbase/discussions/2429#discussioncomment-5943061
+		if (forcePopup || navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
+			const authWindow = window.open()
+			if (!authWindow) {
+				setIsOauthLoading(false)
+				toast({
+					title: t`Error`,
+					description: t`Please enable pop-ups for this site`,
+				})
+				return
+			}
+			oAuthOpts.urlCallback = (url) => {
+				authWindow.location.href = url
+			}
+		}
+		pb.collection("users")
+			.authWithOAuth2(oAuthOpts)
+			.then(() => {
+				$authenticated.set(pb.authStore.isValid)
+			})
+			.catch(showLoginFaliedToast)
+			.finally(() => {
+				setIsOauthLoading(false)
+			})
+	}
+
+	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)
+		}
+	}, [])
+
 	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">
@@ -132,12 +180,12 @@ export function UserAuthForm({
 									name="email"
 									required
 									placeholder="name@example.com"
-									type="email"
+									type="text"
 									autoCapitalize="none"
 									autoComplete="email"
 									autoCorrect="off"
 									disabled={isLoading || isOauthLoading}
-									className="ps-9"
+									className={cn("ps-9", errors?.email && "border-red-500")}
 								/>
 								{errors?.email && <p className="px-1 text-xs text-red-600">{errors.email}</p>}
 							</div>
@@ -154,7 +202,7 @@ export function UserAuthForm({
 									type="password"
 									autoComplete="current-password"
 									disabled={isLoading || isOauthLoading}
-									className="ps-9 placeholder:lowercase"
+									className={cn("ps-9", errors?.password && "border-red-500")}
 								/>
 								{errors?.password && <p className="px-1 text-xs text-red-600">{errors.password}</p>}
 							</div>
@@ -172,7 +220,7 @@ export function UserAuthForm({
 										type="password"
 										autoComplete="current-password"
 										disabled={isLoading || isOauthLoading}
-										className="ps-9 placeholder:lowercase"
+										className={cn("ps-9", errors?.password && "border-red-500")}
 									/>
 									{errors?.passwordConfirm && <p className="px-1 text-xs text-red-600">{errors.passwordConfirm}</p>}
 								</div>
@@ -194,21 +242,20 @@ 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
@@ -218,37 +265,7 @@ export function UserAuthForm({
 								"justify-self-center": !passwordEnabled,
 								"px-5": !passwordEnabled,
 							})}
-							onClick={() => {
-								setIsOauthLoading(true)
-								const oAuthOpts: OAuth2AuthConfig = {
-									provider: provider.name,
-								}
-								// https://github.com/pocketbase/pocketbase/discussions/2429#discussioncomment-5943061
-								if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
-									const authWindow = window.open()
-									if (!authWindow) {
-										setIsOauthLoading(false)
-										toast({
-											title: t`Error`,
-											description: t`Please enable pop-ups for this site`,
-											variant: "destructive",
-										})
-										return
-									}
-									oAuthOpts.urlCallback = (url) => {
-										authWindow.location.href = url
-									}
-								}
-								pb.collection("users")
-									.authWithOAuth2(oAuthOpts)
-									.then(() => {
-										$authenticated.set(pb.authStore.isValid)
-									})
-									.catch(showLoginFaliedToast)
-									.finally(() => {
-										setIsOauthLoading(false)
-									})
-							}}
+							onClick={() => loginWithOauth(provider)}
 							disabled={isLoading || isOauthLoading}
 						>
 							{isOauthLoading ? (
@@ -256,11 +273,11 @@ export function UserAuthForm({
 							) : (
 								<img
 									className="me-2 h-4 w-4 dark:brightness-0 dark:invert"
-									src={`/_/images/oauth2/${provider.name}.svg`}
+									src={prependBasePath(`/_/images/oauth2/${provider.name}.svg`)}
 									alt=""
-									onError={(e) => {
-										e.currentTarget.src = "/static/lock.svg"
-									}}
+									// onError={(e) => {
+									// 	e.currentTarget.src = "/static/lock.svg"
+									// }}
 								/>
 							)}
 							<span className="translate-y-[1px]">{provider.displayName}</span>
@@ -268,17 +285,16 @@ 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="/_/images/oauth2/github.svg" alt="" />
+							<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>
@@ -302,17 +318,16 @@ export function UserAuthForm({
 							</p>
 						</div>
 					</DialogContent>
-				</Dialog>
+                </Dialog>)
 			)}
-
-			{passwordEnabled && !isFirstRun && (
+            {passwordEnabled && !isFirstRun && (
 				<Link
-					href="/forgot-password"
+					href={getPagePath($router, "forgot_password")}
 					className="text-sm mx-auto hover:text-brand underline underline-offset-4 opacity-70 hover:opacity-100 transition-opacity"
 				>
 					<Trans>Forgot password?</Trans>
 				</Link>
 			)}
-		</div>
-	)
+        </div>
+    );
 }

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

@@ -1,3 +1,5 @@
+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"
@@ -8,7 +10,6 @@ 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({
@@ -83,7 +84,7 @@ export default function ForgotPassword() {
 						<Trans>Command line instructions</Trans>
 					</button>
 				</DialogTrigger>
-				<DialogContent className="max-w-[33em]">
+				<DialogContent className="max-w-[41em]">
 					<DialogHeader>
 						<DialogTitle>
 							<Trans>Command line instructions</Trans>
@@ -98,7 +99,10 @@ export default function ForgotPassword() {
 						<Trans>Then log into the backend and reset your user account password in the users table.</Trans>
 					</p>
 					<code className="bg-muted rounded-sm py-0.5 px-2.5 me-auto text-sm">
-						beszel admin update youremail@example.com newpassword
+						./beszel superuser upsert user@example.com password
+					</code>
+					<code className="bg-muted rounded-sm py-0.5 px-2.5 me-auto text-sm">
+						docker exec beszel /beszel superuser upsert name@example.com password
 					</code>
 				</DialogContent>
 			</Dialog>

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

@@ -1,3 +1,4 @@
+import { t } from "@lingui/core/macro";
 import { UserAuthForm } from "@/components/login/auth-form"
 import { Logo } from "../logo"
 import { useEffect, useMemo, useState } from "react"
@@ -6,7 +7,6 @@ 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 () {
@@ -34,7 +34,7 @@ export default function () {
 	const subtitle = useMemo(() => {
 		if (isFirstRun) {
 			return t`Please create an admin account`
-		} else if (page?.path === "/forgot-password") {
+		} else if (page?.route === "forgot_password") {
 			return t`Enter email address to reset password`
 		} else {
 			return t`Please sign in to your account`
@@ -59,7 +59,7 @@ export default function () {
 					</h1>
 					<p className="text-sm text-muted-foreground">{subtitle}</p>
 				</div>
-				{page?.path === "/forgot-password" ? (
+				{page?.route === "forgot_password" ? (
 					<ForgotPassword />
 				) : (
 					<UserAuthForm isFirstRun={isFirstRun} authMethods={authMethods} />

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

@@ -1,10 +1,11 @@
+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,3 +1,4 @@
+import { Trans } from "@lingui/react/macro";
 import { useState, lazy, Suspense } from "react"
 import { Button, buttonVariants } from "@/components/ui/button"
 import {
@@ -10,12 +11,12 @@ import {
 	UserIcon,
 	UsersIcon,
 } from "lucide-react"
-import { Link } from "./router"
+import { $router, basePath, Link, prependBasePath } from "./router"
 import { LangToggle } from "./lang-toggle"
 import { ModeToggle } from "./mode-toggle"
 import { Logo } from "./logo"
 import { pb } from "@/lib/stores"
-import { cn, isReadOnlyUser, isAdmin } from "@/lib/utils"
+import { cn, isReadOnlyUser, isAdmin, logOut } from "@/lib/utils"
 import {
 	DropdownMenu,
 	DropdownMenuTrigger,
@@ -26,7 +27,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"))
 
@@ -35,7 +36,7 @@ const isMac = navigator.platform.toUpperCase().indexOf("MAC") >= 0
 export default function Navbar() {
 	return (
 		<div className="flex items-center h-14 md:h-16 bg-card px-4 pe-3 sm:px-6 border border-border/60 bt-0 rounded-md my-4">
-			<Link href="/" aria-label="Home" className="p-2 ps-0 me-3">
+			<Link href={basePath} aria-label="Home" className="p-2 ps-0 me-3">
 				<Logo className="h-[1.1rem] md:h-5 fill-foreground" />
 			</Link>
 			<SearchButton />
@@ -44,7 +45,7 @@ export default function Navbar() {
 				<LangToggle />
 				<ModeToggle />
 				<Link
-					href="/settings/general"
+					href={getPagePath($router, "settings", { name: "general" })}
 					aria-label="Settings"
 					className={cn("", buttonVariants({ variant: "ghost", size: "icon" }))}
 				>
@@ -63,7 +64,7 @@ export default function Navbar() {
 							{isAdmin() && (
 								<>
 									<DropdownMenuItem asChild>
-										<a href="/_/" target="_blank">
+										<a href={prependBasePath("/_/")} target="_blank">
 											<UsersIcon className="me-2.5 h-4 w-4" />
 											<span>
 												<Trans>Users</Trans>
@@ -71,7 +72,7 @@ export default function Navbar() {
 										</a>
 									</DropdownMenuItem>
 									<DropdownMenuItem asChild>
-										<a href="/_/#/collections?collectionId=2hz5ncl8tizk5nx" target="_blank">
+										<a href={prependBasePath("/_/#/collections?collection=systems")} target="_blank">
 											<ServerIcon className="me-2.5 h-4 w-4" />
 											<span>
 												<Trans>Systems</Trans>
@@ -79,7 +80,7 @@ export default function Navbar() {
 										</a>
 									</DropdownMenuItem>
 									<DropdownMenuItem asChild>
-										<a href="/_/#/logs" target="_blank">
+										<a href={prependBasePath("/_/#/logs")} target="_blank">
 											<LogsIcon className="me-2.5 h-4 w-4" />
 											<span>
 												<Trans>Logs</Trans>
@@ -87,7 +88,7 @@ export default function Navbar() {
 										</a>
 									</DropdownMenuItem>
 									<DropdownMenuItem asChild>
-										<a href="/_/#/settings/backups" target="_blank">
+										<a href={prependBasePath("/_/#/settings/backups")} target="_blank">
 											<DatabaseBackupIcon className="me-2.5 h-4 w-4" />
 											<span>
 												<Trans>Backups</Trans>
@@ -98,7 +99,7 @@ export default function Navbar() {
 								</>
 							)}
 						</DropdownMenuGroup>
-						<DropdownMenuItem onSelect={() => pb.authStore.clear()}>
+						<DropdownMenuItem onSelect={logOut}>
 							<LogOutIcon className="me-2.5 h-4 w-4" />
 							<span>
 								<Trans>Log Out</Trans>

beszel/site/src/components/router.tsx

@@ -1,16 +1,36 @@
 import { createRouter } from "@nanostores/router"
 
-export const $router = createRouter(
-	{
-		home: "/",
-		server: "/system/:name",
-		settings: "/settings/:name?",
-		forgot_password: "/forgot-password",
-	},
-	{ links: false }
-)
+const routes = {
+	home: "/",
+	system: `/system/:name`,
+	settings: `/settings/:name?`,
+	forgot_password: `/forgot-password`,
+} as const
 
-/** Navigate to url using router */
+/**
+ * The base path of the application.
+ * This is used to prepend the base path to all routes.
+ */
+export const basePath = globalThis.BESZEL.BASE_PATH || ""
+
+/**
+ * Prepends the base path to the given path.
+ * @param path The path to prepend the base path to.
+ * @returns The path with the base path prepended.
+ */
+export const prependBasePath = (path: string) => (basePath + path).replaceAll("//", "/")
+
+// prepend base path to routes
+for (const route in routes) {
+	// @ts-ignore need as const above to get nanostores to parse types properly
+	routes[route] = prependBasePath(routes[route])
+}
+
+export const $router = createRouter(routes, { links: false })
+
+/** Navigate to url using router
+ *  Base path is automatically prepended if serving from subpath
+ */
 export const navigate = (urlString: string) => {
 	$router.open(urlString)
 }

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

@@ -1,23 +1,24 @@
-import { Suspense, lazy, useEffect, useMemo } from "react"
+import { Suspense, lazy, memo, useEffect, useMemo } from "react"
 import { Card, CardContent, CardHeader, CardTitle } from "../ui/card"
-import { $alerts, $hubVersion, $systems, pb } from "@/lib/stores"
+import { $alerts, $systems, pb } from "@/lib/stores"
 import { useStore } from "@nanostores/react"
 import { GithubIcon } from "lucide-react"
 import { Separator } from "../ui/separator"
 import { alertInfo, updateRecordList, updateSystemList } from "@/lib/utils"
 import { AlertRecord, SystemRecord } from "@/types"
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
-import { Link } from "../router"
-import { Plural, t, Trans } from "@lingui/macro"
+import { $router, Link } from "../router"
+import { Plural, Trans, useLingui } from "@lingui/react/macro"
+import { getPagePath } from "@nanostores/router"
 
 const SystemsTable = lazy(() => import("../systems-table/systems-table"))
 
-export default function Home() {
-	const hubVersion = useStore($hubVersion)
-
+export const Home = memo(() => {
 	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
@@ -25,14 +26,17 @@ export default function Home() {
 				return false
 			}
 			alert.sysname = systems.find((system) => system.id === alert.system)?.name
+			alertsKey += alert.id
 			return true
 		})
 		return activeAlerts
-	}, [alerts])
+	}, [systems, alerts])
 
 	useEffect(() => {
 		document.title = t`Dashboard` + " / Beszel"
+	}, [t])
 
+	useEffect(() => {
 		// make sure we have the latest list of systems
 		updateSystemList()
 
@@ -40,7 +44,6 @@ export default function Home() {
 		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)
 		})
@@ -50,56 +53,15 @@ export default function Home() {
 		}
 	}, [])
 
-	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={`/system/${encodeURIComponent(alert.sysname!)}`}
-												className="absolute inset-0 w-full h-full"
-												aria-label="View system"
-											></Link>
-										</Alert>
-									)
-								})}
-							</div>
-						)}
-					</CardContent>
-				</Card>
-			)}
-			<Suspense>
-				<SystemsTable />
-			</Suspense>
+	return useMemo(
+		() => (
+			<>
+				{/* show active alerts */}
+				{activeAlerts.length > 0 && <ActiveAlerts key={activeAlerts.length} activeAlerts={activeAlerts} />}
+				<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"
@@ -114,10 +76,56 @@ export default function Home() {
 						target="_blank"
 						className="text-muted-foreground hover:text-foreground duration-75"
 					>
-						Beszel {hubVersion}
+						Beszel {globalThis.BESZEL.HUB_VERSION}
 					</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,3 +1,5 @@
+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"
@@ -10,7 +12,6 @@ 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,3 +1,4 @@
+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"
@@ -7,10 +8,9 @@ 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"
+import { useLingui } from "@lingui/react/macro"
 // import { setLang } from "@/lib/i18n"
 
 export default function SettingsProfilePage({ userSettings }: { userSettings: UserSettings }) {

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

@@ -1,10 +1,12 @@
+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"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card.tsx"
 import { useStore } from "@nanostores/react"
 import { $router } from "@/components/router.tsx"
-import { redirectPage } from "@nanostores/router"
+import { getPagePath, redirectPage } from "@nanostores/router"
 import { BellIcon, FileSlidersIcon, SettingsIcon } from "lucide-react"
 import { $userSettings, pb } from "@/lib/stores.ts"
 import { toast } from "@/components/ui/use-toast.ts"
@@ -12,8 +14,7 @@ import { UserSettings } from "@/types.js"
 import General from "./general.tsx"
 import Notifications from "./notifications.tsx"
 import ConfigYaml from "./config-yaml.tsx"
-import { Trans, t } from "@lingui/macro"
-import { useLingui } from "@lingui/react"
+import { useLingui } from "@lingui/react/macro"
 
 export async function saveSettings(newSettings: Partial<UserSettings>) {
 	try {
@@ -44,22 +45,22 @@ export async function saveSettings(newSettings: Partial<UserSettings>) {
 }
 
 export default function SettingsLayout() {
-	const { _ } = useLingui()
+	const { t } = useLingui()
 
 	const sidebarNavItems = [
 		{
-			title: _(t({ message: `General`, comment: "Context: General settings" })),
-			href: "/settings/general",
+			title: t({ message: `General`, comment: "Context: General settings" }),
+			href: getPagePath($router, "settings", { name: "general" }),
 			icon: SettingsIcon,
 		},
 		{
 			title: t`Notifications`,
-			href: "/settings/notifications",
+			href: getPagePath($router, "settings", { name: "notifications" }),
 			icon: BellIcon,
 		},
 		{
 			title: t`YAML Config`,
-			href: "/settings/config",
+			href: getPagePath($router, "settings", { name: "config" }),
 			icon: FileSlidersIcon,
 			admin: true,
 		},
@@ -69,8 +70,8 @@ export default function SettingsLayout() {
 
 	useEffect(() => {
 		document.title = t`Settings` + " / Beszel"
-		// redirect to account page if no page is specified
-		if (page?.path === "/settings") {
+		// @ts-ignore redirect to account page if no page is specified
+		if (!page?.params?.name) {
 			redirectPage($router, "settings", { name: "general" })
 		}
 	}, [])

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

@@ -1,3 +1,5 @@
+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"
@@ -12,7 +14,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 {
 	url: string
@@ -94,7 +96,7 @@ const SettingsNotificationsPage = ({ userSettings }: { userSettings: UserSetting
 							<p className="text-sm text-muted-foreground leading-relaxed">
 								<Trans>
 									Please{" "}
-									<a href="/_/#/settings/mail" className="link" target="_blank">
+									<a href={prependBasePath("/_/#/settings/mail")} className="link" target="_blank">
 										configure an SMTP server
 									</a>{" "}
 									to ensure alerts are delivered.

beszel/site/src/components/routes/settings/sidebar-nav.tsx

@@ -22,7 +22,7 @@ export function SidebarNav({ className, items, ...props }: SidebarNavProps) {
 		<>
 			{/* Mobile View */}
 			<div className="md:hidden">
-				<Select onValueChange={(value: string) => navigate(value)} value={page?.path}>
+				<Select onValueChange={navigate} value={page?.path}>
 					<SelectTrigger className="w-full my-3.5">
 						<SelectValue placeholder="Select page" />
 					</SelectTrigger>

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

@@ -1,12 +1,23 @@
-import { $systems, pb, $chartTime, $containerFilter, $userSettings, $direction } from "@/lib/stores"
+import { t } from "@lingui/core/macro"
+import { Plural, Trans } from "@lingui/react/macro"
+import { $systems, pb, $chartTime, $containerFilter, $userSettings, $direction, $maxValues } from "@/lib/stores"
 import { ChartData, ChartTimes, ContainerStatsRecord, GPUData, SystemRecord, SystemStatsRecord } from "@/types"
-import React, { lazy, useCallback, useEffect, useMemo, useRef, useState } from "react"
+import React, { lazy, memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { Card, CardHeader, CardTitle, CardDescription } from "../ui/card"
 import { useStore } from "@nanostores/react"
 import Spinner from "../spinner"
 import { ClockArrowUp, CpuIcon, GlobeIcon, LayoutGridIcon, MonitorIcon, XIcon } from "lucide-react"
 import ChartTimeSelect from "../charts/chart-time-select"
-import { chartTimeData, cn, getPbTimestamp, getSizeAndUnit, toFixedFloat, useLocalStorage } from "@/lib/utils"
+import {
+	chartTimeData,
+	cn,
+	getHostDisplayValue,
+	getPbTimestamp,
+	getSizeAndUnit,
+	listen,
+	toFixedFloat,
+	useLocalStorage,
+} from "@/lib/utils"
 import { Separator } from "../ui/separator"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip"
 import { Button } from "../ui/button"
@@ -15,8 +26,9 @@ 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 { timeTicks } from "d3-time"
-import { Plural, Trans, t } from "@lingui/macro"
-import { useLingui } from "@lingui/react"
+import { useLingui } from "@lingui/react/macro"
+import { $router, navigate } from "../router"
+import { getPagePath } from "@nanostores/router"
 
 const AreaChartDefault = lazy(() => import("../charts/area-chart"))
 const ContainerChart = lazy(() => import("../charts/container-chart"))
@@ -95,18 +107,16 @@ function dockerOrPodman(str: string, system: SystemRecord) {
 
 export default function SystemDetail({ name }: { name: string }) {
 	const direction = useStore($direction)
-	const { _ } = useLingui()
+	const { t } = useLingui()
 	const systems = useStore($systems)
 	const chartTime = useStore($chartTime)
-	/** Max CPU toggle value */
-	const cpuMaxStore = useState(false)
-	const bandwidthMaxStore = useState(false)
-	const diskIoMaxStore = useState(false)
+	const maxValues = useStore($maxValues)
 	const [grid, setGrid] = useLocalStorage("grid", true)
 	const [system, setSystem] = useState({} as SystemRecord)
 	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)
@@ -115,15 +125,14 @@ export default function SystemDetail({ name }: { name: string }) {
 	useEffect(() => {
 		document.title = `${name} / Beszel`
 		return () => {
-			$chartTime.set($userSettings.get().chartTime)
-			// resetCharts()
+			if (!persistChartTime.current) {
+				$chartTime.set($userSettings.get().chartTime)
+			}
+			persistChartTime.current = false
 			setSystemStats([])
 			setContainerData([])
 			setContainerFilterBar(null)
 			$containerFilter.set("")
-			cpuMaxStore[1](false)
-			bandwidthMaxStore[1](false)
-			diskIoMaxStore[1](false)
 		}
 	}, [name])
 
@@ -250,7 +259,7 @@ export default function SystemDetail({ name }: { name: string }) {
 			uptime = <Plural value={Math.trunc(system.info?.u / 86400)} one="# day" other="# days" />
 		}
 		return [
-			{ value: system.host, Icon: GlobeIcon },
+			{ value: getHostDisplayValue(system), Icon: GlobeIcon },
 			{
 				value: system.info.h,
 				Icon: MonitorIcon,
@@ -258,7 +267,7 @@ 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` },
+			{ value: uptime, Icon: ClockArrowUp, label: t`Uptime`, hide: !system.info.u },
 			{ 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` : ""})`,
@@ -287,13 +296,54 @@ 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) {
+				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
 	}
 
+	// select field for switching between avg and max values
+	const maxValSelect = isLongerChart ? <SelectAvgMax max={maxValues} /> : null
+
 	// if no data, show empty message
 	const dataEmpty = !chartLoading && chartData.systemStats.length === 0
-	const hasGpuData = Object.keys(systemStats.at(-1)?.stats.g ?? {}).length > 0
+	const lastGpuVals = Object.values(systemStats.at(-1)?.stats.g ?? {})
+	const hasGpuData = lastGpuVals.length > 0
+	const hasGpuPowerData = lastGpuVals.some((gpu) => gpu.p !== undefined)
+
+	let translatedStatus: string = system.status
+	if (system.status === "up") {
+		translatedStatus = t({ message: "Up", comment: "Context: System is up" })
+	} else if (system.status === "down") {
+		translatedStatus = t({ message: "Down", comment: "Context: System is down" })
+	}
 
 	return (
 		<>
@@ -321,7 +371,7 @@ export default function SystemDetail({ name }: { name: string }) {
 											})}
 										></span>
 									</span>
-									{system.status}
+									{translatedStatus}
 								</div>
 								{systemInfo.map(({ value, label, Icon, hide }, i) => {
 									if (hide || !value) {
@@ -381,11 +431,11 @@ export default function SystemDetail({ name }: { name: string }) {
 					<ChartCard
 						empty={dataEmpty}
 						grid={grid}
-						title={_(t`CPU Usage`)}
+						title={t`CPU Usage`}
 						description={t`Average system-wide CPU utilization`}
-						cornerEl={isLongerChart ? <SelectAvgMax store={cpuMaxStore} /> : null}
+						cornerEl={maxValSelect}
 					>
-						<AreaChartDefault chartData={chartData} chartName="CPU Usage" maxToggled={cpuMaxStore[0]} unit="%" />
+						<AreaChartDefault chartData={chartData} chartName="CPU Usage" maxToggled={maxValues} unit="%" />
 					</ChartCard>
 
 					{containerFilterBar && (
@@ -430,19 +480,19 @@ export default function SystemDetail({ name }: { name: string }) {
 						grid={grid}
 						title={t`Disk I/O`}
 						description={t`Throughput of root filesystem`}
-						cornerEl={isLongerChart ? <SelectAvgMax store={diskIoMaxStore} /> : null}
+						cornerEl={maxValSelect}
 					>
-						<AreaChartDefault chartData={chartData} maxToggled={diskIoMaxStore[0]} chartName="dio" />
+						<AreaChartDefault chartData={chartData} chartName="dio" maxToggled={maxValues} />
 					</ChartCard>
 
 					<ChartCard
 						empty={dataEmpty}
 						grid={grid}
 						title={t`Bandwidth`}
-						cornerEl={isLongerChart ? <SelectAvgMax store={bandwidthMaxStore} /> : null}
+						cornerEl={maxValSelect}
 						description={t`Network traffic of public interfaces`}
 					>
-						<AreaChartDefault chartData={chartData} maxToggled={bandwidthMaxStore[0]} chartName="bw" />
+						<AreaChartDefault chartData={chartData} chartName="bw" maxToggled={maxValues} />
 					</ChartCard>
 
 					{containerFilterBar && containerData.length > 0 && (
@@ -489,7 +539,7 @@ export default function SystemDetail({ name }: { name: string }) {
 					)}
 
 					{/* GPU power draw chart */}
-					{hasGpuData && (
+					{hasGpuPowerData && (
 						<ChartCard
 							empty={dataEmpty}
 							grid={grid}
@@ -506,6 +556,10 @@ 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
@@ -525,12 +579,9 @@ export default function SystemDetail({ name }: { name: string }) {
 										<AreaChartDefault
 											chartData={chartData}
 											chartName={`g.${id}.mu`}
-											unit=" MB"
 											max={gpu.mt}
-											tickFormatter={(value) => {
-												const { v, u } = getSizeAndUnit(value, false)
-												return toFixedFloat(v, 1) + u
-											}}
+											tickFormatter={sizeFormatter}
+											contentFormatter={(value) => sizeFormatter(value, 2)}
 										/>
 									</ChartCard>
 								</div>
@@ -562,13 +613,9 @@ export default function SystemDetail({ name }: { name: string }) {
 										grid={grid}
 										title={`${extraFsName} I/O`}
 										description={t`Throughput of ${extraFsName}`}
-										cornerEl={isLongerChart ? <SelectAvgMax store={diskIoMaxStore} /> : null}
+										cornerEl={maxValSelect}
 									>
-										<AreaChartDefault
-											chartData={chartData}
-											maxToggled={diskIoMaxStore[0]}
-											chartName={`efs.${extraFsName}`}
-										/>
+										<AreaChartDefault chartData={chartData} chartName={`efs.${extraFsName}`} maxToggled={maxValues} />
 									</ChartCard>
 								</div>
 							)
@@ -585,7 +632,7 @@ export default function SystemDetail({ name }: { name: string }) {
 
 function ContainerFilterBar() {
 	const containerFilter = useStore($containerFilter)
-	const { _ } = useLingui()
+	const { t } = useLingui()
 
 	const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
 		$containerFilter.set(e.target.value)
@@ -593,7 +640,7 @@ function ContainerFilterBar() {
 
 	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"
@@ -610,12 +657,10 @@ function ContainerFilterBar() {
 	)
 }
 
-function SelectAvgMax({ store }: { store: [boolean, React.Dispatch<React.SetStateAction<boolean>>] }) {
-	const [max, setMax] = store
+const SelectAvgMax = memo(({ max }: { max: boolean }) => {
 	const Icon = max ? ChartMax : ChartAverage
-
 	return (
-		<Select value={max ? "max" : "avg"} onValueChange={(e) => setMax(e === "max")}>
+		<Select value={max ? "max" : "avg"} onValueChange={(e) => $maxValues.set(e === "max")}>
 			<SelectTrigger className="relative ps-10 pe-5">
 				<Icon className="h-4 w-4 absolute start-4 top-1/2 -translate-y-1/2 opacity-85" />
 				<SelectValue />
@@ -630,7 +675,7 @@ function SelectAvgMax({ store }: { store: [boolean, React.Dispatch<React.SetStat
 			</SelectContent>
 		</Select>
 	)
-}
+})
 
 function ChartCard({
 	title,

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

@@ -9,7 +9,9 @@ import {
 	VisibilityState,
 	getCoreRowModel,
 	useReactTable,
-	Column,
+	HeaderContext,
+	Row,
+	Table as TableType,
 } from "@tanstack/react-table"
 
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
@@ -37,7 +39,6 @@ import {
 	AlertDialogFooter,
 	AlertDialogHeader,
 	AlertDialogTitle,
-	AlertDialogTrigger,
 } from "@/components/ui/alert-dialog"
 
 import { SystemRecord } from "@/types"
@@ -59,32 +60,38 @@ import {
 	ArrowUpIcon,
 	Settings2Icon,
 	EyeIcon,
+	PenBoxIcon,
 } from "lucide-react"
-import { useEffect, useMemo, useState } from "react"
-import { $hubVersion, $systems, pb } from "@/lib/stores"
+import { memo, useEffect, useMemo, useRef, useState } from "react"
+import { $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 { Link, navigate } from "../router"
-import { EthernetIcon } from "../ui/icons"
-import { Trans, t } from "@lingui/macro"
-import { useLingui } from "@lingui/react"
+import { $router, Link, navigate } from "../router"
+import { EthernetIcon, GpuIcon, ThermometerIcon } from "../ui/icons"
+import { useLingui, Trans } from "@lingui/react/macro"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/card"
 import { Input } from "../ui/input"
 import { ClassValue } from "clsx"
+import { getPagePath } from "@nanostores/router"
+import { SystemDialog } from "../add-system"
+import { Dialog } from "../ui/dialog"
 
 type ViewMode = "table" | "grid"
 
 function CellFormatter(info: CellContext<SystemRecord, unknown>) {
-	const val = info.getValue() as number
+	const val = (info.getValue() as number) || 0
 	return (
 		<div className="flex gap-2 items-center tabular-nums tracking-tight">
-			<span className="min-w-[3.5em]">{decimalString(val, 1)}%</span>
+			<span className="min-w-[3.3em]">{decimalString(val, 1)}%</span>
 			<span className="grow min-w-10 block bg-muted h-[1em] relative rounded-sm overflow-hidden">
 				<span
 					className={cn(
 						"absolute inset-0 w-full h-full origin-left",
-						(val < 65 && "bg-green-500") || (val < 90 && "bg-yellow-500") || "bg-red-600"
+						(info.row.original.status !== "up" && "bg-primary/30") ||
+							(val < 65 && "bg-green-500") ||
+							(val < 90 && "bg-yellow-500") ||
+							"bg-red-600"
 					)}
 					style={{
 						transform: `scalex(${val / 100})`,
@@ -95,47 +102,68 @@ function CellFormatter(info: CellContext<SystemRecord, unknown>) {
 	)
 }
 
-function sortableHeader(column: Column<SystemRecord, unknown>, hideSortIcon = false) {
+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")}
 		>
-			{/* @ts-ignore */}
-			{column.columnDef?.icon && <column.columnDef.icon className="me-2 size-4" />}
-			{column.id}
-			{!hideSortIcon && <ArrowUpDownIcon className="ms-2 size-4" />}
+			{Icon && <Icon className="me-2 size-4" />}
+			{name()}
+			{hideSort || <ArrowUpDownIcon className="ms-2 size-4" />}
 		</Button>
 	)
 }
 
 export default function SystemsTable() {
 	const data = useStore($systems)
-	const hubVersion = useStore($hubVersion)
+	const { i18n, t } = useLingui()
 	const [filter, setFilter] = useState<string>()
-	const [sorting, setSorting] = useState<SortingState>([{ id: t`System`, desc: false }])
+	const [sorting, setSorting] = useState<SortingState>([{ id: "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 { i18n } = useLingui()
+
+	const locale = i18n.locale
 
 	useEffect(() => {
 		if (filter !== undefined) {
-			table.getColumn(t`System`)?.setFilterValue(filter)
+			table.getColumn("system")?.setFilterValue(filter)
 		}
 	}, [filter])
 
-	const columns = useMemo(() => {
+	const columnDefs = useMemo(() => {
+		const statusTranslations = {
+			up: () => t`Up`.toLowerCase(),
+			down: () => t`Down`.toLowerCase(),
+			paused: () => t`Paused`.toLowerCase(),
+		}
 		return [
 			{
 				// size: 200,
 				size: 200,
 				minSize: 0,
 				accessorKey: "name",
-				id: t`System`,
+				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
+				},
 				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} />
@@ -150,39 +178,53 @@ export default function SystemsTable() {
 						</Button>
 					</span>
 				),
-				header: ({ column }) => sortableHeader(column),
+				header: sortableHeader,
 			},
 			{
 				accessorKey: "info.cpu",
-				id: t`CPU`,
+				id: "cpu",
+				name: () => t`CPU`,
 				invertSorting: true,
 				cell: CellFormatter,
-				icon: CpuIcon,
-				header: ({ column }) => sortableHeader(column),
+				Icon: CpuIcon,
+				header: sortableHeader,
 			},
 			{
 				accessorKey: "info.mp",
-				id: t`Memory`,
+				id: "memory",
+				name: () => t`Memory`,
 				invertSorting: true,
 				cell: CellFormatter,
-				icon: MemoryStickIcon,
-				header: ({ column }) => sortableHeader(column),
+				Icon: MemoryStickIcon,
+				header: sortableHeader,
 			},
 			{
 				accessorKey: "info.dp",
-				id: t`Disk`,
+				id: "disk",
+				name: () => t`Disk`,
 				invertSorting: true,
 				cell: CellFormatter,
-				icon: HardDriveIcon,
-				header: ({ column }) => sortableHeader(column),
+				Icon: HardDriveIcon,
+				header: sortableHeader,
+			},
+			{
+				accessorFn: (originalRow) => originalRow.info.g,
+				id: "gpu",
+				name: () => "GPU",
+				invertSorting: true,
+				sortUndefined: -1,
+				cell: CellFormatter,
+				Icon: GpuIcon,
+				header: sortableHeader,
 			},
 			{
 				accessorFn: (originalRow) => originalRow.info.b || 0,
-				id: t`Net`,
+				id: "net",
+				name: () => t`Net`,
 				invertSorting: true,
-				size: 115,
-				icon: EthernetIcon,
-				header: ({ column }) => sortableHeader(column),
+				size: 50,
+				Icon: EthernetIcon,
+				header: sortableHeader,
 				cell(info) {
 					const val = info.getValue() as number
 					return (
@@ -197,17 +239,46 @@ export default function SystemsTable() {
 				},
 			},
 			{
-				accessorKey: "info.v",
-				id: t`Agent`,
+				accessorFn: (originalRow) => originalRow.info.dt,
+				id: "temp",
+				name: () => t({ message: "Temp", comment: "Temperature label in systems table" }),
 				invertSorting: true,
+				sortUndefined: -1,
 				size: 50,
-				icon: WifiIcon,
-				header: ({ column }) => sortableHeader(column, true),
+				hideSort: true,
+				Icon: ThermometerIcon,
+				header: sortableHeader,
 				cell(info) {
-					const version = info.getValue() as string
-					if (!version || !hubVersion) {
+					const val = info.getValue() as number
+					if (!val) {
 						return null
 					}
+					return (
+						<span
+							className={cn("tabular-nums whitespace-nowrap", {
+								"ps-1.5": viewMode === "table",
+							})}
+						>
+							{decimalString(val)} °C
+						</span>
+					)
+				},
+			},
+			{
+				accessorKey: "info.v",
+				id: "agent",
+				name: () => t`Agent`,
+				invertSorting: true,
+				size: 50,
+				Icon: WifiIcon,
+				hideSort: true,
+				header: sortableHeader,
+				cell(info) {
+					const version = info.getValue() as string
+					if (!version) {
+						return null
+					}
+					const system = info.row.original
 					return (
 						<span
 							className={cn("flex gap-2 items-center md:pe-5 tabular-nums", {
@@ -215,8 +286,12 @@ export default function SystemsTable() {
 							})}
 						>
 							<IndicatorDot
-								system={info.row.original}
-								className={version === hubVersion ? "bg-green-500" : "bg-yellow-500"}
+								system={system}
+								className={
+									(system.status !== "up" && "bg-primary/30") ||
+									(version === globalThis.BESZEL.HUB_VERSION && "bg-green-500") ||
+									"bg-yellow-500"
+								}
 							/>
 							<span>{info.getValue() as string}</span>
 						</span>
@@ -224,8 +299,10 @@ export default function SystemsTable() {
 				},
 			},
 			{
-				id: t({ message: "Actions", comment: "Table column" }),
-				size: 120,
+				id: "actions",
+				// @ts-ignore
+				name: () => t({ message: "Actions", comment: "Table column" }),
+				size: 50,
 				cell: ({ row }) => (
 					<div className="flex justify-end items-center gap-1">
 						<AlertsButton system={row.original} />
@@ -234,11 +311,11 @@ export default function SystemsTable() {
 				),
 			},
 		] as ColumnDef<SystemRecord>[]
-	}, [hubVersion, i18n.locale])
+	}, [])
 
 	const table = useReactTable({
 		data,
-		columns,
+		columns: columnDefs,
 		getCoreRowModel: getCoreRowModel(),
 		onSortingChange: setSorting,
 		getSortedRowModel: getSortedRowModel(),
@@ -252,13 +329,17 @@ export default function SystemsTable() {
 		},
 		defaultColumn: {
 			minSize: 0,
-			size: Number.MAX_SAFE_INTEGER,
-			maxSize: Number.MAX_SAFE_INTEGER,
+			size: 900,
+			maxSize: 900,
 		},
 	})
 
-	return (
-		<Card>
+	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 (
 			<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">
@@ -309,8 +390,8 @@ export default function SystemsTable() {
 										</DropdownMenuLabel>
 										<DropdownMenuSeparator />
 										<div className="px-1 pb-1">
-											{table.getAllColumns().map((column) => {
-												if (column.id === t`Actions` || !column.getCanSort()) return null
+											{columns.map((column) => {
+												if (!column.getCanSort()) return null
 												let Icon = <span className="w-6"></span>
 												// if current sort column, show sort direction
 												if (sorting[0]?.id === column.id) {
@@ -329,7 +410,8 @@ export default function SystemsTable() {
 														key={column.id}
 													>
 														{Icon}
-														{column.id}
+														{/* @ts-ignore */}
+														{column.columnDef.name()}
 													</DropdownMenuItem>
 												)
 											})}
@@ -343,8 +425,7 @@ export default function SystemsTable() {
 										</DropdownMenuLabel>
 										<DropdownMenuSeparator />
 										<div className="px-1.5 pb-1">
-											{table
-												.getAllColumns()
+											{columns
 												.filter((column) => column.getCanHide())
 												.map((column) => {
 													return (
@@ -354,7 +435,8 @@ export default function SystemsTable() {
 															checked={column.getIsVisible()}
 															onCheckedChange={(value) => column.toggleVisibility(!!value)}
 														>
-															{column.id}
+															{/* @ts-ignore */}
+															{column.columnDef.name()}
 														</DropdownMenuCheckboxItem>
 													)
 												})}
@@ -366,128 +448,24 @@ 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">
-						<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>
-								{table.getRowModel().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(`/system/${encodeURIComponent(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>
+						<AllSystemsTable table={table} rows={rows} colLength={visibleColumns.length} />
 					</div>
 				) : (
 					// grid layout
 					<div className="grid gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3">
-						{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={`/system/${encodeURIComponent(row.original.name)}`}
-											className="inset-0 absolute w-full h-full"
-										>
-											<span className="sr-only">{row.original.name}</span>
-										</Link>
-									</Card>
-								)
+						{rows?.length ? (
+							rows.map((row) => {
+								return <SystemCard key={row.original.id} row={row} table={table} colLength={visibleColumns.length} />
 							})
 						) : (
 							<div className="col-span-full text-center py-8">
@@ -501,6 +479,247 @@ 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",
@@ -515,79 +734,3 @@ function IndicatorDot({ system, className }: { system: SystemRecord; className?:
 		/>
 	)
 }
-
-function ActionsButton({ system }: { system: SystemRecord }) {
-	// const [opened, setOpened] = useState(false)
-	const { id, status, host, name } = system
-	return (
-		<AlertDialog>
-			<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">
-					<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")} />
-					<AlertDialogTrigger asChild>
-						<DropdownMenuItem className={cn(isReadOnlyUser() && "hidden")}>
-							<Trash2Icon className="me-2.5 size-4" />
-							<Trans>Delete</Trans>
-						</DropdownMenuItem>
-					</AlertDialogTrigger>
-				</DropdownMenuContent>
-			</DropdownMenu>
-			<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/ui/icons.tsx

@@ -63,3 +63,13 @@ export function ThermometerIcon(props: SVGProps<SVGSVGElement>) {
 		</svg>
 	)
 }
+
+// Huge icons (MIT)
+export function GpuIcon(props: SVGProps<SVGSVGElement>) {
+	return (
+		<svg viewBox="0 0 24 24" {...props} stroke="currentColor" fill="none" strokeWidth="2">
+			<path d="M4 21V4.1a1.5 1.5 0 0 0-1.1-1L2 3m2 2h13c2.4 0 3.5 0 4.3.7s.7 2 .7 4.3v4.5c0 2.4 0 3.5-.7 4.3-.8.7-2 .7-4.3.7h-4.9a1.8 1.8 0 0 1-1.6-1c-.3-.6-1-1-1.6-1H4" />
+			<path d="M19 11.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0m-11.5-3h2m-2 3h2m-2 3h2" />
+		</svg>
+	)
+}

beszel/site/src/index.css

@@ -74,13 +74,24 @@
 @layer base {
 	* {
 		@apply border-border;
+		overflow-anchor: none;
 	}
 	body {
 		@apply bg-background text-foreground;
 	}
+}
+
+@layer utilities {
 	.link {
 		@apply text-primary font-medium underline-offset-4 hover:underline;
 	}
+	/* New system dialog width */
+	.ns-dialog {
+		min-width: 30.3rem;
+	}
+	:where(:lang(zh), :lang(zh-CN), :lang(ko)) .ns-dialog {
+		min-width: 27.9rem;
+	}
 }
 
 .recharts-tooltip-wrapper {

beszel/site/src/lib/i18n.ts

@@ -2,16 +2,8 @@ import { $direction } from "./stores"
 import { i18n } from "@lingui/core"
 import type { Messages } from "@lingui/core"
 import languages from "@/lib/languages"
-import { detect, fromUrl, fromStorage, fromNavigator } from "@lingui/detect-locale"
-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)
-}
+import { detect, fromStorage, fromNavigator } from "@lingui/detect-locale"
+import { messages as enMessages } from "@/locales/en/en"
 
 // activates locale
 function activateLocale(locale: string, messages: Messages = enMessages) {
@@ -37,26 +29,28 @@ export async function dynamicActivate(locale: string) {
 	}
 }
 
-// handle zh variants
-if (locale?.startsWith("zh-")) {
-	// map zh variants to zh-CN
-	const zhVariantMap: Record<string, string> = {
-		"zh-CN": "zh-CN",
-		"zh-SG": "zh-CN",
-		"zh-MY": "zh-CN",
-		zh: "zh-CN",
-		"zh-Hans": "zh-CN",
-		"zh-HK": "zh-HK",
-		"zh-TW": "zh-HK",
-		"zh-MO": "zh-HK",
-		"zh-Hant": "zh-HK",
+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"
 	}
-	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"
 	}
-	dynamicActivate(locale)
+	return locale
 }

beszel/site/src/lib/languages.ts

@@ -4,6 +4,11 @@ export default [
 		label: "العربية",
 		e: "🇵🇸",
 	},
+	{
+		lang: "bg",
+		label: "Български",
+		e: "🇧🇬",
+	},
 	{
 		lang: "cs",
 		label: "Čeština",
@@ -44,6 +49,11 @@ export default [
 		label: "Hrvatski",
 		e: "🇭🇷",
 	},
+	{
+		lang: "hu",
+		label: "Magyar",
+		e: "🇭🇺",
+	},
 	{
 		lang: "it",
 		label: "Italiano",
@@ -64,6 +74,11 @@ export default [
 		label: "Nederlands",
 		e: "🇳🇱",
 	},
+	{
+		lang: "no",
+		label: "Norsk",
+		e: "🇳🇴",
+	},
 	{
 		lang: "pl",
 		label: "Polski",
@@ -114,4 +129,9 @@ export default [
 		label: "繁體中文",
 		e: "🇭🇰",
 	},
+	{
+		lang: "zh",
+		label: "繁體中文",
+		e: "🇹🇼",
+	},
 ] as const

beszel/site/src/lib/stores.ts

@@ -1,9 +1,10 @@
 import PocketBase from "pocketbase"
-import { atom, map, WritableAtom } from "nanostores"
+import { atom, map, PreinitializedWritableAtom } from "nanostores"
 import { AlertRecord, ChartTimes, SystemRecord, UserSettings } from "@/types"
+import { basePath } from "@/components/router"
 
 /** PocketBase JS Client */
-export const pb = new PocketBase("/")
+export const pb = new PocketBase(basePath)
 
 /** Store if user is authenticated */
 export const $authenticated = atom(pb.authStore.isValid)
@@ -17,11 +18,11 @@ 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 WritableAtom<ChartTimes>
+export const $chartTime = atom("1h") as PreinitializedWritableAtom<ChartTimes>
+
+/** Whether to display average or max chart values */
+export const $maxValues = atom(false)
 
 /** User settings */
 export const $userSettings = map<UserSettings>({

beszel/site/src/lib/utils.ts

@@ -1,3 +1,4 @@
+import { t } from "@lingui/core/macro";
 import { toast } from "@/components/ui/use-toast"
 import { type ClassValue, clsx } from "clsx"
 import { twMerge } from "tailwind-merge"
@@ -9,12 +10,21 @@ 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))
 }
-// export const cn = clsx
+
+/** 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 async function copyToClipboard(content: string) {
 	const duration = 1500
@@ -33,7 +43,7 @@ const verifyAuth = () => {
 	pb.collection("users")
 		.authRefresh()
 		.catch(() => {
-			pb.authStore.clear()
+			logOut()
 			toast({
 				title: t`Failed to authenticate`,
 				description: t`Please log in again`,
@@ -42,15 +52,34 @@ const verifyAuth = () => {
 		})
 }
 
-export const updateSystemList = async () => {
-	const records = await pb
-		.collection<SystemRecord>("systems")
-		.getFullList({ sort: "+name", fields: "id,name,host,info,status" })
-	if (records.length) {
-		$systems.set(records)
-	} else {
-		verifyAuth()
+export const updateSystemList = (() => {
+	let isFetchingSystems = false
+	return async () => {
+		if (isFetchingSystems) {
+			return
+		}
+		isFetchingSystems = true
+		try {
+			const records = await pb
+				.collection<SystemRecord>("systems")
+				.getFullList({ sort: "+name", fields: "id,name,host,port,info,status" })
+
+			if (records.length) {
+				$systems.set(records)
+			} else {
+				verifyAuth()
+			}
+		} finally {
+			isFetchingSystems = false
+		}
 	}
+})()
+
+/** 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()
 }
 
 export const updateAlerts = () => {
@@ -88,7 +117,7 @@ export const formatDay = (timestamp: string) => {
 }
 
 export const updateFavicon = (newIcon: string) => {
-	;(document.querySelector("link[rel='icon']") as HTMLLinkElement).href = `/static/${newIcon}`
+	;(document.querySelector("link[rel='icon']") as HTMLLinkElement).href = prependBasePath(`/static/${newIcon}`)
 }
 
 export const isAdmin = () => pb.authStore.record?.role === "admin"
@@ -283,7 +312,8 @@ export const alertInfo: Record<string, AlertInfo> = {
 		unit: "",
 		icon: ServerIcon,
 		desc: () => t`Triggers when status switches between up and down`,
-		single: true,
+		/** "for x minutes" is appended to desc when only one value */
+		singleDesc: () => t`System` + " " + t`Down`,
 	},
 	CPU: {
 		name: () => t`CPU Usage`,
@@ -317,3 +347,11 @@ export const alertInfo: Record<string, AlertInfo> = {
 		desc: () => t`Triggers when any sensor exceeds a threshold`,
 	},
 }
+
+/**
+ * Retuns value of system host, truncating full path if socket.
+ * @example
+ * // Assuming system.host is "/var/run/beszel.sock"
+ * const hostname = getHostDisplayValue(system) // hostname will be "beszel.sock"
+ */
+export const getHostDisplayValue = (system: SystemRecord): string => system.host.slice(system.host.lastIndexOf("/") + 1)

beszel/site/src/locales/bg/bg.po

@@ -0,0 +1,871 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2024-11-01 11:30-0400\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: bg\n"
+"Project-Id-Version: beszel\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2025-03-06 07:27\n"
+"Last-Translator: \n"
+"Language-Team: Bulgarian\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: beszel\n"
+"X-Crowdin-Project-ID: 733311\n"
+"X-Crowdin-Language: bg\n"
+"X-Crowdin-File: /main/beszel/site/src/locales/en/en.po\n"
+"X-Crowdin-File-ID: 16\n"
+
+#. placeholder {0}: Math.trunc(system.info?.u / 86400)
+#: src/components/routes/system.tsx:259
+msgid "{0, plural, one {# day} other {# days}}"
+msgstr "{0, plural, one {# ден} other {# дни}}"
+
+#: src/components/routes/system.tsx:257
+msgid "{hours, plural, one {# hour} other {# hours}}"
+msgstr "{hours, plural, one {# час} other {# часа}}"
+
+#: src/lib/utils.ts:168
+msgid "1 hour"
+msgstr "1 час"
+
+#: src/lib/utils.ts:191
+msgid "1 week"
+msgstr "1 седмица"
+
+#: src/lib/utils.ts:176
+msgid "12 hours"
+msgstr "12 часа"
+
+#: src/lib/utils.ts:184
+msgid "24 hours"
+msgstr "24 часа"
+
+#: src/lib/utils.ts:199
+msgid "30 days"
+msgstr "30 дни"
+
+#. Table column
+#: src/components/systems-table/systems-table.tsx:304
+msgid "Actions"
+msgstr "Действия"
+
+#: src/components/routes/home.tsx:94
+msgid "Active Alerts"
+msgstr "Активни тревоги"
+
+#: src/components/add-system.tsx:43
+msgid "Add <0>System</0>"
+msgstr "Добави <0>Система</0>"
+
+#: src/components/add-system.tsx:126
+msgid "Add New System"
+msgstr "Добави нова система"
+
+#: src/components/add-system.tsx:232
+msgid "Add system"
+msgstr "Добави система"
+
+#: src/components/routes/settings/notifications.tsx:158
+msgid "Add URL"
+msgstr "Добави URL"
+
+#: src/components/routes/settings/general.tsx:81
+msgid "Adjust display options for charts."
+msgstr "Настрой опциите за показване на диаграмите."
+
+#: src/components/command-palette.tsx:131
+#: src/components/command-palette.tsx:144
+#: src/components/command-palette.tsx:158
+#: src/components/command-palette.tsx:172
+#: src/components/command-palette.tsx:187
+msgid "Admin"
+msgstr "Администратор"
+
+#: src/components/systems-table/systems-table.tsx:270
+msgid "Agent"
+msgstr "Агент"
+
+#: src/components/alerts/alert-button.tsx:33
+#: src/components/alerts/alert-button.tsx:79
+msgid "Alerts"
+msgstr "Тревоги"
+
+#: src/components/systems-table/systems-table.tsx:347
+#: src/components/alerts/alert-button.tsx:99
+msgid "All Systems"
+msgstr "Всички системи"
+
+#: src/components/systems-table/systems-table.tsx:696
+msgid "Are you sure you want to delete {name}?"
+msgstr "Сигурен ли си, че искаш да изтриеш {name}?"
+
+#: src/components/copy-to-clipboard.tsx:16
+msgid "Automatic copy requires a secure context."
+msgstr "Автоматичното копиране изисква защитен контескт."
+
+#: src/components/routes/system.tsx:670
+msgid "Average"
+msgstr "Средно"
+
+#: src/components/routes/system.tsx:446
+msgid "Average CPU utilization of containers"
+msgstr "Средно използване на процесора на контейнерите"
+
+#. placeholder {0}: data.alert.unit
+#: src/components/alerts/alerts-system.tsx:253
+msgid "Average exceeds <0>{value}{0}</0>"
+msgstr "Средната стойност надхвърля <0>{value}{0}</0>"
+
+#: src/components/routes/system.tsx:547
+msgid "Average power consumption of GPUs"
+msgstr "Средна консумация на ток от графични карти"
+
+#: src/components/routes/system.tsx:435
+msgid "Average system-wide CPU utilization"
+msgstr "Средно използване на процесора на цялата система"
+
+#. placeholder {0}: gpu.n
+#: src/components/routes/system.tsx:569
+msgid "Average utilization of {0}"
+msgstr "Средно използване на {0}"
+
+#: src/components/navbar.tsx:94
+#: src/components/command-palette.tsx:169
+msgid "Backups"
+msgstr "Архиви"
+
+#: src/lib/utils.ts:337
+#: src/components/routes/system.tsx:491
+msgid "Bandwidth"
+msgstr "Bandwidth на мрежата"
+
+#: src/components/login/auth-form.tsx:305
+msgid "Beszel supports OpenID Connect and many OAuth2 authentication providers."
+msgstr "Beszel поддържа OpenID Connect и много други OAuth2 доставчици за удостоверяване."
+
+#: src/components/routes/settings/notifications.tsx:129
+msgid "Beszel uses <0>Shoutrrr</0> to integrate with popular notification services."
+msgstr "Beszel ползва <0>Shoutrrr</0> за да се интегрира с известни услуги за уведомяване."
+
+#: src/components/add-system.tsx:131
+msgid "Binary"
+msgstr "Двоичен код"
+
+#: src/components/charts/mem-chart.tsx:87
+msgid "Cache / Buffers"
+msgstr "Кеш / Буфери"
+
+#: src/components/systems-table/systems-table.tsx:707
+msgid "Cancel"
+msgstr "Откажи"
+
+#: src/components/routes/settings/config-yaml.tsx:69
+msgid "Caution - potential data loss"
+msgstr "Внимание - възможност за загуба на данни"
+
+#: src/components/routes/settings/general.tsx:36
+msgid "Change general application options."
+msgstr "Смени общите опции на приложението."
+
+#: src/components/routes/settings/general.tsx:78
+msgid "Chart options"
+msgstr "Опции на диаграмата"
+
+#: src/components/login/forgot-pass-form.tsx:35
+msgid "Check {email} for a reset link."
+msgstr "Провери {email} за линк за нулиране."
+
+#: src/components/routes/settings/layout.tsx:41
+msgid "Check logs for more details."
+msgstr "Провери log-овете за повече информация."
+
+#: src/components/routes/settings/notifications.tsx:185
+msgid "Check your notification service"
+msgstr "Провери услугата си за удостоверяване"
+
+#: src/components/add-system.tsx:205
+msgid "Click to copy"
+msgstr "Настисни за да копираш"
+
+#: src/components/login/forgot-pass-form.tsx:84
+#: src/components/login/forgot-pass-form.tsx:90
+msgid "Command line instructions"
+msgstr "Инструкции за командната линия"
+
+#: src/components/routes/settings/notifications.tsx:79
+msgid "Configure how you receive alert notifications."
+msgstr "Настрой как получаваш нотификации за тревоги."
+
+#: src/components/login/auth-form.tsx:213
+#: src/components/login/auth-form.tsx:218
+msgid "Confirm password"
+msgstr "Потвърди парола"
+
+#: src/components/systems-table/systems-table.tsx:713
+msgid "Continue"
+msgstr "Продължи"
+
+#: src/lib/utils.ts:35
+msgid "Copied to clipboard"
+msgstr "Записано в клипборда"
+
+#: src/components/add-system.tsx:216
+#: src/components/add-system.tsx:218
+msgid "Copy"
+msgstr "Копирай"
+
+#: src/components/systems-table/systems-table.tsx:678
+msgid "Copy host"
+msgstr "Копирай хоста"
+
+#: src/components/add-system.tsx:225
+msgid "Copy Linux command"
+msgstr "Копирай linux командата"
+
+#: src/components/copy-to-clipboard.tsx:13
+msgid "Copy text"
+msgstr "Копирай текста"
+
+#: src/components/systems-table/systems-table.tsx:186
+msgid "CPU"
+msgstr "Процесор"
+
+#: src/lib/utils.ts:319
+#: src/components/routes/system.tsx:434
+#: src/components/charts/area-chart.tsx:58
+msgid "CPU Usage"
+msgstr "Употреба на процесор"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Create account"
+msgstr "Създай акаунт"
+
+#. Dark theme
+#: src/components/mode-toggle.tsx:22
+msgid "Dark"
+msgstr "Тъмно"
+
+#: src/components/command-palette.tsx:80
+#: src/components/routes/home.tsx:36
+msgid "Dashboard"
+msgstr "Табло"
+
+#: src/components/routes/settings/general.tsx:85
+msgid "Default time period"
+msgstr "Времеви диапазон по подразбиране"
+
+#: src/components/systems-table/systems-table.tsx:683
+msgid "Delete"
+msgstr "Изтрий"
+
+#: src/components/systems-table/systems-table.tsx:204
+msgid "Disk"
+msgstr "Диск"
+
+#: src/components/routes/system.tsx:481
+msgid "Disk I/O"
+msgstr "Диск I/O"
+
+#: src/lib/utils.ts:331
+#: src/components/routes/system.tsx:474
+#: src/components/charts/disk-chart.tsx:77
+msgid "Disk Usage"
+msgstr "Използване на диск"
+
+#: src/components/routes/system.tsx:603
+msgid "Disk usage of {extraFsName}"
+msgstr "Изполване на диск от {extraFsName}"
+
+#: src/components/routes/system.tsx:445
+msgid "Docker CPU Usage"
+msgstr "Използване на процесор от docker"
+
+#: src/components/routes/system.tsx:466
+msgid "Docker Memory Usage"
+msgstr "Изполване на памет от docker"
+
+#: src/components/routes/system.tsx:507
+msgid "Docker Network I/O"
+msgstr "Мрежов I/O използван от docker"
+
+#: src/components/command-palette.tsx:123
+msgid "Documentation"
+msgstr "Документация"
+
+#. Context: System is down
+#: src/lib/utils.ts:316
+#: src/components/systems-table/systems-table.tsx:142
+#: src/components/routes/system.tsx:345
+msgid "Down"
+msgstr ""
+
+#: src/components/add-system.tsx:126
+#: src/components/systems-table/systems-table.tsx:653
+msgid "Edit"
+msgstr ""
+
+#: src/components/login/forgot-pass-form.tsx:54
+#: src/components/login/auth-form.tsx:176
+msgid "Email"
+msgstr "Имейл"
+
+#: src/components/routes/settings/notifications.tsx:93
+msgid "Email notifications"
+msgstr "Имейл нотификации"
+
+#: src/components/login/login.tsx:38
+msgid "Enter email address to reset password"
+msgstr "Въведи имейл адрес за да нулираш паролата"
+
+#: src/components/routes/settings/notifications.tsx:113
+msgid "Enter email address..."
+msgstr "Въведи имейл адрес..."
+
+#: src/components/routes/settings/notifications.tsx:189
+#: src/components/routes/settings/config-yaml.tsx:29
+#: src/components/login/auth-form.tsx:137
+msgid "Error"
+msgstr "Грешка"
+
+#. placeholder {0}: alert.value
+#. placeholder {1}: info.unit
+#. placeholder {2}: alert.min
+#: src/components/routes/home.tsx:113
+msgid "Exceeds {0}{1} in last {2, plural, one {# minute} other {# minutes}}"
+msgstr "Надвишава {0}{1} в последните {2, plural, one {# минута} other {# минути}}"
+
+#: src/components/routes/settings/config-yaml.tsx:73
+msgid "Existing systems not defined in <0>config.yml</0> will be deleted. Please make regular backups."
+msgstr "Съществуващи системи които не са дефинирани в <0>config.yml</0> ще бъдат изтрити. Моля прави чести архиви."
+
+#: src/components/routes/settings/config-yaml.tsx:94
+msgid "Export configuration"
+msgstr "Експортирай конфигурация"
+
+#: src/components/routes/settings/config-yaml.tsx:49
+msgid "Export your current systems configuration."
+msgstr "Експортирай конфигурацията на системите."
+
+#: src/lib/utils.ts:48
+msgid "Failed to authenticate"
+msgstr "Неуспешно удостоверяване"
+
+#: src/components/routes/settings/notifications.tsx:64
+#: src/components/routes/settings/layout.tsx:40
+msgid "Failed to save settings"
+msgstr "Неуспешно запазване на настройки"
+
+#: src/components/routes/settings/notifications.tsx:190
+msgid "Failed to send test notification"
+msgstr "Неуспешно изпрати тестова нотификация"
+
+#: src/components/alerts/alerts-system.tsx:26
+msgid "Failed to update alert"
+msgstr "Неуспешно обнови тревога"
+
+#: src/components/systems-table/systems-table.tsx:354
+#: src/components/routes/system.tsx:643
+msgid "Filter..."
+msgstr "Филтрирай..."
+
+#: src/components/alerts/alerts-system.tsx:285
+msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
+msgstr "За <0>{min}</0> {min, plural, one {минута} other {минути}}"
+
+#: src/components/login/auth-form.tsx:328
+msgid "Forgot password?"
+msgstr "Забравена парола?"
+
+#. Context: General settings
+#: src/components/routes/settings/layout.tsx:52
+#: src/components/routes/settings/general.tsx:33
+msgid "General"
+msgstr "Общо"
+
+#: src/components/routes/system.tsx:546
+msgid "GPU Power Draw"
+msgstr "Консумация на ток от графична карта"
+
+#: src/components/systems-table/systems-table.tsx:381
+msgid "Grid"
+msgstr "Мрежово"
+
+#: src/components/add-system.tsx:159
+msgid "Host / IP"
+msgstr "Хост / IP"
+
+#: src/components/login/forgot-pass-form.tsx:94
+msgid "If you've lost the password to your admin account, you may reset it using the following command."
+msgstr "Ако си загубил паролата до администраторския акаунт, можеш да я нулираш със следващата команда."
+
+#: src/components/login/auth-form.tsx:18
+msgid "Invalid email address."
+msgstr "Невалиден имейл адрес."
+
+#. Linux kernel
+#: src/components/routes/system.tsx:271
+msgid "Kernel"
+msgstr "Linux Kernel"
+
+#: src/components/routes/settings/general.tsx:45
+msgid "Language"
+msgstr "Език"
+
+#: src/components/systems-table/systems-table.tsx:367
+msgid "Layout"
+msgstr "Подреждане"
+
+#. Light theme
+#: src/components/mode-toggle.tsx:17
+msgid "Light"
+msgstr "Светъл"
+
+#: src/components/navbar.tsx:105
+msgid "Log Out"
+msgstr "Изход"
+
+#: src/components/login/login.tsx:19
+msgid "Login"
+msgstr "Вход"
+
+#: src/components/login/forgot-pass-form.tsx:16
+#: src/components/login/auth-form.tsx:40
+msgid "Login attempt failed"
+msgstr "Неуспешен опит за вход"
+
+#: src/components/navbar.tsx:86
+#: src/components/command-palette.tsx:155
+msgid "Logs"
+msgstr "Логове"
+
+#: src/components/routes/settings/notifications.tsx:82
+msgid "Looking instead for where to create alerts? Click the bell <0/> icons in the systems table."
+msgstr "Търсиш къде да създадеш тревоги? Натисни емотиконата за звънец <0/> в таблицата за системи."
+
+#: src/components/routes/settings/layout.tsx:86
+msgid "Manage display and notification preferences."
+msgstr "Управление на предпочитанията за показване и уведомяване."
+
+#: src/components/add-system.tsx:227
+msgid "Manual setup instructions"
+msgstr ""
+
+#. Chart select field. Please try to keep this short.
+#: src/components/routes/system.tsx:673
+msgid "Max 1 min"
+msgstr "Максимум 1 минута"
+
+#: src/components/systems-table/systems-table.tsx:195
+msgid "Memory"
+msgstr "Памет"
+
+#: src/lib/utils.ts:325
+#: src/components/routes/system.tsx:456
+msgid "Memory Usage"
+msgstr "Употреба на паметта"
+
+#: src/components/routes/system.tsx:467
+msgid "Memory usage of docker containers"
+msgstr "Използването на памет от docker контейнерите"
+
+#: src/components/add-system.tsx:155
+msgid "Name"
+msgstr "Име"
+
+#: src/components/systems-table/systems-table.tsx:223
+msgid "Net"
+msgstr "Мрежа"
+
+#: src/components/routes/system.tsx:508
+msgid "Network traffic of docker containers"
+msgstr "Мрежов трафик на docker контейнери"
+
+#: src/components/routes/system.tsx:493
+msgid "Network traffic of public interfaces"
+msgstr "Мрежов трафик на публични интерфейси"
+
+#: src/components/command-palette.tsx:48
+msgid "No results found."
+msgstr "Няма намерени резултати."
+
+#: src/components/systems-table/systems-table.tsx:472
+#: src/components/systems-table/systems-table.tsx:495
+msgid "No systems found."
+msgstr "Няма намерени системи."
+
+#: src/components/command-palette.tsx:109
+#: src/components/routes/settings/notifications.tsx:76
+#: src/components/routes/settings/layout.tsx:57
+msgid "Notifications"
+msgstr "Нотификации"
+
+#: src/components/login/auth-form.tsx:300
+msgid "OAuth 2 / OIDC support"
+msgstr "Поддръжка на OAuth 2 / OIDC"
+
+#: src/components/routes/settings/config-yaml.tsx:62
+msgid "On each restart, systems in the database will be updated to match the systems defined in the file."
+msgstr "На всеки рестарт, системите в датабазата ще бъдат обновени да съвпадат със системите зададени във файла."
+
+#: src/components/systems-table/systems-table.tsx:639
+msgid "Open menu"
+msgstr "Отвори менюто"
+
+#: src/components/login/auth-form.tsx:251
+msgid "Or continue with"
+msgstr "Или продължи с"
+
+#: src/components/alerts/alert-button.tsx:120
+msgid "Overwrite existing alerts"
+msgstr "Презапиши съществуващи тревоги"
+
+#: src/components/command-palette.tsx:83
+msgid "Page"
+msgstr "Страница"
+
+#: src/components/command-palette.tsx:70
+msgid "Pages / Settings"
+msgstr "Страници / Настройки"
+
+#: src/components/login/auth-form.tsx:195
+#: src/components/login/auth-form.tsx:200
+msgid "Password"
+msgstr "Парола"
+
+#: src/components/login/auth-form.tsx:21
+msgid "Password must be at least 8 characters."
+msgstr "Паролата трябва да е поне 8 символа."
+
+#: src/components/login/auth-form.tsx:22
+msgid "Password must be less than 72 bytes."
+msgstr ""
+
+#: src/components/login/forgot-pass-form.tsx:34
+msgid "Password reset request received"
+msgstr "Получено е искането за нулиране на паролата"
+
+#: src/components/systems-table/systems-table.tsx:672
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/components/systems-table/systems-table.tsx:143
+msgid "Paused"
+msgstr ""
+
+#: src/components/routes/settings/notifications.tsx:97
+msgid "Please <0>configure an SMTP server</0> to ensure alerts are delivered."
+msgstr "Моля <0>конфигурурай SMTP сървър</0> за да се подсигуриш, че тревогите са доставени."
+
+#: src/components/alerts/alerts-system.tsx:27
+msgid "Please check logs for more details."
+msgstr "Моля провери log-овете за повече информация."
+
+#: src/components/login/forgot-pass-form.tsx:17
+#: src/components/login/auth-form.tsx:41
+msgid "Please check your credentials and try again"
+msgstr "Моля провери дадената информация и опитай отново"
+
+#: src/components/login/login.tsx:36
+msgid "Please create an admin account"
+msgstr "Моля създай администраторски акаунт"
+
+#: src/components/login/auth-form.tsx:138
+msgid "Please enable pop-ups for this site"
+msgstr "Моля активирай изскачащите прозорци за този сайт"
+
+#: src/lib/utils.ts:49
+msgid "Please log in again"
+msgstr "Моля влез отново"
+
+#: src/components/login/auth-form.tsx:308
+msgid "Please see <0>the documentation</0> for instructions."
+msgstr "Моля виж <0>документацията</0> за инструкции."
+
+#: src/components/login/login.tsx:40
+msgid "Please sign in to your account"
+msgstr "Моля влез в акаунта ти"
+
+#: src/components/add-system.tsx:171
+msgid "Port"
+msgstr "Порт"
+
+#: src/components/routes/system.tsx:457
+#: src/components/routes/system.tsx:577
+msgid "Precise utilization at the recorded time"
+msgstr "Точно използване в записаното време"
+
+#: src/components/routes/settings/general.tsx:58
+msgid "Preferred Language"
+msgstr "Предпочитан език"
+
+#. Use 'Key' if your language requires many more characters
+#: src/components/add-system.tsx:182
+msgid "Public Key"
+msgstr "Публичен ключ"
+
+#. Disk read
+#: src/components/charts/area-chart.tsx:62
+#: src/components/charts/area-chart.tsx:72
+msgid "Read"
+msgstr "Прочети"
+
+#. Network bytes received (download)
+#: src/components/charts/area-chart.tsx:67
+msgid "Received"
+msgstr "Получени"
+
+#: src/components/login/forgot-pass-form.tsx:77
+msgid "Reset Password"
+msgstr "Нулиране на парола"
+
+#: src/components/systems-table/systems-table.tsx:667
+msgid "Resume"
+msgstr "Възобнови"
+
+#: src/components/routes/settings/notifications.tsx:119
+msgid "Save address using enter key or comma. Leave blank to disable email notifications."
+msgstr "Запази адреса с enter или запетая. Остави празно за да изключиш нотификациите чрез имейл."
+
+#: src/components/routes/settings/notifications.tsx:169
+#: src/components/routes/settings/general.tsx:106
+msgid "Save Settings"
+msgstr "Запази настройките"
+
+#: src/components/add-system.tsx:232
+msgid "Save system"
+msgstr ""
+
+#: src/components/navbar.tsx:134
+msgid "Search"
+msgstr "Търси"
+
+#: src/components/command-palette.tsx:45
+msgid "Search for systems or settings..."
+msgstr "Търси за системи или настройки..."
+
+#: src/components/alerts/alert-button.tsx:82
+msgid "See <0>notification settings</0> to configure how you receive alerts."
+msgstr "Виж <0>настройките за нотификациите</0> за да конфигурираш как получаваш тревоги."
+
+#. Network bytes sent (upload)
+#: src/components/charts/area-chart.tsx:66
+msgid "Sent"
+msgstr "Изпратени"
+
+#: src/components/routes/settings/general.tsx:100
+msgid "Sets the default time range for charts when a system is viewed."
+msgstr "Задава диапазона за време за диаграмите, когато се разглежда система."
+
+#: src/components/command-palette.tsx:94
+#: src/components/command-palette.tsx:97
+#: src/components/command-palette.tsx:112
+#: src/components/routes/settings/layout.tsx:72
+#: src/components/routes/settings/layout.tsx:83
+msgid "Settings"
+msgstr "Настройки"
+
+#: src/components/routes/settings/layout.tsx:34
+msgid "Settings saved"
+msgstr "Настройките са запазени"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Sign in"
+msgstr "Влез"
+
+#: src/components/command-palette.tsx:184
+msgid "SMTP settings"
+msgstr "Настройки за SMTP"
+
+#: src/components/systems-table/systems-table.tsx:389
+msgid "Sort By"
+msgstr "Сортиране по"
+
+#: src/lib/utils.ts:311
+msgid "Status"
+msgstr "Статус"
+
+#: src/components/routes/system.tsx:523
+msgid "Swap space used by the system"
+msgstr "Изполван swap от системата"
+
+#: src/components/routes/system.tsx:522
+msgid "Swap Usage"
+msgstr "Използване на swap"
+
+#. System theme
+#: src/lib/utils.ts:316
+#: src/components/mode-toggle.tsx:27
+#: src/components/systems-table/systems-table.tsx:152
+msgid "System"
+msgstr "Система"
+
+#: src/components/navbar.tsx:78
+msgid "Systems"
+msgstr "Системи"
+
+#: src/components/routes/settings/config-yaml.tsx:56
+msgid "Systems may be managed in a <0>config.yml</0> file inside your data directory."
+msgstr "Системите могат да бъдат управлявани в <0>config.yml</0> файл намиращ се в директорията с данни."
+
+#: src/components/systems-table/systems-table.tsx:377
+msgid "Table"
+msgstr "Таблица"
+
+#. Temperature label in systems table
+#: src/components/systems-table/systems-table.tsx:244
+msgid "Temp"
+msgstr ""
+
+#: src/lib/utils.ts:344
+#: src/components/routes/system.tsx:534
+msgid "Temperature"
+msgstr "Температура"
+
+#: src/components/routes/system.tsx:535
+msgid "Temperatures of system sensors"
+msgstr "Температири на системни сензори"
+
+#: src/components/routes/settings/notifications.tsx:213
+msgid "Test <0>URL</0>"
+msgstr "Тествай <0>URL</0>"
+
+#: src/components/routes/settings/notifications.tsx:184
+msgid "Test notification sent"
+msgstr "Тестова нотификация изпратена"
+
+#: src/components/add-system.tsx:147
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr "Агента трябва да работи на системата за да се свърже. Копирай инсталационната команда за агента долу."
+
+#: src/components/add-system.tsx:138
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr "Агемта трябва да работи на системата за да се свърже. Копирай <0>docker-compose.yml</0> файла за агента долу."
+
+#: src/components/login/forgot-pass-form.tsx:99
+msgid "Then log into the backend and reset your user account password in the users table."
+msgstr "След това влез в backend-а и нулирай паролата за потребителския акаунт в таблицата за потребители."
+
+#: src/components/systems-table/systems-table.tsx:699
+msgid "This action cannot be undone. This will permanently delete all current records for {name} from the database."
+msgstr "Това действие не може да бъде отменено. Това ще изтрие всички записи за {name} от датабазата."
+
+#: src/components/routes/system.tsx:615
+msgid "Throughput of {extraFsName}"
+msgstr "Пропускателна способност на {extraFsName}"
+
+#: src/components/routes/system.tsx:482
+msgid "Throughput of root filesystem"
+msgstr "Пропускателна способност на root файловата система"
+
+#: src/components/routes/settings/notifications.tsx:108
+msgid "To email(s)"
+msgstr "До имейл(ите)"
+
+#: src/components/routes/system.tsx:409
+#: src/components/routes/system.tsx:422
+msgid "Toggle grid"
+msgstr "Превключване на мрежа"
+
+#: src/components/mode-toggle.tsx:34
+msgid "Toggle theme"
+msgstr "Включи тема"
+
+#: src/lib/utils.ts:347
+msgid "Triggers when any sensor exceeds a threshold"
+msgstr "Задейства се, когато някой даден сензор надвиши зададен праг"
+
+#: src/lib/utils.ts:340
+msgid "Triggers when combined up/down exceeds a threshold"
+msgstr "Задейства се, когато комбинираното качване/сваляне надвиши зададен праг"
+
+#: src/lib/utils.ts:322
+msgid "Triggers when CPU usage exceeds a threshold"
+msgstr "Задейства се, когато употребата на процесора надвиши зададен праг"
+
+#: src/lib/utils.ts:328
+msgid "Triggers when memory usage exceeds a threshold"
+msgstr "Задейства се, когато употребата на паметта надвиши зададен праг"
+
+#: src/lib/utils.ts:314
+msgid "Triggers when status switches between up and down"
+msgstr "Задейства се, когато статуса превключва между долу и горе"
+
+#: src/lib/utils.ts:334
+msgid "Triggers when usage of any disk exceeds a threshold"
+msgstr "Задейства се, когато употребата на някой диск надивши зададен праг"
+
+#. Context: System is up
+#: src/components/systems-table/systems-table.tsx:141
+#: src/components/routes/system.tsx:343
+msgid "Up"
+msgstr ""
+
+#: src/components/systems-table/systems-table.tsx:350
+msgid "Updated in real time. Click on a system to view information."
+msgstr "Актуализира се в реално време. Натисни на система за да видиш информация."
+
+#: src/components/routes/system.tsx:270
+msgid "Uptime"
+msgstr "Време на работа"
+
+#: src/components/routes/system.tsx:568
+#: src/components/routes/system.tsx:602
+#: src/components/charts/area-chart.tsx:75
+msgid "Usage"
+msgstr "Употреба"
+
+#: src/components/routes/system.tsx:474
+msgid "Usage of root partition"
+msgstr "Употреба на root partition-а"
+
+#: src/components/charts/swap-chart.tsx:56
+#: src/components/charts/mem-chart.tsx:63
+#: src/components/charts/area-chart.tsx:75
+msgid "Used"
+msgstr "Използвани"
+
+#: src/components/navbar.tsx:70
+#: src/components/command-palette.tsx:141
+msgid "Users"
+msgstr "Потребители"
+
+#: src/components/systems-table/systems-table.tsx:359
+msgid "View"
+msgstr "Изглед"
+
+#: src/components/systems-table/systems-table.tsx:424
+msgid "Visible Fields"
+msgstr "Видими полета"
+
+#: src/components/routes/system.tsx:707
+msgid "Waiting for enough records to display"
+msgstr "Изчаква се за достатъчно записи за показване"
+
+#: src/components/routes/settings/general.tsx:48
+msgid "Want to help us make our translations even better? Check out <0>Crowdin</0> for more details."
+msgstr "Искаш да помогнеш да направиш преводите още по-добри? Провери нашия <0>Crowdin</0> за повече детайли."
+
+#: src/components/routes/settings/notifications.tsx:126
+msgid "Webhook / Push notifications"
+msgstr "Webhook / Пуш нотификации"
+
+#. Disk write
+#: src/components/charts/area-chart.tsx:61
+#: src/components/charts/area-chart.tsx:71
+msgid "Write"
+msgstr "Запиши"
+
+#: src/components/routes/settings/layout.tsx:62
+msgid "YAML Config"
+msgstr "YAML конфигурация"
+
+#: src/components/routes/settings/config-yaml.tsx:46
+msgid "YAML Configuration"
+msgstr "YAML конфигурация"
+
+#: src/components/routes/settings/layout.tsx:35
+msgid "Your user settings have been updated."
+msgstr "Настройките за потребителя ти са обновени."

beszel/site/src/locales/hu/hu.po

@@ -0,0 +1,871 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2024-11-01 11:30-0400\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: hu\n"
+"Project-Id-Version: beszel\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2025-03-06 07:27\n"
+"Last-Translator: \n"
+"Language-Team: Hungarian\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: beszel\n"
+"X-Crowdin-Project-ID: 733311\n"
+"X-Crowdin-Language: hu\n"
+"X-Crowdin-File: /main/beszel/site/src/locales/en/en.po\n"
+"X-Crowdin-File-ID: 16\n"
+
+#. placeholder {0}: Math.trunc(system.info?.u / 86400)
+#: src/components/routes/system.tsx:259
+msgid "{0, plural, one {# day} other {# days}}"
+msgstr "{0, plural, one {# nap} other {# nap}}"
+
+#: src/components/routes/system.tsx:257
+msgid "{hours, plural, one {# hour} other {# hours}}"
+msgstr "{hours, plural, one {# óra} other {# óra}}"
+
+#: src/lib/utils.ts:168
+msgid "1 hour"
+msgstr "1 óra"
+
+#: src/lib/utils.ts:191
+msgid "1 week"
+msgstr "1 hét"
+
+#: src/lib/utils.ts:176
+msgid "12 hours"
+msgstr "12 óra"
+
+#: src/lib/utils.ts:184
+msgid "24 hours"
+msgstr "24 óra"
+
+#: src/lib/utils.ts:199
+msgid "30 days"
+msgstr "30 nap"
+
+#. Table column
+#: src/components/systems-table/systems-table.tsx:304
+msgid "Actions"
+msgstr "Műveletek"
+
+#: src/components/routes/home.tsx:94
+msgid "Active Alerts"
+msgstr "Aktív riasztások"
+
+#: src/components/add-system.tsx:43
+msgid "Add <0>System</0>"
+msgstr "Hozzáadás <0>System</0>"
+
+#: src/components/add-system.tsx:126
+msgid "Add New System"
+msgstr "Új rendszer hozzáadása"
+
+#: src/components/add-system.tsx:232
+msgid "Add system"
+msgstr "Rendszer hozzáadása"
+
+#: src/components/routes/settings/notifications.tsx:158
+msgid "Add URL"
+msgstr "URL hozzáadása"
+
+#: src/components/routes/settings/general.tsx:81
+msgid "Adjust display options for charts."
+msgstr "Állítsa be a diagram megjelenítését."
+
+#: src/components/command-palette.tsx:131
+#: src/components/command-palette.tsx:144
+#: src/components/command-palette.tsx:158
+#: src/components/command-palette.tsx:172
+#: src/components/command-palette.tsx:187
+msgid "Admin"
+msgstr "Admin"
+
+#: src/components/systems-table/systems-table.tsx:270
+msgid "Agent"
+msgstr "Ügynök"
+
+#: src/components/alerts/alert-button.tsx:33
+#: src/components/alerts/alert-button.tsx:79
+msgid "Alerts"
+msgstr "Riasztások"
+
+#: src/components/systems-table/systems-table.tsx:347
+#: src/components/alerts/alert-button.tsx:99
+msgid "All Systems"
+msgstr "Minden rendszer"
+
+#: src/components/systems-table/systems-table.tsx:696
+msgid "Are you sure you want to delete {name}?"
+msgstr "Biztosan törölni szeretnéd {name}-t?"
+
+#: src/components/copy-to-clipboard.tsx:16
+msgid "Automatic copy requires a secure context."
+msgstr "Az automatikus másolás biztonságos környezetet igényel."
+
+#: src/components/routes/system.tsx:670
+msgid "Average"
+msgstr "Átlag"
+
+#: src/components/routes/system.tsx:446
+msgid "Average CPU utilization of containers"
+msgstr "Konténerek átlagos CPU kihasználtsága"
+
+#. placeholder {0}: data.alert.unit
+#: src/components/alerts/alerts-system.tsx:253
+msgid "Average exceeds <0>{value}{0}</0>"
+msgstr "Az átlag meghaladja a <0>{value}{0}</0> értéket"
+
+#: src/components/routes/system.tsx:547
+msgid "Average power consumption of GPUs"
+msgstr "GPU-k átlagos energiafogyasztása"
+
+#: src/components/routes/system.tsx:435
+msgid "Average system-wide CPU utilization"
+msgstr "Rendszerszintű CPU átlagos kihasználtság"
+
+#. placeholder {0}: gpu.n
+#: src/components/routes/system.tsx:569
+msgid "Average utilization of {0}"
+msgstr "{0} átlagos kihasználtsága"
+
+#: src/components/navbar.tsx:94
+#: src/components/command-palette.tsx:169
+msgid "Backups"
+msgstr "Biztonsági mentések"
+
+#: src/lib/utils.ts:337
+#: src/components/routes/system.tsx:491
+msgid "Bandwidth"
+msgstr "Sávszélesség"
+
+#: src/components/login/auth-form.tsx:305
+msgid "Beszel supports OpenID Connect and many OAuth2 authentication providers."
+msgstr "A Beszel támogatja az OpenID Connect-et és számos OAuth2 hitelesítési szolgáltatót."
+
+#: src/components/routes/settings/notifications.tsx:129
+msgid "Beszel uses <0>Shoutrrr</0> to integrate with popular notification services."
+msgstr "A Beszel a <0>Shoutrrr</0>-t használja a népszerű értesítési szolgáltatások integrálására."
+
+#: src/components/add-system.tsx:131
+msgid "Binary"
+msgstr "Bináris"
+
+#: src/components/charts/mem-chart.tsx:87
+msgid "Cache / Buffers"
+msgstr "Gyorsítótár / Pufferelések"
+
+#: src/components/systems-table/systems-table.tsx:707
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: src/components/routes/settings/config-yaml.tsx:69
+msgid "Caution - potential data loss"
+msgstr "Figyelem - potenciális adatvesztés"
+
+#: src/components/routes/settings/general.tsx:36
+msgid "Change general application options."
+msgstr "Általános alkalmazásbeállítások módosítása."
+
+#: src/components/routes/settings/general.tsx:78
+msgid "Chart options"
+msgstr "Diagram beállítások"
+
+#: src/components/login/forgot-pass-form.tsx:35
+msgid "Check {email} for a reset link."
+msgstr "Ellenőrizd a {email} címet a visszaállító linkért."
+
+#: src/components/routes/settings/layout.tsx:41
+msgid "Check logs for more details."
+msgstr "Ellenőrizd a naplót a további részletekért."
+
+#: src/components/routes/settings/notifications.tsx:185
+msgid "Check your notification service"
+msgstr "Ellenőrizd az értesítési szolgáltatásodat"
+
+#: src/components/add-system.tsx:205
+msgid "Click to copy"
+msgstr "Kattints a másoláshoz"
+
+#: src/components/login/forgot-pass-form.tsx:84
+#: src/components/login/forgot-pass-form.tsx:90
+msgid "Command line instructions"
+msgstr "Parancssori utasítások"
+
+#: src/components/routes/settings/notifications.tsx:79
+msgid "Configure how you receive alert notifications."
+msgstr "Konfiguráld, hogyan kapod az értesítéseket."
+
+#: src/components/login/auth-form.tsx:213
+#: src/components/login/auth-form.tsx:218
+msgid "Confirm password"
+msgstr "Jelszó megerősítése"
+
+#: src/components/systems-table/systems-table.tsx:713
+msgid "Continue"
+msgstr "Tovább"
+
+#: src/lib/utils.ts:35
+msgid "Copied to clipboard"
+msgstr "Vágólapra másolva"
+
+#: src/components/add-system.tsx:216
+#: src/components/add-system.tsx:218
+msgid "Copy"
+msgstr "Másolás"
+
+#: src/components/systems-table/systems-table.tsx:678
+msgid "Copy host"
+msgstr "Hoszt másolása"
+
+#: src/components/add-system.tsx:225
+msgid "Copy Linux command"
+msgstr "Linux parancs másolása"
+
+#: src/components/copy-to-clipboard.tsx:13
+msgid "Copy text"
+msgstr "Szöveg másolása"
+
+#: src/components/systems-table/systems-table.tsx:186
+msgid "CPU"
+msgstr "CPU"
+
+#: src/lib/utils.ts:319
+#: src/components/routes/system.tsx:434
+#: src/components/charts/area-chart.tsx:58
+msgid "CPU Usage"
+msgstr "CPU használat"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Create account"
+msgstr "Fiók létrehozása"
+
+#. Dark theme
+#: src/components/mode-toggle.tsx:22
+msgid "Dark"
+msgstr "Sötét"
+
+#: src/components/command-palette.tsx:80
+#: src/components/routes/home.tsx:36
+msgid "Dashboard"
+msgstr "Áttekintés"
+
+#: src/components/routes/settings/general.tsx:85
+msgid "Default time period"
+msgstr "Alapértelmezett időszak"
+
+#: src/components/systems-table/systems-table.tsx:683
+msgid "Delete"
+msgstr "Törlés"
+
+#: src/components/systems-table/systems-table.tsx:204
+msgid "Disk"
+msgstr "Lemez"
+
+#: src/components/routes/system.tsx:481
+msgid "Disk I/O"
+msgstr "Lemez I/O"
+
+#: src/lib/utils.ts:331
+#: src/components/routes/system.tsx:474
+#: src/components/charts/disk-chart.tsx:77
+msgid "Disk Usage"
+msgstr "Lemezhasználat"
+
+#: src/components/routes/system.tsx:603
+msgid "Disk usage of {extraFsName}"
+msgstr "Lemezhasználat a {extraFsName}"
+
+#: src/components/routes/system.tsx:445
+msgid "Docker CPU Usage"
+msgstr "Docker CPU használat"
+
+#: src/components/routes/system.tsx:466
+msgid "Docker Memory Usage"
+msgstr "Docker memória használat"
+
+#: src/components/routes/system.tsx:507
+msgid "Docker Network I/O"
+msgstr "Docker hálózat I/O"
+
+#: src/components/command-palette.tsx:123
+msgid "Documentation"
+msgstr "Dokumentáció"
+
+#. Context: System is down
+#: src/lib/utils.ts:316
+#: src/components/systems-table/systems-table.tsx:142
+#: src/components/routes/system.tsx:345
+msgid "Down"
+msgstr ""
+
+#: src/components/add-system.tsx:126
+#: src/components/systems-table/systems-table.tsx:653
+msgid "Edit"
+msgstr ""
+
+#: src/components/login/forgot-pass-form.tsx:54
+#: src/components/login/auth-form.tsx:176
+msgid "Email"
+msgstr "Email"
+
+#: src/components/routes/settings/notifications.tsx:93
+msgid "Email notifications"
+msgstr "E-mail értesítések"
+
+#: src/components/login/login.tsx:38
+msgid "Enter email address to reset password"
+msgstr "E-mail cím megadása a jelszó visszaállításához"
+
+#: src/components/routes/settings/notifications.tsx:113
+msgid "Enter email address..."
+msgstr "Adja meg az e-mail címet..."
+
+#: src/components/routes/settings/notifications.tsx:189
+#: src/components/routes/settings/config-yaml.tsx:29
+#: src/components/login/auth-form.tsx:137
+msgid "Error"
+msgstr "Hiba"
+
+#. placeholder {0}: alert.value
+#. placeholder {1}: info.unit
+#. placeholder {2}: alert.min
+#: src/components/routes/home.tsx:113
+msgid "Exceeds {0}{1} in last {2, plural, one {# minute} other {# minutes}}"
+msgstr "Túllépi a {0}{1} értéket az elmúlt {2, plural, one {# percben} other {# percben}}"
+
+#: src/components/routes/settings/config-yaml.tsx:73
+msgid "Existing systems not defined in <0>config.yml</0> will be deleted. Please make regular backups."
+msgstr "A <0>config.yml</0> fájlban nem definiált meglévő rendszerek törlésre kerülnek. Kérjük, készítsen rendszeres biztonsági mentéseket."
+
+#: src/components/routes/settings/config-yaml.tsx:94
+msgid "Export configuration"
+msgstr "Konfiguráció exportálása"
+
+#: src/components/routes/settings/config-yaml.tsx:49
+msgid "Export your current systems configuration."
+msgstr "Exportálja a jelenlegi rendszerkonfigurációt."
+
+#: src/lib/utils.ts:48
+msgid "Failed to authenticate"
+msgstr "Hitelesítés sikertelen"
+
+#: src/components/routes/settings/notifications.tsx:64
+#: src/components/routes/settings/layout.tsx:40
+msgid "Failed to save settings"
+msgstr "Nem sikerült menteni a beállításokat"
+
+#: src/components/routes/settings/notifications.tsx:190
+msgid "Failed to send test notification"
+msgstr "Teszt értesítés elküldése sikertelen"
+
+#: src/components/alerts/alerts-system.tsx:26
+msgid "Failed to update alert"
+msgstr "Nem sikerült frissíteni a riasztást"
+
+#: src/components/systems-table/systems-table.tsx:354
+#: src/components/routes/system.tsx:643
+msgid "Filter..."
+msgstr "Szűrő..."
+
+#: src/components/alerts/alerts-system.tsx:285
+msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
+msgstr "A <0>{min}</0> {min, plural, one {perc} other {percek}}"
+
+#: src/components/login/auth-form.tsx:328
+msgid "Forgot password?"
+msgstr "Elfelejtette a jelszavát?"
+
+#. Context: General settings
+#: src/components/routes/settings/layout.tsx:52
+#: src/components/routes/settings/general.tsx:33
+msgid "General"
+msgstr "Általános"
+
+#: src/components/routes/system.tsx:546
+msgid "GPU Power Draw"
+msgstr "GPU áramfelvétele"
+
+#: src/components/systems-table/systems-table.tsx:381
+msgid "Grid"
+msgstr "Rács"
+
+#: src/components/add-system.tsx:159
+msgid "Host / IP"
+msgstr "Állomás / IP"
+
+#: src/components/login/forgot-pass-form.tsx:94
+msgid "If you've lost the password to your admin account, you may reset it using the following command."
+msgstr "Ha elvesztette az admin fiók jelszavát, a következő paranccsal állíthatja vissza."
+
+#: src/components/login/auth-form.tsx:18
+msgid "Invalid email address."
+msgstr "Érvénytelen e-mail cím."
+
+#. Linux kernel
+#: src/components/routes/system.tsx:271
+msgid "Kernel"
+msgstr "Kernel"
+
+#: src/components/routes/settings/general.tsx:45
+msgid "Language"
+msgstr "Nyelv"
+
+#: src/components/systems-table/systems-table.tsx:367
+msgid "Layout"
+msgstr "Elrendezés"
+
+#. Light theme
+#: src/components/mode-toggle.tsx:17
+msgid "Light"
+msgstr "Világos"
+
+#: src/components/navbar.tsx:105
+msgid "Log Out"
+msgstr "Kijelentkezés"
+
+#: src/components/login/login.tsx:19
+msgid "Login"
+msgstr "Bejelentkezés"
+
+#: src/components/login/forgot-pass-form.tsx:16
+#: src/components/login/auth-form.tsx:40
+msgid "Login attempt failed"
+msgstr "Bejelentkezés sikertelen"
+
+#: src/components/navbar.tsx:86
+#: src/components/command-palette.tsx:155
+msgid "Logs"
+msgstr "Naplók"
+
+#: src/components/routes/settings/notifications.tsx:82
+msgid "Looking instead for where to create alerts? Click the bell <0/> icons in the systems table."
+msgstr "Inkább azt keresi, hogy hol hozhat létre riasztásokat? Kattintson a csengő <0/> ikonokra a rendszerek táblázatában."
+
+#: src/components/routes/settings/layout.tsx:86
+msgid "Manage display and notification preferences."
+msgstr "A megjelenítési és értesítési beállítások kezelése."
+
+#: src/components/add-system.tsx:227
+msgid "Manual setup instructions"
+msgstr ""
+
+#. Chart select field. Please try to keep this short.
+#: src/components/routes/system.tsx:673
+msgid "Max 1 min"
+msgstr "Maximum 1 perc"
+
+#: src/components/systems-table/systems-table.tsx:195
+msgid "Memory"
+msgstr "RAM"
+
+#: src/lib/utils.ts:325
+#: src/components/routes/system.tsx:456
+msgid "Memory Usage"
+msgstr "Memóriahasználat"
+
+#: src/components/routes/system.tsx:467
+msgid "Memory usage of docker containers"
+msgstr "Docker konténerek memória használata"
+
+#: src/components/add-system.tsx:155
+msgid "Name"
+msgstr "Név"
+
+#: src/components/systems-table/systems-table.tsx:223
+msgid "Net"
+msgstr "Hálózat"
+
+#: src/components/routes/system.tsx:508
+msgid "Network traffic of docker containers"
+msgstr "Docker konténerek hálózati forgalma"
+
+#: src/components/routes/system.tsx:493
+msgid "Network traffic of public interfaces"
+msgstr "Nyilvános interfészek hálózati forgalma"
+
+#: src/components/command-palette.tsx:48
+msgid "No results found."
+msgstr "Nincs találat."
+
+#: src/components/systems-table/systems-table.tsx:472
+#: src/components/systems-table/systems-table.tsx:495
+msgid "No systems found."
+msgstr "Nem található rendszer."
+
+#: src/components/command-palette.tsx:109
+#: src/components/routes/settings/notifications.tsx:76
+#: src/components/routes/settings/layout.tsx:57
+msgid "Notifications"
+msgstr "Értesítések"
+
+#: src/components/login/auth-form.tsx:300
+msgid "OAuth 2 / OIDC support"
+msgstr "OAuth 2 / OIDC támogatás"
+
+#: src/components/routes/settings/config-yaml.tsx:62
+msgid "On each restart, systems in the database will be updated to match the systems defined in the file."
+msgstr "Minden újraindításkor az adatbázisban lévő rendszerek frissítésre kerülnek, hogy megfeleljenek a fájlban meghatározott rendszereknek."
+
+#: src/components/systems-table/systems-table.tsx:639
+msgid "Open menu"
+msgstr "Menü megnyitása"
+
+#: src/components/login/auth-form.tsx:251
+msgid "Or continue with"
+msgstr "Vagy folytasd ezzel"
+
+#: src/components/alerts/alert-button.tsx:120
+msgid "Overwrite existing alerts"
+msgstr "Felülírja a meglévő riasztásokat"
+
+#: src/components/command-palette.tsx:83
+msgid "Page"
+msgstr "Oldal"
+
+#: src/components/command-palette.tsx:70
+msgid "Pages / Settings"
+msgstr "Oldalak / Beállítások"
+
+#: src/components/login/auth-form.tsx:195
+#: src/components/login/auth-form.tsx:200
+msgid "Password"
+msgstr "Jelszó"
+
+#: src/components/login/auth-form.tsx:21
+msgid "Password must be at least 8 characters."
+msgstr "A jelszónak legalább 8 karakternek kell lennie."
+
+#: src/components/login/auth-form.tsx:22
+msgid "Password must be less than 72 bytes."
+msgstr ""
+
+#: src/components/login/forgot-pass-form.tsx:34
+msgid "Password reset request received"
+msgstr "Jelszó-visszaállítási kérelmet kaptunk"
+
+#: src/components/systems-table/systems-table.tsx:672
+msgid "Pause"
+msgstr "Szüneteltetés"
+
+#: src/components/systems-table/systems-table.tsx:143
+msgid "Paused"
+msgstr ""
+
+#: src/components/routes/settings/notifications.tsx:97
+msgid "Please <0>configure an SMTP server</0> to ensure alerts are delivered."
+msgstr "Kérjük, <0>konfigurálj egy SMTP szervert</0> az értesítések kézbesítésének biztosítása érdekében."
+
+#: src/components/alerts/alerts-system.tsx:27
+msgid "Please check logs for more details."
+msgstr "Kérjük, ellenőrizd a naplókat a további részletekért."
+
+#: src/components/login/forgot-pass-form.tsx:17
+#: src/components/login/auth-form.tsx:41
+msgid "Please check your credentials and try again"
+msgstr "Kérjük, ellenőrizze a hitelesítő adatait, és próbálja újra"
+
+#: src/components/login/login.tsx:36
+msgid "Please create an admin account"
+msgstr "Kérjük, hozzon létre egy admin fiókot"
+
+#: src/components/login/auth-form.tsx:138
+msgid "Please enable pop-ups for this site"
+msgstr "Kérjük, engedélyezze a felugró ablakokat ezen az oldalon"
+
+#: src/lib/utils.ts:49
+msgid "Please log in again"
+msgstr "Kérjük jelentkezz be újra"
+
+#: src/components/login/auth-form.tsx:308
+msgid "Please see <0>the documentation</0> for instructions."
+msgstr "Kérjük, nézze meg <0>a dokumentációt</0> az utasításokért."
+
+#: src/components/login/login.tsx:40
+msgid "Please sign in to your account"
+msgstr "Kérjük, jelentkezzen be a fiókjába"
+
+#: src/components/add-system.tsx:171
+msgid "Port"
+msgstr "Port"
+
+#: src/components/routes/system.tsx:457
+#: src/components/routes/system.tsx:577
+msgid "Precise utilization at the recorded time"
+msgstr "Pontos kihasználás a rögzített időpontban"
+
+#: src/components/routes/settings/general.tsx:58
+msgid "Preferred Language"
+msgstr "Preferált nyelv"
+
+#. Use 'Key' if your language requires many more characters
+#: src/components/add-system.tsx:182
+msgid "Public Key"
+msgstr "Nyilvános kulcs"
+
+#. Disk read
+#: src/components/charts/area-chart.tsx:62
+#: src/components/charts/area-chart.tsx:72
+msgid "Read"
+msgstr "Olvasás"
+
+#. Network bytes received (download)
+#: src/components/charts/area-chart.tsx:67
+msgid "Received"
+msgstr "Fogadott"
+
+#: src/components/login/forgot-pass-form.tsx:77
+msgid "Reset Password"
+msgstr "Jelszó visszaállítása"
+
+#: src/components/systems-table/systems-table.tsx:667
+msgid "Resume"
+msgstr "Folytatás"
+
+#: src/components/routes/settings/notifications.tsx:119
+msgid "Save address using enter key or comma. Leave blank to disable email notifications."
+msgstr "Mentse el a címet az Enter billentyű vagy a vessző használatával. Hagyja üresen az e-mail értesítések letiltásához."
+
+#: src/components/routes/settings/notifications.tsx:169
+#: src/components/routes/settings/general.tsx:106
+msgid "Save Settings"
+msgstr "Beállítások mentése"
+
+#: src/components/add-system.tsx:232
+msgid "Save system"
+msgstr ""
+
+#: src/components/navbar.tsx:134
+msgid "Search"
+msgstr "Keresés"
+
+#: src/components/command-palette.tsx:45
+msgid "Search for systems or settings..."
+msgstr "Keresés rendszerek vagy beállítások után..."
+
+#: src/components/alerts/alert-button.tsx:82
+msgid "See <0>notification settings</0> to configure how you receive alerts."
+msgstr "Lásd <0>az értesítési beállításokat</0>, hogy konfigurálja, hogyan kap értesítéseket."
+
+#. Network bytes sent (upload)
+#: src/components/charts/area-chart.tsx:66
+msgid "Sent"
+msgstr "Elküldve"
+
+#: src/components/routes/settings/general.tsx:100
+msgid "Sets the default time range for charts when a system is viewed."
+msgstr "Beállítja az alapértelmezett időtartamot a diagramokhoz, amikor egy rendszert néznek."
+
+#: src/components/command-palette.tsx:94
+#: src/components/command-palette.tsx:97
+#: src/components/command-palette.tsx:112
+#: src/components/routes/settings/layout.tsx:72
+#: src/components/routes/settings/layout.tsx:83
+msgid "Settings"
+msgstr "Beállítások"
+
+#: src/components/routes/settings/layout.tsx:34
+msgid "Settings saved"
+msgstr "Beállítások elmentve"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Sign in"
+msgstr "Bejelentkezés"
+
+#: src/components/command-palette.tsx:184
+msgid "SMTP settings"
+msgstr "SMTP beállítások"
+
+#: src/components/systems-table/systems-table.tsx:389
+msgid "Sort By"
+msgstr "Rendezés"
+
+#: src/lib/utils.ts:311
+msgid "Status"
+msgstr "Állapot"
+
+#: src/components/routes/system.tsx:523
+msgid "Swap space used by the system"
+msgstr "Rendszer által használt swap terület"
+
+#: src/components/routes/system.tsx:522
+msgid "Swap Usage"
+msgstr "Swap használat"
+
+#. System theme
+#: src/lib/utils.ts:316
+#: src/components/mode-toggle.tsx:27
+#: src/components/systems-table/systems-table.tsx:152
+msgid "System"
+msgstr "Rendszer"
+
+#: src/components/navbar.tsx:78
+msgid "Systems"
+msgstr "Rendszer"
+
+#: src/components/routes/settings/config-yaml.tsx:56
+msgid "Systems may be managed in a <0>config.yml</0> file inside your data directory."
+msgstr "A rendszereket egy <0>config.yml</0> fájlban lehet kezelni az adatkönyvtárban."
+
+#: src/components/systems-table/systems-table.tsx:377
+msgid "Table"
+msgstr "Tábla"
+
+#. Temperature label in systems table
+#: src/components/systems-table/systems-table.tsx:244
+msgid "Temp"
+msgstr ""
+
+#: src/lib/utils.ts:344
+#: src/components/routes/system.tsx:534
+msgid "Temperature"
+msgstr "Hőmérséklet"
+
+#: src/components/routes/system.tsx:535
+msgid "Temperatures of system sensors"
+msgstr "A rendszer érzékelőinek hőmérséklete"
+
+#: src/components/routes/settings/notifications.tsx:213
+msgid "Test <0>URL</0>"
+msgstr "Teszt <0>URL</0>"
+
+#: src/components/routes/settings/notifications.tsx:184
+msgid "Test notification sent"
+msgstr "Teszt értesítés elküldve"
+
+#: src/components/add-system.tsx:147
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr "A csatlakozáshoz az ügynöknek futnia kell a rendszerben. Másolja ki az alábbi telepítési parancsot az ügynök telepítéséhez."
+
+#: src/components/add-system.tsx:138
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr "A csatlakozáshoz az ügynöknek futnia kell a rendszerben. Másolja az<0>docker-compose.yml</0> fájlt az ügynök futtatásához."
+
+#: src/components/login/forgot-pass-form.tsx:99
+msgid "Then log into the backend and reset your user account password in the users table."
+msgstr "Ezután jelentkezzen be a backendbe, és állítsa vissza a felhasználói fiók jelszavát a felhasználók táblázatban."
+
+#: src/components/systems-table/systems-table.tsx:699
+msgid "This action cannot be undone. This will permanently delete all current records for {name} from the database."
+msgstr "Ezt a műveletet nem lehet visszavonni! Véglegesen törli a {name} összes jelenlegi rekordját az adatbázisból!"
+
+#: src/components/routes/system.tsx:615
+msgid "Throughput of {extraFsName}"
+msgstr "A {extraFsName} átviteli teljesítménye"
+
+#: src/components/routes/system.tsx:482
+msgid "Throughput of root filesystem"
+msgstr "A gyökér fájlrendszer átviteli teljesítménye"
+
+#: src/components/routes/settings/notifications.tsx:108
+msgid "To email(s)"
+msgstr "E-mailben"
+
+#: src/components/routes/system.tsx:409
+#: src/components/routes/system.tsx:422
+msgid "Toggle grid"
+msgstr "Rács ki- és bekapcsolása"
+
+#: src/components/mode-toggle.tsx:34
+msgid "Toggle theme"
+msgstr "Téma váltása"
+
+#: src/lib/utils.ts:347
+msgid "Triggers when any sensor exceeds a threshold"
+msgstr "Bekapcsol, ha bármelyik érzékelő túllép egy küszöbértéket"
+
+#: src/lib/utils.ts:340
+msgid "Triggers when combined up/down exceeds a threshold"
+msgstr "Bekapcsol, ha bármelyik érzékelő túllép egy küszöbértéket"
+
+#: src/lib/utils.ts:322
+msgid "Triggers when CPU usage exceeds a threshold"
+msgstr "Bekapcsol, ha a CPU érzékelő túllép egy küszöbértéket"
+
+#: src/lib/utils.ts:328
+msgid "Triggers when memory usage exceeds a threshold"
+msgstr "Bekapcsol, ha a Ram érzékelő túllép egy küszöbértéket"
+
+#: src/lib/utils.ts:314
+msgid "Triggers when status switches between up and down"
+msgstr "Bekapcsol, amikor az állapot fel és le között változik"
+
+#: src/lib/utils.ts:334
+msgid "Triggers when usage of any disk exceeds a threshold"
+msgstr "Bekapcsol, ha a lemez érzékelő túllép egy küszöbértéket"
+
+#. Context: System is up
+#: src/components/systems-table/systems-table.tsx:141
+#: src/components/routes/system.tsx:343
+msgid "Up"
+msgstr ""
+
+#: src/components/systems-table/systems-table.tsx:350
+msgid "Updated in real time. Click on a system to view information."
+msgstr "Valós időben frissítve. Kattintson egy rendszerre az információk megtekintéséhez."
+
+#: src/components/routes/system.tsx:270
+msgid "Uptime"
+msgstr "Üzemidő"
+
+#: src/components/routes/system.tsx:568
+#: src/components/routes/system.tsx:602
+#: src/components/charts/area-chart.tsx:75
+msgid "Usage"
+msgstr "Használat"
+
+#: src/components/routes/system.tsx:474
+msgid "Usage of root partition"
+msgstr "Root partíció kihasználtsága"
+
+#: src/components/charts/swap-chart.tsx:56
+#: src/components/charts/mem-chart.tsx:63
+#: src/components/charts/area-chart.tsx:75
+msgid "Used"
+msgstr "Felhasznált"
+
+#: src/components/navbar.tsx:70
+#: src/components/command-palette.tsx:141
+msgid "Users"
+msgstr "Felhasználók"
+
+#: src/components/systems-table/systems-table.tsx:359
+msgid "View"
+msgstr "Nézet"
+
+#: src/components/systems-table/systems-table.tsx:424
+msgid "Visible Fields"
+msgstr "Látható mezők"
+
+#: src/components/routes/system.tsx:707
+msgid "Waiting for enough records to display"
+msgstr "Elegendő rekordra várva a megjelenítéshez"
+
+#: src/components/routes/settings/general.tsx:48
+msgid "Want to help us make our translations even better? Check out <0>Crowdin</0> for more details."
+msgstr "Szeretne segíteni nekünk abban, hogy fordításaink még jobbak legyenek? További részletekért nézze meg a <0>Crowdin</0> honlapot."
+
+#: src/components/routes/settings/notifications.tsx:126
+msgid "Webhook / Push notifications"
+msgstr "Webhook / Push értesítések"
+
+#. Disk write
+#: src/components/charts/area-chart.tsx:61
+#: src/components/charts/area-chart.tsx:71
+msgid "Write"
+msgstr "Írás"
+
+#: src/components/routes/settings/layout.tsx:62
+msgid "YAML Config"
+msgstr "YAML konfiguráció"
+
+#: src/components/routes/settings/config-yaml.tsx:46
+msgid "YAML Configuration"
+msgstr "YAML konfiguráció"
+
+#: src/components/routes/settings/layout.tsx:35
+msgid "Your user settings have been updated."
+msgstr "A felhasználói beállítások frissítésre kerültek."

beszel/site/src/locales/is/is.po

@@ -0,0 +1,871 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2024-11-01 11:30-0400\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: is\n"
+"Project-Id-Version: beszel\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2025-03-06 07:27\n"
+"Last-Translator: \n"
+"Language-Team: Icelandic\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: beszel\n"
+"X-Crowdin-Project-ID: 733311\n"
+"X-Crowdin-Language: is\n"
+"X-Crowdin-File: /main/beszel/site/src/locales/en/en.po\n"
+"X-Crowdin-File-ID: 16\n"
+
+#. placeholder {0}: Math.trunc(system.info?.u / 86400)
+#: src/components/routes/system.tsx:259
+msgid "{0, plural, one {# day} other {# days}}"
+msgstr "{0, plural, one {# dagur} other {# dagar}}"
+
+#: src/components/routes/system.tsx:257
+msgid "{hours, plural, one {# hour} other {# hours}}"
+msgstr "{hours, plural, one {# klukkustund} other {# klukkustundir}}"
+
+#: src/lib/utils.ts:168
+msgid "1 hour"
+msgstr "1 klukkustund"
+
+#: src/lib/utils.ts:191
+msgid "1 week"
+msgstr "1 vika"
+
+#: src/lib/utils.ts:176
+msgid "12 hours"
+msgstr "12 klukkustundir"
+
+#: src/lib/utils.ts:184
+msgid "24 hours"
+msgstr "24 klukkustundir"
+
+#: src/lib/utils.ts:199
+msgid "30 days"
+msgstr "30 dagar"
+
+#. Table column
+#: src/components/systems-table/systems-table.tsx:304
+msgid "Actions"
+msgstr "Aðgerðir"
+
+#: src/components/routes/home.tsx:94
+msgid "Active Alerts"
+msgstr "Virkar tilkynningar"
+
+#: src/components/add-system.tsx:43
+msgid "Add <0>System</0>"
+msgstr "Bæta við <0>Kerfi</0>"
+
+#: src/components/add-system.tsx:126
+msgid "Add New System"
+msgstr "Bæta við nýju kerfi"
+
+#: src/components/add-system.tsx:232
+msgid "Add system"
+msgstr "Bæta við kerfi"
+
+#: src/components/routes/settings/notifications.tsx:158
+msgid "Add URL"
+msgstr "Bæta við léni"
+
+#: src/components/routes/settings/general.tsx:81
+msgid "Adjust display options for charts."
+msgstr ""
+
+#: src/components/command-palette.tsx:131
+#: src/components/command-palette.tsx:144
+#: src/components/command-palette.tsx:158
+#: src/components/command-palette.tsx:172
+#: src/components/command-palette.tsx:187
+msgid "Admin"
+msgstr "Admin"
+
+#: src/components/systems-table/systems-table.tsx:270
+msgid "Agent"
+msgstr ""
+
+#: src/components/alerts/alert-button.tsx:33
+#: src/components/alerts/alert-button.tsx:79
+msgid "Alerts"
+msgstr "Tilkynningar"
+
+#: src/components/systems-table/systems-table.tsx:347
+#: src/components/alerts/alert-button.tsx:99
+msgid "All Systems"
+msgstr "Öll kerfi"
+
+#: src/components/systems-table/systems-table.tsx:696
+msgid "Are you sure you want to delete {name}?"
+msgstr "Ertu viss um að þú viljir eyða {name}?"
+
+#: src/components/copy-to-clipboard.tsx:16
+msgid "Automatic copy requires a secure context."
+msgstr "Sjálfvisk afritun krefst öruggs samhengis."
+
+#: src/components/routes/system.tsx:670
+msgid "Average"
+msgstr "Meðal"
+
+#: src/components/routes/system.tsx:446
+msgid "Average CPU utilization of containers"
+msgstr "Meðal örgjörva notkun container-a."
+
+#. placeholder {0}: data.alert.unit
+#: src/components/alerts/alerts-system.tsx:253
+msgid "Average exceeds <0>{value}{0}</0>"
+msgstr "Meðaltal er yfir <0>{value}{0}</0>"
+
+#: src/components/routes/system.tsx:547
+msgid "Average power consumption of GPUs"
+msgstr "Meðal orkunotkun skjákorta"
+
+#: src/components/routes/system.tsx:435
+msgid "Average system-wide CPU utilization"
+msgstr "Meðal nýting örgjörva yfir allt kerfið"
+
+#. placeholder {0}: gpu.n
+#: src/components/routes/system.tsx:569
+msgid "Average utilization of {0}"
+msgstr "Meðal notkun af {0}"
+
+#: src/components/navbar.tsx:94
+#: src/components/command-palette.tsx:169
+msgid "Backups"
+msgstr "Öryggisafrit"
+
+#: src/lib/utils.ts:337
+#: src/components/routes/system.tsx:491
+msgid "Bandwidth"
+msgstr "Gangnaflutningsgeta"
+
+#: src/components/login/auth-form.tsx:305
+msgid "Beszel supports OpenID Connect and many OAuth2 authentication providers."
+msgstr "Beszel styður OpenID Connect og margar OAuth2 auðkenningarveitendur."
+
+#: src/components/routes/settings/notifications.tsx:129
+msgid "Beszel uses <0>Shoutrrr</0> to integrate with popular notification services."
+msgstr "Beszel notar <0>Shoutrrr</0> til að tengjast vinsælum tilkynningaþjónustum."
+
+#: src/components/add-system.tsx:131
+msgid "Binary"
+msgstr "Binary"
+
+#: src/components/charts/mem-chart.tsx:87
+msgid "Cache / Buffers"
+msgstr "Skyndiminni / Biðminni"
+
+#: src/components/systems-table/systems-table.tsx:707
+msgid "Cancel"
+msgstr "Hætta við"
+
+#: src/components/routes/settings/config-yaml.tsx:69
+msgid "Caution - potential data loss"
+msgstr "Aðvörun - möguleiki á gagnatapi"
+
+#: src/components/routes/settings/general.tsx:36
+msgid "Change general application options."
+msgstr "Breyta almennum stillingum."
+
+#: src/components/routes/settings/general.tsx:78
+msgid "Chart options"
+msgstr "Valkostir fyrir línurit"
+
+#: src/components/login/forgot-pass-form.tsx:35
+msgid "Check {email} for a reset link."
+msgstr "Skoðaðu {email} fyrir endurstillingar lén."
+
+#: src/components/routes/settings/layout.tsx:41
+msgid "Check logs for more details."
+msgstr "Skoðaðu logga til að sjá meiri upplýsingar."
+
+#: src/components/routes/settings/notifications.tsx:185
+msgid "Check your notification service"
+msgstr "Athugaðu tilkynningaþjónustuna þína"
+
+#: src/components/add-system.tsx:205
+msgid "Click to copy"
+msgstr "Smelltu til að afrita"
+
+#: src/components/login/forgot-pass-form.tsx:84
+#: src/components/login/forgot-pass-form.tsx:90
+msgid "Command line instructions"
+msgstr "Skipanalínu leiðbeiningar"
+
+#: src/components/routes/settings/notifications.tsx:79
+msgid "Configure how you receive alert notifications."
+msgstr "Stilltu hvernig þú vilt fá tilkynningar."
+
+#: src/components/login/auth-form.tsx:213
+#: src/components/login/auth-form.tsx:218
+msgid "Confirm password"
+msgstr "Staðfestu lykilorð"
+
+#: src/components/systems-table/systems-table.tsx:713
+msgid "Continue"
+msgstr "Halda áfram"
+
+#: src/lib/utils.ts:35
+msgid "Copied to clipboard"
+msgstr "Afritað í klippiborð"
+
+#: src/components/add-system.tsx:216
+#: src/components/add-system.tsx:218
+msgid "Copy"
+msgstr "Afrita"
+
+#: src/components/systems-table/systems-table.tsx:678
+msgid "Copy host"
+msgstr "Afrita host"
+
+#: src/components/add-system.tsx:225
+msgid "Copy Linux command"
+msgstr "Afrita Linux aðgerð"
+
+#: src/components/copy-to-clipboard.tsx:13
+msgid "Copy text"
+msgstr "Afrita texta"
+
+#: src/components/systems-table/systems-table.tsx:186
+msgid "CPU"
+msgstr "Örgjörvi"
+
+#: src/lib/utils.ts:319
+#: src/components/routes/system.tsx:434
+#: src/components/charts/area-chart.tsx:58
+msgid "CPU Usage"
+msgstr "Örgjörva notkun"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Create account"
+msgstr "Búa til aðgang"
+
+#. Dark theme
+#: src/components/mode-toggle.tsx:22
+msgid "Dark"
+msgstr "Dökkt"
+
+#: src/components/command-palette.tsx:80
+#: src/components/routes/home.tsx:36
+msgid "Dashboard"
+msgstr "Yfirlitssíða"
+
+#: src/components/routes/settings/general.tsx:85
+msgid "Default time period"
+msgstr "Sjálfgefið tímabil"
+
+#: src/components/systems-table/systems-table.tsx:683
+msgid "Delete"
+msgstr "Eyða"
+
+#: src/components/systems-table/systems-table.tsx:204
+msgid "Disk"
+msgstr "Diskur"
+
+#: src/components/routes/system.tsx:481
+msgid "Disk I/O"
+msgstr ""
+
+#: src/lib/utils.ts:331
+#: src/components/routes/system.tsx:474
+#: src/components/charts/disk-chart.tsx:77
+msgid "Disk Usage"
+msgstr "Diskanotkun"
+
+#: src/components/routes/system.tsx:603
+msgid "Disk usage of {extraFsName}"
+msgstr "Diska notkun af {extraFsName}"
+
+#: src/components/routes/system.tsx:445
+msgid "Docker CPU Usage"
+msgstr "Docker CPU notkun"
+
+#: src/components/routes/system.tsx:466
+msgid "Docker Memory Usage"
+msgstr "Minnisnotkun Docker"
+
+#: src/components/routes/system.tsx:507
+msgid "Docker Network I/O"
+msgstr ""
+
+#: src/components/command-palette.tsx:123
+msgid "Documentation"
+msgstr "Skjal"
+
+#. Context: System is down
+#: src/lib/utils.ts:316
+#: src/components/systems-table/systems-table.tsx:142
+#: src/components/routes/system.tsx:345
+msgid "Down"
+msgstr ""
+
+#: src/components/add-system.tsx:126
+#: src/components/systems-table/systems-table.tsx:653
+msgid "Edit"
+msgstr ""
+
+#: src/components/login/forgot-pass-form.tsx:54
+#: src/components/login/auth-form.tsx:176
+msgid "Email"
+msgstr "Netfang"
+
+#: src/components/routes/settings/notifications.tsx:93
+msgid "Email notifications"
+msgstr "Tilkynningar í tölvupósti"
+
+#: src/components/login/login.tsx:38
+msgid "Enter email address to reset password"
+msgstr "Settu netfang til að endursetja lykilorð"
+
+#: src/components/routes/settings/notifications.tsx:113
+msgid "Enter email address..."
+msgstr "Settu inn Netfang..."
+
+#: src/components/routes/settings/notifications.tsx:189
+#: src/components/routes/settings/config-yaml.tsx:29
+#: src/components/login/auth-form.tsx:137
+msgid "Error"
+msgstr "Villa"
+
+#. placeholder {0}: alert.value
+#. placeholder {1}: info.unit
+#. placeholder {2}: alert.min
+#: src/components/routes/home.tsx:113
+msgid "Exceeds {0}{1} in last {2, plural, one {# minute} other {# minutes}}"
+msgstr "Fór yfir {0}{1} á síðustu {2, plural, one {# mínútu} other {# mínútum}}"
+
+#: src/components/routes/settings/config-yaml.tsx:73
+msgid "Existing systems not defined in <0>config.yml</0> will be deleted. Please make regular backups."
+msgstr ""
+
+#: src/components/routes/settings/config-yaml.tsx:94
+msgid "Export configuration"
+msgstr ""
+
+#: src/components/routes/settings/config-yaml.tsx:49
+msgid "Export your current systems configuration."
+msgstr ""
+
+#: src/lib/utils.ts:48
+msgid "Failed to authenticate"
+msgstr "Villa í auðkenningu"
+
+#: src/components/routes/settings/notifications.tsx:64
+#: src/components/routes/settings/layout.tsx:40
+msgid "Failed to save settings"
+msgstr "Villa við að vista stillingar"
+
+#: src/components/routes/settings/notifications.tsx:190
+msgid "Failed to send test notification"
+msgstr "Villa í sendingu prufu skilaboða"
+
+#: src/components/alerts/alerts-system.tsx:26
+msgid "Failed to update alert"
+msgstr "Mistókst að uppfæra tilkynningu"
+
+#: src/components/systems-table/systems-table.tsx:354
+#: src/components/routes/system.tsx:643
+msgid "Filter..."
+msgstr "Sía..."
+
+#: src/components/alerts/alerts-system.tsx:285
+msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
+msgstr ""
+
+#: src/components/login/auth-form.tsx:328
+msgid "Forgot password?"
+msgstr "Gleymt lykilorð?"
+
+#. Context: General settings
+#: src/components/routes/settings/layout.tsx:52
+#: src/components/routes/settings/general.tsx:33
+msgid "General"
+msgstr "Almennt"
+
+#: src/components/routes/system.tsx:546
+msgid "GPU Power Draw"
+msgstr "Skjákorts rafmagnsnotkun"
+
+#: src/components/systems-table/systems-table.tsx:381
+msgid "Grid"
+msgstr ""
+
+#: src/components/add-system.tsx:159
+msgid "Host / IP"
+msgstr "Host / IP"
+
+#: src/components/login/forgot-pass-form.tsx:94
+msgid "If you've lost the password to your admin account, you may reset it using the following command."
+msgstr ""
+
+#: src/components/login/auth-form.tsx:18
+msgid "Invalid email address."
+msgstr "Ógilt netfang."
+
+#. Linux kernel
+#: src/components/routes/system.tsx:271
+msgid "Kernel"
+msgstr ""
+
+#: src/components/routes/settings/general.tsx:45
+msgid "Language"
+msgstr "Tungumál"
+
+#: src/components/systems-table/systems-table.tsx:367
+msgid "Layout"
+msgstr ""
+
+#. Light theme
+#: src/components/mode-toggle.tsx:17
+msgid "Light"
+msgstr "Ljóst"
+
+#: src/components/navbar.tsx:105
+msgid "Log Out"
+msgstr "Útskrá"
+
+#: src/components/login/login.tsx:19
+msgid "Login"
+msgstr "Innskrá"
+
+#: src/components/login/forgot-pass-form.tsx:16
+#: src/components/login/auth-form.tsx:40
+msgid "Login attempt failed"
+msgstr "Innskránings tilraun misheppnaðist"
+
+#: src/components/navbar.tsx:86
+#: src/components/command-palette.tsx:155
+msgid "Logs"
+msgstr "Loggar"
+
+#: src/components/routes/settings/notifications.tsx:82
+msgid "Looking instead for where to create alerts? Click the bell <0/> icons in the systems table."
+msgstr ""
+
+#: src/components/routes/settings/layout.tsx:86
+msgid "Manage display and notification preferences."
+msgstr ""
+
+#: src/components/add-system.tsx:227
+msgid "Manual setup instructions"
+msgstr ""
+
+#. Chart select field. Please try to keep this short.
+#: src/components/routes/system.tsx:673
+msgid "Max 1 min"
+msgstr "Mest 1 mínúta"
+
+#: src/components/systems-table/systems-table.tsx:195
+msgid "Memory"
+msgstr "Minni"
+
+#: src/lib/utils.ts:325
+#: src/components/routes/system.tsx:456
+msgid "Memory Usage"
+msgstr "Minnisnotkun"
+
+#: src/components/routes/system.tsx:467
+msgid "Memory usage of docker containers"
+msgstr "Minnisnotkun docker kerfa"
+
+#: src/components/add-system.tsx:155
+msgid "Name"
+msgstr "Nafn"
+
+#: src/components/systems-table/systems-table.tsx:223
+msgid "Net"
+msgstr "Net"
+
+#: src/components/routes/system.tsx:508
+msgid "Network traffic of docker containers"
+msgstr "Net traffík docker kerfa"
+
+#: src/components/routes/system.tsx:493
+msgid "Network traffic of public interfaces"
+msgstr ""
+
+#: src/components/command-palette.tsx:48
+msgid "No results found."
+msgstr "Engar niðurstöður fundust."
+
+#: src/components/systems-table/systems-table.tsx:472
+#: src/components/systems-table/systems-table.tsx:495
+msgid "No systems found."
+msgstr "Engin kerfi fundust."
+
+#: src/components/command-palette.tsx:109
+#: src/components/routes/settings/notifications.tsx:76
+#: src/components/routes/settings/layout.tsx:57
+msgid "Notifications"
+msgstr "Tilkynningar"
+
+#: src/components/login/auth-form.tsx:300
+msgid "OAuth 2 / OIDC support"
+msgstr "OAuth 2 / OIDC stuðningur"
+
+#: src/components/routes/settings/config-yaml.tsx:62
+msgid "On each restart, systems in the database will be updated to match the systems defined in the file."
+msgstr ""
+
+#: src/components/systems-table/systems-table.tsx:639
+msgid "Open menu"
+msgstr "Opna valmynd"
+
+#: src/components/login/auth-form.tsx:251
+msgid "Or continue with"
+msgstr "Eða halda áfram með"
+
+#: src/components/alerts/alert-button.tsx:120
+msgid "Overwrite existing alerts"
+msgstr "Yfirskrifa núverandi tilkynningu"
+
+#: src/components/command-palette.tsx:83
+msgid "Page"
+msgstr "Síða"
+
+#: src/components/command-palette.tsx:70
+msgid "Pages / Settings"
+msgstr "Síða / Stillingar"
+
+#: src/components/login/auth-form.tsx:195
+#: src/components/login/auth-form.tsx:200
+msgid "Password"
+msgstr "Lykilorð"
+
+#: src/components/login/auth-form.tsx:21
+msgid "Password must be at least 8 characters."
+msgstr "Lykilorðið verður að vera minnst 8 stafir."
+
+#: src/components/login/auth-form.tsx:22
+msgid "Password must be less than 72 bytes."
+msgstr ""
+
+#: src/components/login/forgot-pass-form.tsx:34
+msgid "Password reset request received"
+msgstr "Beiðni um að endurstilla lykilorð móttekin"
+
+#: src/components/systems-table/systems-table.tsx:672
+msgid "Pause"
+msgstr "Pása"
+
+#: src/components/systems-table/systems-table.tsx:143
+msgid "Paused"
+msgstr ""
+
+#: src/components/routes/settings/notifications.tsx:97
+msgid "Please <0>configure an SMTP server</0> to ensure alerts are delivered."
+msgstr ""
+
+#: src/components/alerts/alerts-system.tsx:27
+msgid "Please check logs for more details."
+msgstr "Skoðaðu logga til að sjá meiri upplýsingar."
+
+#: src/components/login/forgot-pass-form.tsx:17
+#: src/components/login/auth-form.tsx:41
+msgid "Please check your credentials and try again"
+msgstr "Vinsamlegast farðu yfir upplýsingarnar þínar og reyndu aftur"
+
+#: src/components/login/login.tsx:36
+msgid "Please create an admin account"
+msgstr "Vinsamlegast búðu til admin aðgang"
+
+#: src/components/login/auth-form.tsx:138
+msgid "Please enable pop-ups for this site"
+msgstr ""
+
+#: src/lib/utils.ts:49
+msgid "Please log in again"
+msgstr "Vinsamlegast skráðu þið inn aftur"
+
+#: src/components/login/auth-form.tsx:308
+msgid "Please see <0>the documentation</0> for instructions."
+msgstr "Vinsamlegast skoðaðu <0>skjölin</0> fyrir leiðbeiningar."
+
+#: src/components/login/login.tsx:40
+msgid "Please sign in to your account"
+msgstr "Vinsamlegast skráðu þig inn á aðganginn þinn"
+
+#: src/components/add-system.tsx:171
+msgid "Port"
+msgstr "Port"
+
+#: src/components/routes/system.tsx:457
+#: src/components/routes/system.tsx:577
+msgid "Precise utilization at the recorded time"
+msgstr ""
+
+#: src/components/routes/settings/general.tsx:58
+msgid "Preferred Language"
+msgstr "Valið tungumál"
+
+#. Use 'Key' if your language requires many more characters
+#: src/components/add-system.tsx:182
+msgid "Public Key"
+msgstr "Dreifilykill"
+
+#. Disk read
+#: src/components/charts/area-chart.tsx:62
+#: src/components/charts/area-chart.tsx:72
+msgid "Read"
+msgstr "Lesa"
+
+#. Network bytes received (download)
+#: src/components/charts/area-chart.tsx:67
+msgid "Received"
+msgstr "Móttekið"
+
+#: src/components/login/forgot-pass-form.tsx:77
+msgid "Reset Password"
+msgstr "Endurstilla lykilorð"
+
+#: src/components/systems-table/systems-table.tsx:667
+msgid "Resume"
+msgstr "Halda áfram"
+
+#: src/components/routes/settings/notifications.tsx:119
+msgid "Save address using enter key or comma. Leave blank to disable email notifications."
+msgstr ""
+
+#: src/components/routes/settings/notifications.tsx:169
+#: src/components/routes/settings/general.tsx:106
+msgid "Save Settings"
+msgstr "Vista stillingar"
+
+#: src/components/add-system.tsx:232
+msgid "Save system"
+msgstr ""
+
+#: src/components/navbar.tsx:134
+msgid "Search"
+msgstr "Leita"
+
+#: src/components/command-palette.tsx:45
+msgid "Search for systems or settings..."
+msgstr "Leita að kerfum eða stillingum..."
+
+#: src/components/alerts/alert-button.tsx:82
+msgid "See <0>notification settings</0> to configure how you receive alerts."
+msgstr ""
+
+#. Network bytes sent (upload)
+#: src/components/charts/area-chart.tsx:66
+msgid "Sent"
+msgstr "Sent"
+
+#: src/components/routes/settings/general.tsx:100
+msgid "Sets the default time range for charts when a system is viewed."
+msgstr ""
+
+#: src/components/command-palette.tsx:94
+#: src/components/command-palette.tsx:97
+#: src/components/command-palette.tsx:112
+#: src/components/routes/settings/layout.tsx:72
+#: src/components/routes/settings/layout.tsx:83
+msgid "Settings"
+msgstr "Stillingar"
+
+#: src/components/routes/settings/layout.tsx:34
+msgid "Settings saved"
+msgstr "Stillingar vistaðar"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Sign in"
+msgstr "Innskrá"
+
+#: src/components/command-palette.tsx:184
+msgid "SMTP settings"
+msgstr "SMTP stillingar"
+
+#: src/components/systems-table/systems-table.tsx:389
+msgid "Sort By"
+msgstr "Raða eftir"
+
+#: src/lib/utils.ts:311
+msgid "Status"
+msgstr "Staða"
+
+#: src/components/routes/system.tsx:523
+msgid "Swap space used by the system"
+msgstr ""
+
+#: src/components/routes/system.tsx:522
+msgid "Swap Usage"
+msgstr "Skipti minni"
+
+#. System theme
+#: src/lib/utils.ts:316
+#: src/components/mode-toggle.tsx:27
+#: src/components/systems-table/systems-table.tsx:152
+msgid "System"
+msgstr "Kerfi"
+
+#: src/components/navbar.tsx:78
+msgid "Systems"
+msgstr "Kerfi"
+
+#: src/components/routes/settings/config-yaml.tsx:56
+msgid "Systems may be managed in a <0>config.yml</0> file inside your data directory."
+msgstr ""
+
+#: src/components/systems-table/systems-table.tsx:377
+msgid "Table"
+msgstr "Tafla"
+
+#. Temperature label in systems table
+#: src/components/systems-table/systems-table.tsx:244
+msgid "Temp"
+msgstr ""
+
+#: src/lib/utils.ts:344
+#: src/components/routes/system.tsx:534
+msgid "Temperature"
+msgstr "Hitastig"
+
+#: src/components/routes/system.tsx:535
+msgid "Temperatures of system sensors"
+msgstr "Hitastig kerfa skynjara"
+
+#: src/components/routes/settings/notifications.tsx:213
+msgid "Test <0>URL</0>"
+msgstr "Prufa <0>URL</0>"
+
+#: src/components/routes/settings/notifications.tsx:184
+msgid "Test notification sent"
+msgstr "Prufu tilkynning send"
+
+#: src/components/add-system.tsx:147
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr ""
+
+#: src/components/add-system.tsx:138
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr ""
+
+#: src/components/login/forgot-pass-form.tsx:99
+msgid "Then log into the backend and reset your user account password in the users table."
+msgstr "Skráðu þig þá inní bakendann og endurstilltu lykilorðið þitt inni í notenda töflunni."
+
+#: src/components/systems-table/systems-table.tsx:699
+msgid "This action cannot be undone. This will permanently delete all current records for {name} from the database."
+msgstr "Þessi aðgerð er óafturkvæmanleg. Þetta mun eyða gögnum fyrir {name} varanlega úr gagnagrunninum."
+
+#: src/components/routes/system.tsx:615
+msgid "Throughput of {extraFsName}"
+msgstr ""
+
+#: src/components/routes/system.tsx:482
+msgid "Throughput of root filesystem"
+msgstr ""
+
+#: src/components/routes/settings/notifications.tsx:108
+msgid "To email(s)"
+msgstr "Til tölvupósta"
+
+#: src/components/routes/system.tsx:409
+#: src/components/routes/system.tsx:422
+msgid "Toggle grid"
+msgstr ""
+
+#: src/components/mode-toggle.tsx:34
+msgid "Toggle theme"
+msgstr "Velja þema"
+
+#: src/lib/utils.ts:347
+msgid "Triggers when any sensor exceeds a threshold"
+msgstr "Virkjast þegar einhver skynjari fer yfir þröskuld"
+
+#: src/lib/utils.ts:340
+msgid "Triggers when combined up/down exceeds a threshold"
+msgstr "Virkjast þegar samanlagt sent/móttekið fer yfir þröskuld"
+
+#: src/lib/utils.ts:322
+msgid "Triggers when CPU usage exceeds a threshold"
+msgstr "Virkjast þegar örgjörva notkun fer yfir þröskuld"
+
+#: src/lib/utils.ts:328
+msgid "Triggers when memory usage exceeds a threshold"
+msgstr "Virkjast þegar minnisnotkun fer yfir þröskuld"
+
+#: src/lib/utils.ts:314
+msgid "Triggers when status switches between up and down"
+msgstr "Virkjast þegar staða breytist milli virkur og óvirkur"
+
+#: src/lib/utils.ts:334
+msgid "Triggers when usage of any disk exceeds a threshold"
+msgstr "Virkjast þegar diska notkun fer yfir þröskuld"
+
+#. Context: System is up
+#: src/components/systems-table/systems-table.tsx:141
+#: src/components/routes/system.tsx:343
+msgid "Up"
+msgstr ""
+
+#: src/components/systems-table/systems-table.tsx:350
+msgid "Updated in real time. Click on a system to view information."
+msgstr "Uppfærist í rauntíma. Veldu kerfi til að skoða upplýsingar."
+
+#: src/components/routes/system.tsx:270
+msgid "Uptime"
+msgstr ""
+
+#: src/components/routes/system.tsx:568
+#: src/components/routes/system.tsx:602
+#: src/components/charts/area-chart.tsx:75
+msgid "Usage"
+msgstr ""
+
+#: src/components/routes/system.tsx:474
+msgid "Usage of root partition"
+msgstr ""
+
+#: src/components/charts/swap-chart.tsx:56
+#: src/components/charts/mem-chart.tsx:63
+#: src/components/charts/area-chart.tsx:75
+msgid "Used"
+msgstr "Notað"
+
+#: src/components/navbar.tsx:70
+#: src/components/command-palette.tsx:141
+msgid "Users"
+msgstr "Notendur"
+
+#: src/components/systems-table/systems-table.tsx:359
+msgid "View"
+msgstr "Skoða"
+
+#: src/components/systems-table/systems-table.tsx:424
+msgid "Visible Fields"
+msgstr "Sjáanlegir reitir"
+
+#: src/components/routes/system.tsx:707
+msgid "Waiting for enough records to display"
+msgstr "Bíður eftir nægum upplýsingum til að sýna"
+
+#: src/components/routes/settings/general.tsx:48
+msgid "Want to help us make our translations even better? Check out <0>Crowdin</0> for more details."
+msgstr ""
+
+#: src/components/routes/settings/notifications.tsx:126
+msgid "Webhook / Push notifications"
+msgstr "Webhook / Tilkynningar"
+
+#. Disk write
+#: src/components/charts/area-chart.tsx:61
+#: src/components/charts/area-chart.tsx:71
+msgid "Write"
+msgstr "Skrifa"
+
+#: src/components/routes/settings/layout.tsx:62
+msgid "YAML Config"
+msgstr ""
+
+#: src/components/routes/settings/config-yaml.tsx:46
+msgid "YAML Configuration"
+msgstr ""
+
+#: src/components/routes/settings/layout.tsx:35
+msgid "Your user settings have been updated."
+msgstr "Notenda stillingar vistaðar."

beszel/site/src/locales/no/no.po

@@ -0,0 +1,871 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2024-11-01 11:30-0400\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: no\n"
+"Project-Id-Version: beszel\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2025-03-06 07:27\n"
+"Last-Translator: \n"
+"Language-Team: Norwegian\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: beszel\n"
+"X-Crowdin-Project-ID: 733311\n"
+"X-Crowdin-Language: no\n"
+"X-Crowdin-File: /main/beszel/site/src/locales/en/en.po\n"
+"X-Crowdin-File-ID: 16\n"
+
+#. placeholder {0}: Math.trunc(system.info?.u / 86400)
+#: src/components/routes/system.tsx:259
+msgid "{0, plural, one {# day} other {# days}}"
+msgstr "{0, plural, one {# dag} other {# dager}}"
+
+#: src/components/routes/system.tsx:257
+msgid "{hours, plural, one {# hour} other {# hours}}"
+msgstr "{hours, plural, one {# time} other {# timer}}"
+
+#: src/lib/utils.ts:168
+msgid "1 hour"
+msgstr "1 time"
+
+#: src/lib/utils.ts:191
+msgid "1 week"
+msgstr "1 uke"
+
+#: src/lib/utils.ts:176
+msgid "12 hours"
+msgstr "12 timer"
+
+#: src/lib/utils.ts:184
+msgid "24 hours"
+msgstr "24 timer"
+
+#: src/lib/utils.ts:199
+msgid "30 days"
+msgstr "30 dager"
+
+#. Table column
+#: src/components/systems-table/systems-table.tsx:304
+msgid "Actions"
+msgstr "Handlinger"
+
+#: src/components/routes/home.tsx:94
+msgid "Active Alerts"
+msgstr "Aktive Alarmer"
+
+#: src/components/add-system.tsx:43
+msgid "Add <0>System</0>"
+msgstr "Legg til <0>System</0>"
+
+#: src/components/add-system.tsx:126
+msgid "Add New System"
+msgstr "Legg Til Nytt System"
+
+#: src/components/add-system.tsx:232
+msgid "Add system"
+msgstr "Legg til system"
+
+#: src/components/routes/settings/notifications.tsx:158
+msgid "Add URL"
+msgstr "Legg Til URL"
+
+#: src/components/routes/settings/general.tsx:81
+msgid "Adjust display options for charts."
+msgstr "Juster visningsalternativer for diagrammer."
+
+#: src/components/command-palette.tsx:131
+#: src/components/command-palette.tsx:144
+#: src/components/command-palette.tsx:158
+#: src/components/command-palette.tsx:172
+#: src/components/command-palette.tsx:187
+msgid "Admin"
+msgstr "Admin"
+
+#: src/components/systems-table/systems-table.tsx:270
+msgid "Agent"
+msgstr "Agent"
+
+#: src/components/alerts/alert-button.tsx:33
+#: src/components/alerts/alert-button.tsx:79
+msgid "Alerts"
+msgstr "Alarmer"
+
+#: src/components/systems-table/systems-table.tsx:347
+#: src/components/alerts/alert-button.tsx:99
+msgid "All Systems"
+msgstr "Alle Systemer"
+
+#: src/components/systems-table/systems-table.tsx:696
+msgid "Are you sure you want to delete {name}?"
+msgstr "Er du sikker på at du vil slette {name}?"
+
+#: src/components/copy-to-clipboard.tsx:16
+msgid "Automatic copy requires a secure context."
+msgstr "Automatisk kopiering krever en sikker kontekst."
+
+#: src/components/routes/system.tsx:670
+msgid "Average"
+msgstr "Gjennomsnitt"
+
+#: src/components/routes/system.tsx:446
+msgid "Average CPU utilization of containers"
+msgstr "Gjennomsnittlig CPU-utnyttelse av konteinere"
+
+#. placeholder {0}: data.alert.unit
+#: src/components/alerts/alerts-system.tsx:253
+msgid "Average exceeds <0>{value}{0}</0>"
+msgstr "Gjennomsnittet overstiger <0>{value}{0}</0>"
+
+#: src/components/routes/system.tsx:547
+msgid "Average power consumption of GPUs"
+msgstr "Gjennomsnittlig strømforbruk for GPU-er"
+
+#: src/components/routes/system.tsx:435
+msgid "Average system-wide CPU utilization"
+msgstr "Gjennomsnittlig CPU-utnyttelse for hele systemet"
+
+#. placeholder {0}: gpu.n
+#: src/components/routes/system.tsx:569
+msgid "Average utilization of {0}"
+msgstr "Gjennomsnittlig utnyttelse av {0}"
+
+#: src/components/navbar.tsx:94
+#: src/components/command-palette.tsx:169
+msgid "Backups"
+msgstr "Sikkerhetskopier"
+
+#: src/lib/utils.ts:337
+#: src/components/routes/system.tsx:491
+msgid "Bandwidth"
+msgstr "Båndbredde"
+
+#: src/components/login/auth-form.tsx:305
+msgid "Beszel supports OpenID Connect and many OAuth2 authentication providers."
+msgstr "Beszel støtter OpenID Connect og mange OAuth2 autentiserings-tilbydere."
+
+#: src/components/routes/settings/notifications.tsx:129
+msgid "Beszel uses <0>Shoutrrr</0> to integrate with popular notification services."
+msgstr "Beszel bruker <0>Shoutrrr</0> for integrering mot populære meldingstjenester."
+
+#: src/components/add-system.tsx:131
+msgid "Binary"
+msgstr "Binær"
+
+#: src/components/charts/mem-chart.tsx:87
+msgid "Cache / Buffers"
+msgstr "Cache / Buffere"
+
+#: src/components/systems-table/systems-table.tsx:707
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/components/routes/settings/config-yaml.tsx:69
+msgid "Caution - potential data loss"
+msgstr "Advarsel - potensielt tap av data"
+
+#: src/components/routes/settings/general.tsx:36
+msgid "Change general application options."
+msgstr "Endre generelle program-innstillinger."
+
+#: src/components/routes/settings/general.tsx:78
+msgid "Chart options"
+msgstr "Diagraminnstillinger"
+
+#: src/components/login/forgot-pass-form.tsx:35
+msgid "Check {email} for a reset link."
+msgstr "Sjekk {email} for en nullstillings-link."
+
+#: src/components/routes/settings/layout.tsx:41
+msgid "Check logs for more details."
+msgstr "Sjekk loggene for flere detaljer."
+
+#: src/components/routes/settings/notifications.tsx:185
+msgid "Check your notification service"
+msgstr "Sjekk din meldingstjeneste"
+
+#: src/components/add-system.tsx:205
+msgid "Click to copy"
+msgstr "Klikk for å kopiere"
+
+#: src/components/login/forgot-pass-form.tsx:84
+#: src/components/login/forgot-pass-form.tsx:90
+msgid "Command line instructions"
+msgstr "Kommandolinje-instrukser"
+
+#: src/components/routes/settings/notifications.tsx:79
+msgid "Configure how you receive alert notifications."
+msgstr "Konfigurer hvordan du vil motta alarmvarsler."
+
+#: src/components/login/auth-form.tsx:213
+#: src/components/login/auth-form.tsx:218
+msgid "Confirm password"
+msgstr "Bekreft passord"
+
+#: src/components/systems-table/systems-table.tsx:713
+msgid "Continue"
+msgstr "Fortsett"
+
+#: src/lib/utils.ts:35
+msgid "Copied to clipboard"
+msgstr "Kopiert til utklippstavlen"
+
+#: src/components/add-system.tsx:216
+#: src/components/add-system.tsx:218
+msgid "Copy"
+msgstr "Kopier"
+
+#: src/components/systems-table/systems-table.tsx:678
+msgid "Copy host"
+msgstr "Kopier vert"
+
+#: src/components/add-system.tsx:225
+msgid "Copy Linux command"
+msgstr "Kopier Linux-kommando"
+
+#: src/components/copy-to-clipboard.tsx:13
+msgid "Copy text"
+msgstr "Kopier tekst"
+
+#: src/components/systems-table/systems-table.tsx:186
+msgid "CPU"
+msgstr "CPU"
+
+#: src/lib/utils.ts:319
+#: src/components/routes/system.tsx:434
+#: src/components/charts/area-chart.tsx:58
+msgid "CPU Usage"
+msgstr "CPU-bruk"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Create account"
+msgstr "Opprett konto"
+
+#. Dark theme
+#: src/components/mode-toggle.tsx:22
+msgid "Dark"
+msgstr "Mørkt"
+
+#: src/components/command-palette.tsx:80
+#: src/components/routes/home.tsx:36
+msgid "Dashboard"
+msgstr "Dashbord"
+
+#: src/components/routes/settings/general.tsx:85
+msgid "Default time period"
+msgstr "Standard tidsperiode"
+
+#: src/components/systems-table/systems-table.tsx:683
+msgid "Delete"
+msgstr "Slett"
+
+#: src/components/systems-table/systems-table.tsx:204
+msgid "Disk"
+msgstr "Disk"
+
+#: src/components/routes/system.tsx:481
+msgid "Disk I/O"
+msgstr "Disk I/O"
+
+#: src/lib/utils.ts:331
+#: src/components/routes/system.tsx:474
+#: src/components/charts/disk-chart.tsx:77
+msgid "Disk Usage"
+msgstr "Diskbruk"
+
+#: src/components/routes/system.tsx:603
+msgid "Disk usage of {extraFsName}"
+msgstr "Diskbruk av {extraFsName}"
+
+#: src/components/routes/system.tsx:445
+msgid "Docker CPU Usage"
+msgstr "Docker CPU-bruk"
+
+#: src/components/routes/system.tsx:466
+msgid "Docker Memory Usage"
+msgstr "Docker Minnebruk"
+
+#: src/components/routes/system.tsx:507
+msgid "Docker Network I/O"
+msgstr "Docker Nettverks-I/O"
+
+#: src/components/command-palette.tsx:123
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#. Context: System is down
+#: src/lib/utils.ts:316
+#: src/components/systems-table/systems-table.tsx:142
+#: src/components/routes/system.tsx:345
+msgid "Down"
+msgstr "Nede"
+
+#: src/components/add-system.tsx:126
+#: src/components/systems-table/systems-table.tsx:653
+msgid "Edit"
+msgstr "Rediger"
+
+#: src/components/login/forgot-pass-form.tsx:54
+#: src/components/login/auth-form.tsx:176
+msgid "Email"
+msgstr "E-post"
+
+#: src/components/routes/settings/notifications.tsx:93
+msgid "Email notifications"
+msgstr "E-postvarslinger"
+
+#: src/components/login/login.tsx:38
+msgid "Enter email address to reset password"
+msgstr "Skriv inn e-postadresse for å nullstille passordet"
+
+#: src/components/routes/settings/notifications.tsx:113
+msgid "Enter email address..."
+msgstr "Skriv inn e-postadresse..."
+
+#: src/components/routes/settings/notifications.tsx:189
+#: src/components/routes/settings/config-yaml.tsx:29
+#: src/components/login/auth-form.tsx:137
+msgid "Error"
+msgstr "Feil"
+
+#. placeholder {0}: alert.value
+#. placeholder {1}: info.unit
+#. placeholder {2}: alert.min
+#: src/components/routes/home.tsx:113
+msgid "Exceeds {0}{1} in last {2, plural, one {# minute} other {# minutes}}"
+msgstr "Overstiger {0}{1} {2, plural, one {det siste minuttet} other {de siste # minuttene}}"
+
+#: src/components/routes/settings/config-yaml.tsx:73
+msgid "Existing systems not defined in <0>config.yml</0> will be deleted. Please make regular backups."
+msgstr "Eksisterende systemer som ikke er er definert i <0>config.yml</0> vil bli slettet. Vennligst ta jevnlige sikkerhetskopier."
+
+#: src/components/routes/settings/config-yaml.tsx:94
+msgid "Export configuration"
+msgstr "Eksporter konfigurasjon"
+
+#: src/components/routes/settings/config-yaml.tsx:49
+msgid "Export your current systems configuration."
+msgstr "Eksporter din nåværende systemkonfigurasjon"
+
+#: src/lib/utils.ts:48
+msgid "Failed to authenticate"
+msgstr "Autentisering mislyktes"
+
+#: src/components/routes/settings/notifications.tsx:64
+#: src/components/routes/settings/layout.tsx:40
+msgid "Failed to save settings"
+msgstr "Kunne ikke lagre innstillingene"
+
+#: src/components/routes/settings/notifications.tsx:190
+msgid "Failed to send test notification"
+msgstr "Kunne ikke sende test-varsling"
+
+#: src/components/alerts/alerts-system.tsx:26
+msgid "Failed to update alert"
+msgstr "Kunne ikke oppdatere alarm"
+
+#: src/components/systems-table/systems-table.tsx:354
+#: src/components/routes/system.tsx:643
+msgid "Filter..."
+msgstr "Filter..."
+
+#: src/components/alerts/alerts-system.tsx:285
+msgid "For <0>{min}</0> {min, plural, one {minute} other {minutes}}"
+msgstr "I <0>{min}</0> {min, plural, one {minutt} other {minutter}}"
+
+#: src/components/login/auth-form.tsx:328
+msgid "Forgot password?"
+msgstr "Glemt passord?"
+
+#. Context: General settings
+#: src/components/routes/settings/layout.tsx:52
+#: src/components/routes/settings/general.tsx:33
+msgid "General"
+msgstr "Generelt"
+
+#: src/components/routes/system.tsx:546
+msgid "GPU Power Draw"
+msgstr "GPU Effektforbruk"
+
+#: src/components/systems-table/systems-table.tsx:381
+msgid "Grid"
+msgstr "Rutenett"
+
+#: src/components/add-system.tsx:159
+msgid "Host / IP"
+msgstr "Vert / IP"
+
+#: src/components/login/forgot-pass-form.tsx:94
+msgid "If you've lost the password to your admin account, you may reset it using the following command."
+msgstr "Dersom du har mistet passordet til admin-kontoen kan du nullstille det med følgende kommando."
+
+#: src/components/login/auth-form.tsx:18
+msgid "Invalid email address."
+msgstr "Ugyldig e-postadresse."
+
+#. Linux kernel
+#: src/components/routes/system.tsx:271
+msgid "Kernel"
+msgstr "Kjerne"
+
+#: src/components/routes/settings/general.tsx:45
+msgid "Language"
+msgstr "Språk"
+
+#: src/components/systems-table/systems-table.tsx:367
+msgid "Layout"
+msgstr "Layout"
+
+#. Light theme
+#: src/components/mode-toggle.tsx:17
+msgid "Light"
+msgstr "Lyst"
+
+#: src/components/navbar.tsx:105
+msgid "Log Out"
+msgstr "Logg Ut"
+
+#: src/components/login/login.tsx:19
+msgid "Login"
+msgstr "Logg Inn"
+
+#: src/components/login/forgot-pass-form.tsx:16
+#: src/components/login/auth-form.tsx:40
+msgid "Login attempt failed"
+msgstr "Innlogging mislyktes"
+
+#: src/components/navbar.tsx:86
+#: src/components/command-palette.tsx:155
+msgid "Logs"
+msgstr "Logger"
+
+#: src/components/routes/settings/notifications.tsx:82
+msgid "Looking instead for where to create alerts? Click the bell <0/> icons in the systems table."
+msgstr "Ser du etter hvor du kan opprette alarmer? Klikk på bjelle-ikonene <0/> i systemtabellen."
+
+#: src/components/routes/settings/layout.tsx:86
+msgid "Manage display and notification preferences."
+msgstr "Endre visnings- og varslingsinnstillinger."
+
+#: src/components/add-system.tsx:227
+msgid "Manual setup instructions"
+msgstr "Instruks for Manuell Installasjon"
+
+#. Chart select field. Please try to keep this short.
+#: src/components/routes/system.tsx:673
+msgid "Max 1 min"
+msgstr "Maks 1 min"
+
+#: src/components/systems-table/systems-table.tsx:195
+msgid "Memory"
+msgstr "Minne"
+
+#: src/lib/utils.ts:325
+#: src/components/routes/system.tsx:456
+msgid "Memory Usage"
+msgstr "Minnebruk"
+
+#: src/components/routes/system.tsx:467
+msgid "Memory usage of docker containers"
+msgstr "Minnebruk av docker-konteinere"
+
+#: src/components/add-system.tsx:155
+msgid "Name"
+msgstr "Navn"
+
+#: src/components/systems-table/systems-table.tsx:223
+msgid "Net"
+msgstr "Nett"
+
+#: src/components/routes/system.tsx:508
+msgid "Network traffic of docker containers"
+msgstr "Nettverkstrafikk av docker-konteinere"
+
+#: src/components/routes/system.tsx:493
+msgid "Network traffic of public interfaces"
+msgstr "Nettverkstrafikk av eksterne nettverksgrensesnitt"
+
+#: src/components/command-palette.tsx:48
+msgid "No results found."
+msgstr "Ingen resultater funnet."
+
+#: src/components/systems-table/systems-table.tsx:472
+#: src/components/systems-table/systems-table.tsx:495
+msgid "No systems found."
+msgstr "Ingen systemer funnet."
+
+#: src/components/command-palette.tsx:109
+#: src/components/routes/settings/notifications.tsx:76
+#: src/components/routes/settings/layout.tsx:57
+msgid "Notifications"
+msgstr "Varslinger"
+
+#: src/components/login/auth-form.tsx:300
+msgid "OAuth 2 / OIDC support"
+msgstr "OAuth 2 / OIDC-støtte"
+
+#: src/components/routes/settings/config-yaml.tsx:62
+msgid "On each restart, systems in the database will be updated to match the systems defined in the file."
+msgstr "Ved hver omstart vil systemer i databasen bli oppdatert til å matche systemene definert i fila."
+
+#: src/components/systems-table/systems-table.tsx:639
+msgid "Open menu"
+msgstr "Åpne meny"
+
+#: src/components/login/auth-form.tsx:251
+msgid "Or continue with"
+msgstr "Eller fortsett med"
+
+#: src/components/alerts/alert-button.tsx:120
+msgid "Overwrite existing alerts"
+msgstr "Overskriv eksisterende alarmer"
+
+#: src/components/command-palette.tsx:83
+msgid "Page"
+msgstr "Side"
+
+#: src/components/command-palette.tsx:70
+msgid "Pages / Settings"
+msgstr "Sider / Innstillinger"
+
+#: src/components/login/auth-form.tsx:195
+#: src/components/login/auth-form.tsx:200
+msgid "Password"
+msgstr "Passord"
+
+#: src/components/login/auth-form.tsx:21
+msgid "Password must be at least 8 characters."
+msgstr "Passord må bestå av minst 8 tegn."
+
+#: src/components/login/auth-form.tsx:22
+msgid "Password must be less than 72 bytes."
+msgstr "Passord må være mindre enn 72 byte."
+
+#: src/components/login/forgot-pass-form.tsx:34
+msgid "Password reset request received"
+msgstr "Mottatt forespørsel om å nullstille passord"
+
+#: src/components/systems-table/systems-table.tsx:672
+msgid "Pause"
+msgstr "Pause"
+
+#: src/components/systems-table/systems-table.tsx:143
+msgid "Paused"
+msgstr ""
+
+#: src/components/routes/settings/notifications.tsx:97
+msgid "Please <0>configure an SMTP server</0> to ensure alerts are delivered."
+msgstr "Vennligst <0>konfigurer en SMTP-server</0> for å forsikre deg om at varsler blir levert."
+
+#: src/components/alerts/alerts-system.tsx:27
+msgid "Please check logs for more details."
+msgstr "Vennligst sjekk loggene for mer informasjon."
+
+#: src/components/login/forgot-pass-form.tsx:17
+#: src/components/login/auth-form.tsx:41
+msgid "Please check your credentials and try again"
+msgstr "Vennligst kontroller dine innloggingsopplysninger og prøv igjen"
+
+#: src/components/login/login.tsx:36
+msgid "Please create an admin account"
+msgstr "Vennligst opprett en admin-konto"
+
+#: src/components/login/auth-form.tsx:138
+msgid "Please enable pop-ups for this site"
+msgstr "Vennligst aktiver pop-ups for nettsiden"
+
+#: src/lib/utils.ts:49
+msgid "Please log in again"
+msgstr "Vennligst logg inn på nytt"
+
+#: src/components/login/auth-form.tsx:308
+msgid "Please see <0>the documentation</0> for instructions."
+msgstr "Vennligst se <0>dokumentasjonen</0> for instrukser."
+
+#: src/components/login/login.tsx:40
+msgid "Please sign in to your account"
+msgstr "Vennligst logg inn på kontoen din"
+
+#: src/components/add-system.tsx:171
+msgid "Port"
+msgstr "Port"
+
+#: src/components/routes/system.tsx:457
+#: src/components/routes/system.tsx:577
+msgid "Precise utilization at the recorded time"
+msgstr "Nøyaktig utnyttelse på registrert tidspunkt"
+
+#: src/components/routes/settings/general.tsx:58
+msgid "Preferred Language"
+msgstr "Foretrukket Språk"
+
+#. Use 'Key' if your language requires many more characters
+#: src/components/add-system.tsx:182
+msgid "Public Key"
+msgstr "Offentlig Nøkkel"
+
+#. Disk read
+#: src/components/charts/area-chart.tsx:62
+#: src/components/charts/area-chart.tsx:72
+msgid "Read"
+msgstr "Lesing"
+
+#. Network bytes received (download)
+#: src/components/charts/area-chart.tsx:67
+msgid "Received"
+msgstr "Mottatt"
+
+#: src/components/login/forgot-pass-form.tsx:77
+msgid "Reset Password"
+msgstr "Nullstill Passord"
+
+#: src/components/systems-table/systems-table.tsx:667
+msgid "Resume"
+msgstr "Gjenoppta"
+
+#: src/components/routes/settings/notifications.tsx:119
+msgid "Save address using enter key or comma. Leave blank to disable email notifications."
+msgstr "Lagre adressen med Enter-tasten eller komma. La feltet være tomt for å deaktivere e-postvarsler."
+
+#: src/components/routes/settings/notifications.tsx:169
+#: src/components/routes/settings/general.tsx:106
+msgid "Save Settings"
+msgstr "Lagre Innstillinger"
+
+#: src/components/add-system.tsx:232
+msgid "Save system"
+msgstr "Lagre system"
+
+#: src/components/navbar.tsx:134
+msgid "Search"
+msgstr "Søk"
+
+#: src/components/command-palette.tsx:45
+msgid "Search for systems or settings..."
+msgstr "Søk etter systemer eller innstillinger..."
+
+#: src/components/alerts/alert-button.tsx:82
+msgid "See <0>notification settings</0> to configure how you receive alerts."
+msgstr "Se <0>varslingsinnstillingene</0> for å konfigurere hvordan du vil motta varsler."
+
+#. Network bytes sent (upload)
+#: src/components/charts/area-chart.tsx:66
+msgid "Sent"
+msgstr "Sendt"
+
+#: src/components/routes/settings/general.tsx:100
+msgid "Sets the default time range for charts when a system is viewed."
+msgstr "Angir standard tidsperiode for diagrammer når et system vises."
+
+#: src/components/command-palette.tsx:94
+#: src/components/command-palette.tsx:97
+#: src/components/command-palette.tsx:112
+#: src/components/routes/settings/layout.tsx:72
+#: src/components/routes/settings/layout.tsx:83
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: src/components/routes/settings/layout.tsx:34
+msgid "Settings saved"
+msgstr "Innstillinger lagret"
+
+#: src/components/login/auth-form.tsx:239
+msgid "Sign in"
+msgstr "Logg inn"
+
+#: src/components/command-palette.tsx:184
+msgid "SMTP settings"
+msgstr "SMTP-innstillinger"
+
+#: src/components/systems-table/systems-table.tsx:389
+msgid "Sort By"
+msgstr "Sorter Etter"
+
+#: src/lib/utils.ts:311
+msgid "Status"
+msgstr "Status"
+
+#: src/components/routes/system.tsx:523
+msgid "Swap space used by the system"
+msgstr "Swap-plass i bruk av systemet"
+
+#: src/components/routes/system.tsx:522
+msgid "Swap Usage"
+msgstr "Swap-bruk"
+
+#. System theme
+#: src/lib/utils.ts:316
+#: src/components/mode-toggle.tsx:27
+#: src/components/systems-table/systems-table.tsx:152
+msgid "System"
+msgstr "System"
+
+#: src/components/navbar.tsx:78
+msgid "Systems"
+msgstr "Systemer"
+
+#: src/components/routes/settings/config-yaml.tsx:56
+msgid "Systems may be managed in a <0>config.yml</0> file inside your data directory."
+msgstr "Systemer kan håndteres i en <0>config.yml</0>-fil i din data-katalog."
+
+#: src/components/systems-table/systems-table.tsx:377
+msgid "Table"
+msgstr "Tabell"
+
+#. Temperature label in systems table
+#: src/components/systems-table/systems-table.tsx:244
+msgid "Temp"
+msgstr "Temp"
+
+#: src/lib/utils.ts:344
+#: src/components/routes/system.tsx:534
+msgid "Temperature"
+msgstr "Temperatur"
+
+#: src/components/routes/system.tsx:535
+msgid "Temperatures of system sensors"
+msgstr "Temperaturer på system-sensorer"
+
+#: src/components/routes/settings/notifications.tsx:213
+msgid "Test <0>URL</0>"
+msgstr "Test <0>URL</0>"
+
+#: src/components/routes/settings/notifications.tsx:184
+msgid "Test notification sent"
+msgstr "Test-varsling sendt"
+
+#: src/components/add-system.tsx:147
+msgid "The agent must be running on the system to connect. Copy the installation command for the agent below."
+msgstr "Agenten må kjøre på systemet du vil koble til. Kopier installasjons-kommandoen for agenten under."
+
+#: src/components/add-system.tsx:138
+msgid "The agent must be running on the system to connect. Copy the<0>docker-compose.yml</0> for the agent below."
+msgstr "Agenten må kjøre på systemet du vil koble til. Kopier <0>docker-compose.yml</0> for agenten under."
+
+#: src/components/login/forgot-pass-form.tsx:99
+msgid "Then log into the backend and reset your user account password in the users table."
+msgstr "Logg deretter inn i backend og nullstill passordet på din konto i users-tabellen."
+
+#: src/components/systems-table/systems-table.tsx:699
+msgid "This action cannot be undone. This will permanently delete all current records for {name} from the database."
+msgstr "Denne handlingen kan ikke omgjøres. Dette vil slette alle poster for {name} permanent fra databasen."
+
+#: src/components/routes/system.tsx:615
+msgid "Throughput of {extraFsName}"
+msgstr "Gjennomstrømning av {extraFsName}"
+
+#: src/components/routes/system.tsx:482
+msgid "Throughput of root filesystem"
+msgstr "Gjennomstrømning av rot-filsystemet"
+
+#: src/components/routes/settings/notifications.tsx:108
+msgid "To email(s)"
+msgstr "Til e-postadresse(r)"
+
+#: src/components/routes/system.tsx:409
+#: src/components/routes/system.tsx:422
+msgid "Toggle grid"
+msgstr "Rutenett av/på"
+
+#: src/components/mode-toggle.tsx:34
+msgid "Toggle theme"
+msgstr "Tema av/på"
+
+#: src/lib/utils.ts:347
+msgid "Triggers when any sensor exceeds a threshold"
+msgstr "Slår inn når enhver sensor overstiger en grenseverdi"
+
+#: src/lib/utils.ts:340
+msgid "Triggers when combined up/down exceeds a threshold"
+msgstr "Slår inn når kombinert opp/ned overskrider en grenseverdi"
+
+#: src/lib/utils.ts:322
+msgid "Triggers when CPU usage exceeds a threshold"
+msgstr "Slår inn når CPU-bruken overstiger en grenseverdi"
+
+#: src/lib/utils.ts:328
+msgid "Triggers when memory usage exceeds a threshold"
+msgstr "Slår inn når minnebruken overstiger en grenseverdi"
+
+#: src/lib/utils.ts:314
+msgid "Triggers when status switches between up and down"
+msgstr "Slår inn når statusen veksler mellom oppe og nede"
+
+#: src/lib/utils.ts:334
+msgid "Triggers when usage of any disk exceeds a threshold"
+msgstr "Slår inn når forbruk av hvilken som helst disk overstiger en grenseverdi"
+
+#. Context: System is up
+#: src/components/systems-table/systems-table.tsx:141
+#: src/components/routes/system.tsx:343
+msgid "Up"
+msgstr "Oppe"
+
+#: src/components/systems-table/systems-table.tsx:350
+msgid "Updated in real time. Click on a system to view information."
+msgstr "Oppdatert i sanntid. Klikk på et system for å se mer informasjon."
+
+#: src/components/routes/system.tsx:270
+msgid "Uptime"
+msgstr "Oppetid"
+
+#: src/components/routes/system.tsx:568
+#: src/components/routes/system.tsx:602
+#: src/components/charts/area-chart.tsx:75
+msgid "Usage"
+msgstr "Forbruk"
+
+#: src/components/routes/system.tsx:474
+msgid "Usage of root partition"
+msgstr "Forbruk av rot-partisjon"
+
+#: src/components/charts/swap-chart.tsx:56
+#: src/components/charts/mem-chart.tsx:63
+#: src/components/charts/area-chart.tsx:75
+msgid "Used"
+msgstr "Brukt"
+
+#: src/components/navbar.tsx:70
+#: src/components/command-palette.tsx:141
+msgid "Users"
+msgstr "Brukere"
+
+#: src/components/systems-table/systems-table.tsx:359
+msgid "View"
+msgstr "Visning"
+
+#: src/components/systems-table/systems-table.tsx:424
+msgid "Visible Fields"
+msgstr "Synlige Felter"
+
+#: src/components/routes/system.tsx:707
+msgid "Waiting for enough records to display"
+msgstr "Venter på nok registreringer til å vise"
+
+#: src/components/routes/settings/general.tsx:48
+msgid "Want to help us make our translations even better? Check out <0>Crowdin</0> for more details."
+msgstr "Vil du hjelpe oss med å gjøre oversettelsene enda bedre? Ta en titt på <0>Crowdin</0> for mer informasjon."
+
+#: src/components/routes/settings/notifications.tsx:126
+msgid "Webhook / Push notifications"
+msgstr "Webhook / Push-varslinger"
+
+#. Disk write
+#: src/components/charts/area-chart.tsx:61
+#: src/components/charts/area-chart.tsx:71
+msgid "Write"
+msgstr "Skriving"
+
+#: src/components/routes/settings/layout.tsx:62
+msgid "YAML Config"
+msgstr "YAML Oppsett"
+
+#: src/components/routes/settings/config-yaml.tsx:46
+msgid "YAML Configuration"
+msgstr "YAML Konfigurasjon"
+
+#: src/components/routes/settings/layout.tsx:35
+msgid "Your user settings have been updated."
+msgstr "Dine brukerinnstillinger har blitt oppdatert."