built-in agent

add time back to memory chart tooltip
add zfs arc to longer records
2025-11-01 11:07:08 +00:00 · 2024-10-07 18:58:57 -04:00 · 2024-10-07 18:19:28 -04:00 · 2024-10-07 11:45:09 -04:00 · 2024-10-05 18:30:10 -04:00 · 2024-10-05 18:07:42 -04:00
145 changed files with 10259 additions and 3031 deletions
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -3,7 +3,7 @@ name: Make docker images
 on:
  push:
    tags:
-      - '*'
+      - 'v*'

 jobs:
  build:
@@ -13,11 +13,11 @@ jobs:
      matrix:
        include:
          - image: henrygd/beszel
-            context: ./hub
-            dockerfile: ./hub/Dockerfile
+            context: ./beszel
+            dockerfile: ./beszel/dockerfile_Hub
          - image: henrygd/beszel-agent
-            context: ./agent
-            dockerfile: ./agent/Dockerfile
+            context: ./beszel
+            dockerfile: ./beszel/dockerfile_Agent
    permissions:
      contents: read
      packages: write
@@ -30,10 +30,10 @@ jobs:
        uses: oven-sh/setup-bun@v2

      - name: Install dependencies
-        run: bun install --no-save --cwd ./hub/site
+        run: bun install --no-save --cwd ./beszel/site

      - name: Build site
-        run: bun run --cwd ./hub/site build
+        run: bun run --cwd ./beszel/site build

      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
@@ -49,6 +49,7 @@ jobs:
          tags: |
            type=semver,pattern={{version}}
            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
            type=raw,value={{sha}},enable=${{ github.ref_type != 'tag' }}

      # https://github.com/docker/login-action
@@ -66,9 +67,7 @@ jobs:
        with:
          context: '${{ matrix.context }}'
          file: ${{ matrix.dockerfile }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
          push: ${{ github.ref_type == 'tag' }}
          tags: ${{ steps.metadata.outputs.tags }}
          labels: ${{ steps.metadata.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha
--- a/.github/workflows/goreleaser-action.yml
+++ b/.github/workflows/goreleaser-action.yml
@@ -21,10 +21,10 @@ jobs:
        uses: oven-sh/setup-bun@v2

      - name: Install dependencies
-        run: bun install --no-save --cwd ./hub/site
+        run: bun install --no-save --cwd ./beszel/site

      - name: Build site
-        run: bun run --cwd ./hub/site build
+        run: bun run --cwd ./beszel/site build

      - name: Set up Go
        uses: actions/setup-go@v5
@@ -34,17 +34,7 @@ jobs:
      - name: GoReleaser beszel
        uses: goreleaser/goreleaser-action@v6
        with:
-          workdir: ./hub
-          distribution: goreleaser
-          version: latest
-          args: release --clean
-        env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
-
-      - name: GoReleaser beszel-agent
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          workdir: ./agent
+          workdir: ./beszel
          distribution: goreleaser
          version: latest
          args: release --clean
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,11 @@ pb_data
 data
 temp
 .vscode
-beszel
 beszel-agent
 beszel_data
 beszel_data*
-dist
+dist
+*.exe
+beszel/cmd/hub/hub
+beszel/cmd/agent/agent
+node_modules
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you find a vulnerability in the latest version, please email me directly at hank@henrygd.me, or [submit a private advisory](https://github.com/henrygd/beszel/security/advisories/new).
+
+If you submit an advisory, open an empty issue as well to let me know that you did (or email me), as I'm not sure if I get notifications for that.
+
+If the issue is low severity (use best judgement) you may open an issue for it instead of contacting me directly.
--- a/agent/.goreleaser.yml
+++ b/agent/.goreleaser.yml
@@ -1,42 +0,0 @@
-# version: 1
-
-project_name: beszel-agent
-
-before:
-  hooks:
-    - go mod tidy
-
-builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - darwin
-      - freebsd
-    goarch:
-      - amd64
-      - arm64
-      - arm
-      - mips64
-    ignore:
-      - goos: freebsd
-        goarch: arm
-
-archives:
-  - format: tar.gz
-    name_template: >-
-      {{ .ProjectName }}_
-      {{- .Os }}_
-      {{- .Arch }}
-    # use zip for windows archives
-    format_overrides:
-      - goos: windows
-        format: zip
-
-changelog:
-  disable: true
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
--- a/agent/go.mod
+++ b/agent/go.mod
@@ -1,30 +0,0 @@
-module beszel-agent
-
-go 1.22.4
-
-require (
-	github.com/blang/semver v3.5.1+incompatible
-	github.com/gliderlabs/ssh v0.3.7
-	github.com/rhysd/go-github-selfupdate v1.2.3
-	github.com/shirou/gopsutil/v4 v4.24.7
-)
-
-require (
-	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
-	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/google/go-github/v30 v30.1.0 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
-	github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
-	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
-	github.com/shoenig/go-m1cpu v0.1.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.8.0 // indirect
-	github.com/ulikunitz/xz v0.5.12 // indirect
-	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.22.0 // indirect
-	golang.org/x/sys v0.23.0 // indirect
-)
--- a/agent/go.sum
+++ b/agent/go.sum
@@ -1,100 +0,0 @@
-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/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/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
-github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
-github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo=
-github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8=
-github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
-github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8=
-github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-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/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI=
-github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
-github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-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/rhysd/go-github-selfupdate v1.2.3 h1:iaa+J202f+Nc+A8zi75uccC8Wg3omaM7HDeimXA22Ag=
-github.com/rhysd/go-github-selfupdate v1.2.3/go.mod h1:mp/N8zj6jFfBQy/XMYoWsmfzxazpPAODuqarmPDe2Rg=
-github.com/shirou/gopsutil/v4 v4.24.7 h1:V9UGTK4gQ8HvcnPKf6Zt3XHyQq/peaekfxpJ2HSocJk=
-github.com/shirou/gopsutil/v4 v4.24.7/go.mod h1:0uW/073rP7FYLOkvxolUQM5rMOLTNmRXnFKafpb71rw=
-github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
-github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
-github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw=
-github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE=
-github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
-github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
-github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
-github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
-github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
-github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
-github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
-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.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-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-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-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.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.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-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=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/agent/main.go
+++ b/agent/main.go
@@ -1,480 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	sshServer "github.com/gliderlabs/ssh"
-
-	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v4/host"
-	"github.com/shirou/gopsutil/v4/mem"
-	psutilNet "github.com/shirou/gopsutil/v4/net"
-)
-
-var Version = "0.1.2"
-
-var containerStatsMap = make(map[string]*PrevContainerStats)
-var containerStatsMutex = &sync.Mutex{}
-
-var sem = make(chan struct{}, 15)
-
-func acquireSemaphore() {
-	sem <- struct{}{}
-}
-
-func releaseSemaphore() {
-	<-sem
-}
-
-var diskIoStats = DiskIoStats{
-	Read:       0,
-	Write:      0,
-	Time:       time.Now(),
-	Filesystem: "",
-}
-
-var netIoStats = NetIoStats{
-	BytesRecv: 0,
-	BytesSent: 0,
-	Time:      time.Now(),
-	Name:      "",
-}
-
-// client for docker engine api
-var dockerClient = newDockerClient()
-
-func getSystemStats() (*SystemInfo, *SystemStats) {
-	systemStats := &SystemStats{}
-
-	// cpu percent
-	cpuPct, err := cpu.Percent(0, false)
-	if err != nil {
-		log.Println("Error getting cpu percent:", err)
-	} else if len(cpuPct) > 0 {
-		systemStats.Cpu = twoDecimals(cpuPct[0])
-	}
-
-	// memory
-	if v, err := mem.VirtualMemory(); err == nil {
-		systemStats.Mem = bytesToGigabytes(v.Total)
-		systemStats.MemUsed = bytesToGigabytes(v.Used)
-		systemStats.MemBuffCache = bytesToGigabytes(v.Total - v.Free - v.Used)
-		systemStats.MemPct = twoDecimals(v.UsedPercent)
-		systemStats.Swap = bytesToGigabytes(v.SwapTotal)
-		systemStats.SwapUsed = bytesToGigabytes(v.SwapTotal - v.SwapFree)
-	}
-
-	// disk usage
-	if d, err := disk.Usage("/"); err == nil {
-		systemStats.Disk = bytesToGigabytes(d.Total)
-		systemStats.DiskUsed = bytesToGigabytes(d.Used)
-		systemStats.DiskPct = twoDecimals(d.UsedPercent)
-	}
-
-	// disk i/o
-	if io, err := disk.IOCounters(diskIoStats.Filesystem); err == nil {
-		for _, d := range io {
-			// add to systemStats
-			secondsElapsed := time.Since(diskIoStats.Time).Seconds()
-			readPerSecond := float64(d.ReadBytes-diskIoStats.Read) / secondsElapsed
-			systemStats.DiskRead = bytesToMegabytes(readPerSecond)
-			writePerSecond := float64(d.WriteBytes-diskIoStats.Write) / secondsElapsed
-			systemStats.DiskWrite = bytesToMegabytes(writePerSecond)
-			// update diskIoStats
-			diskIoStats.Time = time.Now()
-			diskIoStats.Read = d.ReadBytes
-			diskIoStats.Write = d.WriteBytes
-		}
-	}
-
-	// network stats
-	if netIO, err := psutilNet.IOCounters(true); err == nil {
-		bytesSent := uint64(0)
-		bytesRecv := uint64(0)
-		for _, v := range netIO {
-			if skipNetworkInterface(&v) {
-				continue
-			}
-			// log.Printf("%+v: %+v recv, %+v sent\n", v.Name, v.BytesRecv, v.BytesSent)
-			bytesSent += v.BytesSent
-			bytesRecv += v.BytesRecv
-		}
-		// add to systemStats
-		secondsElapsed := time.Since(netIoStats.Time).Seconds()
-		sentPerSecond := float64(bytesSent-netIoStats.BytesSent) / secondsElapsed
-		recvPerSecond := float64(bytesRecv-netIoStats.BytesRecv) / secondsElapsed
-		systemStats.NetworkSent = bytesToMegabytes(sentPerSecond)
-		systemStats.NetworkRecv = bytesToMegabytes(recvPerSecond)
-		// update netIoStats
-		netIoStats.BytesSent = bytesSent
-		netIoStats.BytesRecv = bytesRecv
-		netIoStats.Time = time.Now()
-	}
-
-	systemInfo := &SystemInfo{
-		Cpu:     systemStats.Cpu,
-		MemPct:  systemStats.MemPct,
-		DiskPct: systemStats.DiskPct,
-	}
-
-	// add host info
-	if info, err := host.Info(); err == nil {
-		systemInfo.Uptime = info.Uptime
-		// systemInfo.Os = info.OS
-	}
-	// add cpu stats
-	if info, err := cpu.Info(); err == nil && len(info) > 0 {
-		systemInfo.CpuModel = info[0].ModelName
-	}
-	if cores, err := cpu.Counts(false); err == nil {
-		systemInfo.Cores = cores
-	}
-	if threads, err := cpu.Counts(true); err == nil {
-		systemInfo.Threads = threads
-	}
-
-	return systemInfo, systemStats
-
-}
-
-func getDockerStats() ([]*ContainerStats, error) {
-	resp, err := dockerClient.Get("http://localhost/containers/json")
-	if err != nil {
-		closeIdleConnections(err)
-		return []*ContainerStats{}, err
-	}
-	defer resp.Body.Close()
-
-	var containers []*Container
-	if err := json.NewDecoder(resp.Body).Decode(&containers); err != nil {
-		log.Printf("Error decoding containers: %+v\n", err)
-		return []*ContainerStats{}, err
-	}
-
-	containerStats := make([]*ContainerStats, 0, len(containers))
-
-	// store valid ids to clean up old container ids from map
-	validIds := make(map[string]struct{}, len(containers))
-
-	var wg sync.WaitGroup
-
-	for _, ctr := range containers {
-		ctr.IdShort = ctr.Id[:12]
-		validIds[ctr.IdShort] = struct{}{}
-		// check if container is less than 1 minute old (possible restart)
-		// note: can't use Created field because it's not updated on restart
-		if strings.HasSuffix(ctr.Status, "seconds") {
-			// if so, remove old container data
-			deleteContainerStatsSync(ctr.IdShort)
-		}
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			cstats, err := getContainerStats(ctr)
-			if err != nil {
-				// Check if the error is a network timeout
-				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
-					// Close idle connections to prevent reuse of stale connections
-					closeIdleConnections(err)
-				} else {
-					// otherwise delete container from map
-					deleteContainerStatsSync(ctr.IdShort)
-				}
-				// retry once
-				cstats, err = getContainerStats(ctr)
-				if err != nil {
-					log.Printf("Error getting container stats: %+v\n", err)
-					return
-				}
-			}
-			containerStats = append(containerStats, cstats)
-		}()
-	}
-
-	wg.Wait()
-
-	for id := range containerStatsMap {
-		if _, exists := validIds[id]; !exists {
-			// log.Printf("Removing container cpu map entry: %+v\n", id)
-			delete(containerStatsMap, id)
-		}
-	}
-
-	return containerStats, nil
-}
-
-func getContainerStats(ctr *Container) (*ContainerStats, error) {
-	// use semaphore to limit concurrency
-	acquireSemaphore()
-	defer releaseSemaphore()
-	resp, err := dockerClient.Get("http://localhost/containers/" + ctr.IdShort + "/stats?stream=0&one-shot=1")
-	if err != nil {
-		return &ContainerStats{}, err
-	}
-	defer resp.Body.Close()
-
-	var statsJson CStats
-	if err := json.NewDecoder(resp.Body).Decode(&statsJson); err != nil {
-		panic(err)
-	}
-
-	name := ctr.Names[0][1:]
-
-	// memory (https://docs.docker.com/reference/cli/docker/container/stats/)
-	memCache := statsJson.MemoryStats.Stats["inactive_file"]
-	if memCache == 0 {
-		memCache = statsJson.MemoryStats.Stats["cache"]
-	}
-	usedMemory := statsJson.MemoryStats.Usage - memCache
-
-	containerStatsMutex.Lock()
-	defer containerStatsMutex.Unlock()
-
-	// add empty values if they doesn't exist in map
-	stats, initialized := containerStatsMap[ctr.IdShort]
-	if !initialized {
-		stats = &PrevContainerStats{}
-		containerStatsMap[ctr.IdShort] = stats
-	}
-
-	// cpu
-	cpuDelta := statsJson.CPUStats.CPUUsage.TotalUsage - stats.Cpu[0]
-	systemDelta := statsJson.CPUStats.SystemUsage - stats.Cpu[1]
-	cpuPct := float64(cpuDelta) / float64(systemDelta) * 100
-	if cpuPct > 100 {
-		return &ContainerStats{}, fmt.Errorf("%s cpu pct greater than 100: %+v", name, cpuPct)
-	}
-	stats.Cpu = [2]uint64{statsJson.CPUStats.CPUUsage.TotalUsage, statsJson.CPUStats.SystemUsage}
-
-	// network
-	var total_sent, total_recv uint64
-	for _, v := range statsJson.Networks {
-		total_sent += v.TxBytes
-		total_recv += v.RxBytes
-	}
-	var sent_delta, recv_delta float64
-	// prevent first run from sending all prev sent/recv bytes
-	if initialized {
-		secondsElapsed := time.Since(stats.Net.Time).Seconds()
-		sent_delta = float64(total_sent-stats.Net.Sent) / secondsElapsed
-		recv_delta = float64(total_recv-stats.Net.Recv) / secondsElapsed
-		// log.Printf("sent delta: %+v, recv delta: %+v\n", sent_delta, recv_delta)
-	}
-	stats.Net.Sent = total_sent
-	stats.Net.Recv = total_recv
-	stats.Net.Time = time.Now()
-
-	cStats := &ContainerStats{
-		Name:        name,
-		Cpu:         twoDecimals(cpuPct),
-		Mem:         bytesToMegabytes(float64(usedMemory)),
-		NetworkSent: bytesToMegabytes(sent_delta),
-		NetworkRecv: bytesToMegabytes(recv_delta),
-	}
-	return cStats, nil
-}
-
-// delete container stats from map using mutex
-func deleteContainerStatsSync(id string) {
-	containerStatsMutex.Lock()
-	defer containerStatsMutex.Unlock()
-	delete(containerStatsMap, id)
-}
-
-func gatherStats() *SystemData {
-	systemInfo, systemStats := getSystemStats()
-	stats := &SystemData{
-		Stats:      systemStats,
-		Info:       systemInfo,
-		Containers: []*ContainerStats{},
-	}
-	containerStats, err := getDockerStats()
-	if err == nil {
-		stats.Containers = containerStats
-	}
-	// fmt.Printf("%+v\n", stats)
-	return stats
-}
-
-func startServer(addr string, pubKey []byte) {
-	sshServer.Handle(func(s sshServer.Session) {
-		stats := gatherStats()
-		var jsonStats []byte
-		jsonStats, _ = json.Marshal(stats)
-		io.WriteString(s, string(jsonStats))
-		s.Exit(0)
-	})
-
-	log.Printf("Starting SSH server on %s", addr)
-	if err := sshServer.ListenAndServe(addr, nil, sshServer.NoPty(),
-		sshServer.PublicKeyAuth(func(ctx sshServer.Context, key sshServer.PublicKey) bool {
-			data := []byte(pubKey)
-			allowed, _, _, _, _ := sshServer.ParseAuthorizedKey(data)
-			return sshServer.KeysEqual(key, allowed)
-		}),
-	); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func main() {
-	// handle flags / subcommands
-	if len(os.Args) > 1 {
-		switch os.Args[1] {
-		case "-v":
-			fmt.Println("beszel-agent", Version)
-		case "update":
-			updateBeszel()
-		}
-		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")
-	}
-
-	if filesystem, exists := os.LookupEnv("FILESYSTEM"); exists {
-		diskIoStats.Filesystem = filesystem
-	} else {
-		diskIoStats.Filesystem = findDefaultFilesystem()
-	}
-
-	initializeDiskIoStats()
-	initializeNetIoStats()
-
-	if port, exists := os.LookupEnv("PORT"); exists {
-		// allow passing an address in the form of "127.0.0.1:45876"
-		if !strings.Contains(port, ":") {
-			port = ":" + port
-		}
-		startServer(port, pubKey)
-	} else {
-		startServer(":45876", pubKey)
-	}
-}
-
-func bytesToMegabytes(b float64) float64 {
-	return twoDecimals(b / 1048576)
-}
-
-func bytesToGigabytes(b uint64) float64 {
-	return twoDecimals(float64(b) / 1073741824)
-}
-
-func twoDecimals(value float64) float64 {
-	return math.Round(value*100) / 100
-}
-
-func findDefaultFilesystem() string {
-	if partitions, err := disk.Partitions(false); err == nil {
-		for _, v := range partitions {
-			if v.Mountpoint == "/" {
-				log.Printf("Using filesystem: %+v\n", v.Device)
-				return v.Device
-			}
-		}
-	}
-	return ""
-}
-
-func skipNetworkInterface(v *psutilNet.IOCountersStat) bool {
-	switch {
-	case strings.HasPrefix(v.Name, "lo"),
-		strings.HasPrefix(v.Name, "docker"),
-		strings.HasPrefix(v.Name, "br-"),
-		strings.HasPrefix(v.Name, "veth"),
-		v.BytesRecv == 0,
-		v.BytesSent == 0:
-		return true
-	default:
-		return false
-	}
-}
-
-func initializeDiskIoStats() {
-	if io, err := disk.IOCounters(diskIoStats.Filesystem); err == nil {
-		for _, d := range io {
-			diskIoStats.Time = time.Now()
-			diskIoStats.Read = d.ReadBytes
-			diskIoStats.Write = d.WriteBytes
-		}
-	}
-}
-
-func initializeNetIoStats() {
-	if netIO, err := psutilNet.IOCounters(true); err == nil {
-		bytesSent := uint64(0)
-		bytesRecv := uint64(0)
-		for _, v := range netIO {
-			if skipNetworkInterface(&v) {
-				continue
-			}
-			log.Printf("Found network interface: %+v (%+v recv, %+v sent)\n", v.Name, v.BytesRecv, v.BytesSent)
-			bytesSent += v.BytesSent
-			bytesRecv += v.BytesRecv
-		}
-		netIoStats.BytesSent = bytesSent
-		netIoStats.BytesRecv = bytesRecv
-		netIoStats.Time = time.Now()
-	}
-}
-
-func newDockerClient() *http.Client {
-	dockerHost := "unix:///var/run/docker.sock"
-	if dockerHostEnv, exists := os.LookupEnv("DOCKER_HOST"); exists {
-		dockerHost = dockerHostEnv
-	}
-
-	parsedURL, err := url.Parse(dockerHost)
-	if err != nil {
-		log.Fatal("Error parsing DOCKER_HOST: " + err.Error())
-	}
-
-	transport := &http.Transport{
-		ForceAttemptHTTP2:   false,
-		IdleConnTimeout:     90 * time.Second,
-		DisableCompression:  true,
-		MaxIdleConnsPerHost: 20,
-		DisableKeepAlives:   false,
-	}
-
-	switch parsedURL.Scheme {
-	case "unix":
-		transport.DialContext = func(ctx context.Context, proto, addr string) (net.Conn, error) {
-			return (&net.Dialer{}).DialContext(ctx, "unix", parsedURL.Path)
-		}
-	case "tcp", "http", "https":
-		log.Println("Using DOCKER_HOST: " + dockerHost)
-		transport.DialContext = func(ctx context.Context, proto, addr string) (net.Conn, error) {
-			return (&net.Dialer{}).DialContext(ctx, "tcp", parsedURL.Host)
-		}
-	default:
-		log.Fatal("Unsupported DOCKER_HOST: " + parsedURL.Scheme)
-	}
-
-	return &http.Client{
-		Timeout:   time.Second,
-		Transport: transport,
-	}
-}
-
-func closeIdleConnections(err error) {
-	log.Printf("Closing idle connections. Error: %+v\n", err)
-	dockerClient.Transport.(*http.Transport).CloseIdleConnections()
-}
--- a/agent/update.go
+++ b/agent/update.go
@@ -1,54 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/blang/semver"
-	"github.com/rhysd/go-github-selfupdate/selfupdate"
-)
-
-func updateBeszel() {
-	var latest *selfupdate.Release
-	var found bool
-	var err error
-	currentVersion := semver.MustParse(Version)
-	fmt.Println("beszel-agent", currentVersion)
-	fmt.Println("Checking for updates...")
-	updater, _ := selfupdate.NewUpdater(selfupdate.Config{
-		Filters: []string{"beszel-agent"},
-	})
-	latest, found, err = updater.DetectLatest("henrygd/beszel")
-
-	if err != nil {
-		fmt.Println("Error checking for updates:", err)
-		os.Exit(1)
-	}
-
-	if !found {
-		fmt.Println("No updates found")
-		os.Exit(0)
-	}
-
-	fmt.Println("Latest version:", latest.Version)
-
-	if latest.Version.LTE(currentVersion) {
-		fmt.Println("You are up to date")
-		return
-	}
-
-	var binaryPath string
-	fmt.Printf("Updating from %s to %s...\n", currentVersion, latest.Version)
-	binaryPath, err = os.Executable()
-	if err != nil {
-		fmt.Println("Error getting binary path:", err)
-		os.Exit(1)
-	}
-	err = selfupdate.UpdateTo(latest.AssetURL, binaryPath)
-	if err != nil {
-		fmt.Println("Please try rerunning with sudo. Error:", err)
-		os.Exit(1)
-	}
-	fmt.Printf("Successfully updated to %s\n\n%s\n", latest.Version, strings.TrimSpace(latest.ReleaseNotes))
-}
--- a/beszel/.goreleaser.yml
+++ b/beszel/.goreleaser.yml
@@ -0,0 +1,69 @@
+version: 2
+
+project_name: beszel
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - id: beszel
+    binary: beszel
+    main: cmd/hub/hub.go
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+
+  - id: beszel-agent
+    binary: beszel-agent
+    main: cmd/agent/agent.go
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+      - freebsd
+    goarch:
+      - amd64
+      - arm64
+      - arm
+      - mips64
+    ignore:
+      - goos: freebsd
+        goarch: arm
+
+archives:
+  - id: beszel
+    format: tar.gz
+    builds:
+      - beszel-agent
+    name_template: >-
+      {{ .Binary }}_
+      {{- .Os }}_
+      {{- .Arch }}
+  - id: beszel-agent
+    format: tar.gz
+    builds:
+      - beszel
+    name_template: >-
+      {{ .Binary }}_
+      {{- .Os }}_
+      {{- .Arch }}
+    # use zip for windows archives
+    # format_overrides:
+    #   - goos: windows
+    #     format: zip
+
+changelog:
+  disable: true
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
--- a/beszel/cmd/agent/agent.go
+++ b/beszel/cmd/agent/agent.go
@@ -0,0 +1,42 @@
+package main
+
+import (
+	"beszel"
+	"beszel/internal/agent"
+	"beszel/internal/update"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+)
+
+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":
+			update.UpdateBeszelAgent()
+		}
+		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)
+}
--- a/beszel/cmd/hub/hub.go
+++ b/beszel/cmd/hub/hub.go
@@ -0,0 +1,29 @@
+package main
+
+import (
+	"beszel"
+	"beszel/internal/hub"
+	"beszel/internal/update"
+	_ "beszel/migrations"
+
+	"github.com/pocketbase/pocketbase"
+	"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 = ""
+
+	// add update command
+	app.RootCmd.AddCommand(&cobra.Command{
+		Use:   "update",
+		Short: "Update " + beszel.AppName + " to the latest version",
+		Run:   func(_ *cobra.Command, _ []string) { update.UpdateBeszel() },
+	})
+
+	hub.NewHub(app).Run()
+}
--- a/beszel/dockerfile_Agent
+++ b/beszel/dockerfile_Agent
@@ -2,15 +2,15 @@ FROM --platform=$BUILDPLATFORM golang:alpine AS builder

 WORKDIR /app

-# Download Go modules
 COPY go.mod go.sum ./
-RUN go mod download
-
+# RUN go mod download
 COPY *.go ./
+COPY cmd ./cmd
+COPY internal ./internal

 # Build
 ARG TARGETOS TARGETARCH
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent .
+RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./cmd/agent

 # ? -------------------------
 FROM scratch
--- a/beszel/dockerfile_Hub
+++ b/beszel/dockerfile_Hub
@@ -8,6 +8,8 @@ RUN go mod download

 # Copy source files
 COPY *.go ./
+COPY cmd ./cmd
+COPY internal ./internal
 COPY migrations ./migrations
 COPY site/dist ./site/dist
 COPY site/*.go ./site
@@ -20,7 +22,7 @@ RUN update-ca-certificates

 # Build
 ARG TARGETOS TARGETARCH
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel .
+RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./cmd/hub

 # ? -------------------------
 FROM scratch
--- a/beszel/go.mod
+++ b/beszel/go.mod
@@ -0,0 +1,103 @@
+module beszel
+
+go 1.22.4
+
+require (
+	github.com/blang/semver v3.5.1+incompatible
+	github.com/containrrr/shoutrrr v0.8.0
+	github.com/gliderlabs/ssh v0.3.7
+	github.com/goccy/go-json v0.10.3
+	github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61
+	github.com/pocketbase/dbx v1.10.1
+	github.com/pocketbase/pocketbase v0.22.21
+	github.com/rhysd/go-github-selfupdate v1.2.3
+	github.com/shirou/gopsutil/v4 v4.24.9
+	github.com/spf13/cobra v1.8.1
+	golang.org/x/crypto v0.27.0
+)
+
+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.31.0 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.27.39 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.37 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.26 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // 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.18 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.64.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 // indirect
+	github.com/aws/smithy-go v1.21.0 // 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.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.5 // 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.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // 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.13.0 // 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/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-sqlite3 v1.14.23 // 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/cast v1.7.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tcnksm/go-gitconfig v0.1.2 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.8.0 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasttemplate v1.2.2 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	gocloud.dev v0.39.0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
+	golang.org/x/image v0.20.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
+	google.golang.org/api v0.199.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
+	google.golang.org/grpc v1.67.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	modernc.org/gc/v3 v3.0.0-20240801135723-a856999a2e4a // indirect
+	modernc.org/libc v1.61.0 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.8.0 // indirect
+	modernc.org/sqlite v1.33.1 // indirect
+	modernc.org/strutil v1.2.0 // indirect
+	modernc.org/token v1.1.0 // indirect
+)
--- a/beszel/go.sum
+++ b/beszel/go.sum
@@ -1,16 +1,17 @@
 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.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE=
-cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs=
-cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI=
-cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I=
-cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
-cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
-cloud.google.com/go/iam v1.1.7 h1:z4VHOhwKLF/+UYXAJDFwGtNF0b6gjsW1Pk9Ml0U/IoM=
-cloud.google.com/go/iam v1.1.7/go.mod h1:J4PMPg8TtyurAUvSmPj8FF3EDgY1SPRZxcUGrn7WXGA=
-cloud.google.com/go/storage v1.40.0 h1:VEpDQV5CJxFmJ6ueWNsKxcr1QAYOXEgxDa+sBbJahPw=
-cloud.google.com/go/storage v1.40.0/go.mod h1:Rrj7/hKlG87BLqDJYtwR0fbPld8uJPbQ2ucUMY7Ir0g=
+cloud.google.com/go v0.115.1 h1:Jo0SM9cQnSkYfp44+v+NQXHpcHqlnRJk2qxh6yvxxxQ=
+cloud.google.com/go v0.115.1/go.mod h1:DuujITeaufu3gL68/lOFIirVNJwQeyf5UXyi+Wbgknc=
+cloud.google.com/go/auth v0.9.5 h1:4CTn43Eynw40aFVr3GpPqsQponx2jv0BQpjvajsbbzw=
+cloud.google.com/go/auth v0.9.5/go.mod h1:Xo0n7n66eHyOWWCnitop6870Ilwo3PiZyodVkkH1xWM=
+cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
+cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc=
+cloud.google.com/go/compute v1.14.0 h1:hfm2+FfxVmnRlh6LpB7cg1ZNU+5edAHmW679JePztk0=
+cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
+cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
+cloud.google.com/go/iam v1.1.13 h1:7zWBXG9ERbMLrzQBRhFliAV+kjcRToDTgQT3CTwYyv4=
+cloud.google.com/go/iam v1.1.13/go.mod h1:K8mY0uSXwEXS30KrnVb+j54LB/ntfZu1dr+4zFMNbus=
+cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs=
+cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
@@ -18,66 +19,73 @@ github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1r
 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=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/aws/aws-sdk-go v1.51.30 h1:RVFkjn9P0JMwnuZCVH0TlV5k9zepHzlbc4943eZMhGw=
-github.com/aws/aws-sdk-go v1.51.30/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
-github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY=
-github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM=
-github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90=
-github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.9 h1:TC2vjvaAv1VNl9A0rm+SeuBjrzXnrlwk6Yop+gKRi38=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.9/go.mod h1:WPv2FRnkIOoDv/8j2gSUsI4qDc7392w5anFB/I89GZ8=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 h1:Z5r7SycxmSllHYmaAZPpmN8GviDrSGhMS6bldqtXZPw=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15/go.mod h1:CetW7bDE00QoGEmPUoZuRog07SGVAUVW6LFpNP0YfIg=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 h1:YPYe6ZmvUfDDDELqEKtAd6bo8zxhkm+XEFEzQisqUIE=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17/go.mod h1:oBtcnYua/CgzCWYN7NZ5j7PotFDaFSUjCYVTtfyn7vw=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 h1:246A4lSTXWJw/rmlQI+TT2OcqeDMKBdyjEQrafMaQdA=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15/go.mod h1:haVfg3761/WF7YPuJOER2MP0k4UAXyHaLclKXB6usDg=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 h1:sZXIzO38GZOU+O0C+INqbH7C2yALwfMWpd64tONS/NE=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE=
-github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM=
-github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw=
-github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE=
-github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ=
-github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE=
-github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
+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.31.0 h1:3V05LbxTSItI5kUqNwhJrrrY1BAXxXt0sN0l72QmG5U=
+github.com/aws/aws-sdk-go-v2 v1.31.0/go.mod h1:ztolYtaEUtdpf9Wftr31CJfLVjOnD/CVRkKOOYgF8hA=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 h1:xDAuZTn4IMm8o1LnBZvmrL8JA1io4o3YWNXgohbf20g=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5/go.mod h1:wYSv6iDS621sEFLfKvpPE2ugjTuGlAG7iROg0hLOkfc=
+github.com/aws/aws-sdk-go-v2/config v1.27.39 h1:FCylu78eTGzW1ynHcongXK9YHtoXD5AiiUqq3YfJYjU=
+github.com/aws/aws-sdk-go-v2/config v1.27.39/go.mod h1:wczj2hbyskP4LjMKBEZwPRO1shXY+GsQleab+ZXT2ik=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.37 h1:G2aOH01yW8X373JK419THj5QVqu9vKEwxSEsGxihoW0=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.37/go.mod h1:0ecCjlb7htYCptRD45lXJ6aJDQac6D2NlKGpZqyTG6A=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 h1:C/d03NAmh8C4BZXhuRNboF/DqhBkBCeDiJDcaqIT5pA=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14/go.mod h1:7I0Ju7p9mCIdlrfS+JCgqcYD0VXz/N4yozsox+0o078=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.26 h1:BTfwWNFVGLxW2bih/V2xhgCsYDQwG1cAWhWoW9Jx7wE=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.26/go.mod h1:LA1/FxoEFFmv7XpkB8KKqLAUz8AePdK9H0Ec7PUKazs=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 h1:kYQ3H1u0ANr9KEKlGs/jTLrBFPo8P8NaH/w7A01NeeM=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18/go.mod h1:r506HmK5JDUh9+Mw4CfGJGSSoqIiLCndAuqXuhbv67Y=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 h1:Z7IdFUONvTcvS7YuhtVxN99v2cCoHRXOS4mTr0B/pUc=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18/go.mod h1:DkKMmksZVVyat+Y+r1dEOgJEfUeA7UngIHWeKsi0yNc=
+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.18 h1:OWYvKL53l1rbsUmW7bQyJVsYU/Ii3bbAAQIIFNbM0Tk=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18/go.mod h1:CUx0G1v3wG6l01tUB+j7Y8kclA8NSqK4ef0YG79a4cg=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 h1:QFASJGfT8wMXtuP3D5CRmMjARHv9ZmzFUMJznHDOY3w=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5/go.mod h1:QdZ3OmoIjSX+8D1OPAzPxDfjXASbBMDsz9qvtyIhtik=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 h1:rTWjG6AvWekO2B1LHeM3ktU7MqyX9rzWQ7hgzneZW7E=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20/go.mod h1:RGW2DDpVc8hu6Y6yG8G5CHVmVOAn1oV8rNKOHRJyswg=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 h1:Xbwbmk44URTiHNx6PNo0ujDE6ERlsCKJD3u1zfnzAPg=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20/go.mod h1:oAfOFzUB14ltPZj1rWwRc3d/6OgD76R8KlvU3EqM9Fg=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 h1:eb+tFOIl9ZsUe2259/BKPeniKuz4/02zZFH/i4Nf8Rg=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18/go.mod h1:GVCC2IJNJTmdlyEsSmofEy7EfJncP7DNnXDzRjJ5Keg=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.64.0 h1:I0p8knB/IDYSQ3dbanaCr4UhiYQ96bvKRhGYxvLyiD8=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.64.0/go.mod h1:NLTqRLe3pUNu3nTEHI6XlHLKYmc8fbHUdMxAB6+s41Q=
+github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 h1:rs4JCczF805+FDv2tRhZ1NU0RB2H6ryAvsWPanAr72Y=
+github.com/aws/aws-sdk-go-v2/service/sso v1.23.3/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 h1:S7EPdMVZod8BGKQQPTBK+FcX9g7bKR7c4+HxWqHP7Vg=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E=
+github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 h1:VzudTFrDCIDakXtemR7l6Qzt2+JYsVqo2MxBPt5k8T8=
+github.com/aws/aws-sdk-go-v2/service/sts v1.31.3/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI=
+github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA=
+github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec=
+github.com/containrrr/shoutrrr v0.8.0/go.mod h1:ioyQAyu1LJY6sILuNyKaQaw+9Ttik5QePU8atnAdO2o=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/domodwyer/mailyak/v3 v3.6.2 h1:x3tGMsyFhTCaxp6ycgR0FE/bu5QiNp+hetUuCOBXMn8=
 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.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE=
+github.com/ebitengine/purego v0.8.0/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=
@@ -93,15 +101,22 @@ github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8
 github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
 github.com/ganigeorgiev/fexpr v0.4.1 h1:hpUgbUEEWIZhSDBtf4M9aUNfQQ0BZkGRaMePy7Gcx5k=
 github.com/ganigeorgiev/fexpr v0.4.1/go.mod h1:RyGiGqmeXhEQ6+mlGdnUleLHgtzzu/VGO2WtJkF5drE=
+github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
+github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
+github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead57VkAEY4V+Es=
 github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
 github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
@@ -137,17 +152,17 @@ github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQF
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
-github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0 h1:e+8XbKB6IMn8A4OAyZccO4pYfB3s7bt6azNIPE7AnPg=
-github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
-github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
-github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
+github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
+github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+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/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
 github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
 github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s=
 github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
@@ -159,6 +174,8 @@ github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7V
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc=
+github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -172,6 +189,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61 h1:FwuzbVh87iLiUQj1+uQUsuw9x5t9m5n5g7rG7o4svW4=
 github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61/go.mod h1:paQfF1YtHe+GrGg5fOgjsjoCX/UKDr9bc1DoWpZfns8=
+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=
@@ -179,22 +198,29 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 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/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0=
+github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 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=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
+github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
 github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pocketbase/dbx v1.10.1 h1:cw+vsyfCJD8YObOVeqb93YErnlxwYMkNZ4rwN0G0AaA=
 github.com/pocketbase/dbx v1.10.1/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs=
-github.com/pocketbase/pocketbase v0.22.18 h1:yVckUhi5GDORqCb0BbtlvRB1CVxHY9HO9btEaeZHVJU=
-github.com/pocketbase/pocketbase v0.22.18/go.mod h1:0QFvDOOW7ANId78ChZSagyHbmP6CgMxDQrQFXzeaDpA=
+github.com/pocketbase/pocketbase v0.22.21 h1:DGPCxn6co8VuTV0mton4NFO/ON49XiFMszRr+Mysy48=
+github.com/pocketbase/pocketbase v0.22.21/go.mod h1:Cw5E4uoGhKItBIE2lJL3NfmiUr9Syk2xaNJ2G7Dssow=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -203,8 +229,10 @@ 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/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
-github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/shirou/gopsutil/v4 v4.24.9 h1:KIV+/HaHD5ka5f570RZq+2SaeFsb/pq+fp2DGNWYoOI=
+github.com/shirou/gopsutil/v4 v4.24.9/go.mod h1:3fkaHNeYsUFCGZ8+9vZVWtbyM1k2eRnlL+bWO8Bxa/Q=
+github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
+github.com/spf13/cast v1.7.0/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=
@@ -217,10 +245,14 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw=
 github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE=
+github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
+github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
 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=
@@ -229,36 +261,40 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 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.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0/go.mod h1:vy+2G/6NvVMpwGX/NyLqcC41fxepnuKHk16E6IZUcJc=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
-go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
-go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
-go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
-gocloud.dev v0.38.0 h1:SpxfaOc/Fp4PeO8ui7wRcCZV0EgXZ+IWcVSLn6ZMSw0=
-gocloud.dev v0.38.0/go.mod h1:3XjKvd2E5iVNu/xFImRzjN0d/fkNHe4s0RiKidpEUMQ=
+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.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
+go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
+go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
+go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
+go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
+go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
+gocloud.dev v0.39.0 h1:EYABYGhAalPUaMrbSKOr5lejxoxvXj99nE8XFtsDgds=
+gocloud.dev v0.39.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.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
+golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
-golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
+golang.org/x/image v0.20.0 h1:7cVCUjQwfL18gyBJOmYvptfSHS8Fb3YUDtfLIZ7Nbpw=
+golang.org/x/image v0.20.0/go.mod h1:0a88To4CYVBAHp5FXJm8o7QbUl37Vd85ply1vyD8auM=
 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.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.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=
@@ -270,48 +306,51 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 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.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 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.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
-golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.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.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.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.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.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.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
-golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 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.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
+golang.org/x/time v0.6.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=
@@ -319,14 +358,14 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 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.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
-golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
+golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
+golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk=
-golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
-google.golang.org/api v0.189.0 h1:equMo30LypAkdkLMBqfeIqtyAnlyig1JSZArl4XPwdI=
-google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8=
+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.199.0 h1:aWUXClp+VFJmqE0JPvpZOK3LDQMyFKYIow4etYd9qxs=
+google.golang.org/api v0.199.0/go.mod h1:ohG4qSztDJmZdjK/Ar6MhbAmb/Rpi4JHOqagsh90K28=
 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=
@@ -334,19 +373,19 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg=
-google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY=
-google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY=
-google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f h1:RARaIm8pxYuxyNPbBQf5igT7XdOyCNtat1qAT2ZxjU4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
+google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU=
+google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4=
+google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
+google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f h1:cUMEy+8oS78BWIH9OWazBkzbr090Od9tWBNtZHkOhf0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 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.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
-google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 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=
@@ -364,8 +403,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -373,16 +410,16 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 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.20.5 h1:s04akhT2dysD0DFOlv9fkQ6oUTLPYgMnnDk9oaqjszM=
-modernc.org/ccgo/v4 v4.20.5/go.mod h1:fYXClPUMWxWaz1Xj5sHbzW/ZENEFeuHLToqBxUk41nE=
+modernc.org/ccgo/v4 v4.21.0 h1:kKPI3dF7RIag8YcToh5ZwDcVMIv6VGa0ED5cvh0LMW4=
+modernc.org/ccgo/v4 v4.21.0/go.mod h1:h6kt6H/A2+ew/3MW/p6KEoQmrq/i3pr0J/SiwiaF/g0=
 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.3 h1:Ik4ZcMbC7aY4ZDPUhzXVXi7GMub9QcXLTfXn3mWpNw8=
-modernc.org/gc/v2 v2.4.3/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
-modernc.org/gc/v3 v3.0.0-20240722195230-4a140ff9c08e h1:WPC4v0rNIFb2PY+nBBEEKyugPPRHPzUgyN3xZPpGK58=
-modernc.org/gc/v3 v3.0.0-20240722195230-4a140ff9c08e/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.55.5 h1:7duW01NsK0fIJ1xctdujeNDO46yPC89t0TZwDC5fE5k=
-modernc.org/libc v1.55.5/go.mod h1:JXguUpMkbw1gknxspNE9XaG+kk9hDAAnBxpA6KGLiyA=
+modernc.org/gc/v2 v2.5.0 h1:bJ9ChznK1L1mUtAQtxi0wi5AtAs5jQuw4PrPHO5pb6M=
+modernc.org/gc/v2 v2.5.0/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
+modernc.org/gc/v3 v3.0.0-20240801135723-a856999a2e4a h1:CfbpOLEo2IwNzJdMvE8aiRbPMxoTpgAJeyePh0SmO8M=
+modernc.org/gc/v3 v3.0.0-20240801135723-a856999a2e4a/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
+modernc.org/libc v1.61.0 h1:eGFcvWpqlnoGwzZeZe3PWJkkKbM/3SUGyk1DVZQ0TpE=
+modernc.org/libc v1.61.0/go.mod h1:DvxVX89wtGTu+r72MLGhygpfi3aUGgZRdAYGCAVVud0=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
@@ -391,8 +428,8 @@ 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.31.1 h1:XVU0VyzxrYHlBhIs1DiEgSl0ZtdnPtbLVy8hSkzxGrs=
-modernc.org/sqlite v1.31.1/go.mod h1:UqoylwmTb9F+IqXERT8bW9zzOWN8qwAIcLdzeBZs4hA=
+modernc.org/sqlite v1.33.1 h1:trb6Z3YYoeM9eDL1O8do81kP+0ejv+YzgyFo+Gwy0nM=
+modernc.org/sqlite v1.33.1/go.mod h1:pXV2xHxhzXZsgT/RtTFAPY6JJDEvOTcTdwADQCCWD4k=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
--- a/beszel/internal/agent/agent.go
+++ b/beszel/internal/agent/agent.go
@@ -0,0 +1,100 @@
+// Package agent handles the agent's SSH server and system stats collection.
+package agent
+
+import (
+	"beszel/internal/entities/system"
+	"context"
+	"log/slog"
+	"os"
+	"strings"
+
+	"github.com/shirou/gopsutil/v4/common"
+)
+
+type Agent struct {
+	debug            bool                       // true if LOG_LEVEL is set to debug
+	zfs              bool                       // true if system has arcstats
+	memCalc          string                     // Memory calculation formula
+	fsNames          []string                   // List of filesystem device names being monitored
+	fsStats          map[string]*system.FsStats // Keeps track of disk stats for each filesystem
+	netInterfaces    map[string]struct{}        // Stores all valid network interfaces
+	netIoStats       system.NetIoStats          // Keeps track of bandwidth usage
+	dockerManager    *dockerManager             // Manages Docker API requests
+	sensorsContext   context.Context            // Sensors context to override sys location
+	sensorsWhitelist map[string]struct{}        // List of sensors to monitor
+	systemInfo       system.Info                // Host system info
+}
+
+func NewAgent() *Agent {
+	return &Agent{
+		sensorsContext: context.Background(),
+		memCalc:        os.Getenv("MEM_CALC"),
+	}
+}
+
+func (a *Agent) Run(pubKey []byte, addr string) {
+	// Set up slog with a log level determined by the LOG_LEVEL env var
+	if logLevelStr, exists := os.LookupEnv("LOG_LEVEL"); exists {
+		switch strings.ToLower(logLevelStr) {
+		case "debug":
+			a.debug = true
+			slog.SetLogLoggerLevel(slog.LevelDebug)
+		case "warn":
+			slog.SetLogLoggerLevel(slog.LevelWarn)
+		case "error":
+			slog.SetLogLoggerLevel(slog.LevelError)
+		}
+	}
+
+	// Set sensors context (allows overriding sys location for sensors)
+	if sysSensors, exists := os.LookupEnv("SYS_SENSORS"); exists {
+		slog.Info("SYS_SENSORS", "path", sysSensors)
+		a.sensorsContext = context.WithValue(a.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, ",") {
+			a.sensorsWhitelist[sensor] = struct{}{}
+		}
+	}
+
+	// initialize system info / docker manager
+	a.initializeSystemInfo()
+	a.initializeDiskInfo()
+	a.initializeNetIoStats()
+	a.dockerManager = newDockerManager()
+
+	// if debugging, print stats
+	if a.debug {
+		slog.Debug("Stats", "data", a.GatherStats())
+	}
+
+	if pubKey != nil {
+		a.startServer(pubKey, addr)
+	}
+}
+
+func (a *Agent) GatherStats() system.CombinedData {
+	systemData := system.CombinedData{
+		Stats: a.getSystemStats(),
+		Info:  a.systemInfo,
+	}
+	// add docker stats
+	if containerStats, err := a.dockerManager.getDockerStats(); err == nil {
+		systemData.Containers = containerStats
+	} else {
+		slog.Debug("Error getting docker stats", "err", err)
+	}
+	// add extra filesystems
+	systemData.Stats.ExtraFs = make(map[string]*system.FsStats)
+	for name, stats := range a.fsStats {
+		if !stats.Root && stats.DiskTotal > 0 {
+			systemData.Stats.ExtraFs[name] = stats
+		}
+	}
+	return systemData
+}
--- a/beszel/internal/agent/disk.go
+++ b/beszel/internal/agent/disk.go
@@ -0,0 +1,169 @@
+package agent
+
+import (
+	"beszel/internal/entities/system"
+	"log/slog"
+	"time"
+
+	"os"
+	"path/filepath"
+	"strings"
+
+	"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")
+	efPath := "/extra-filesystems"
+	hasRoot := false
+
+	// Create map for disk stats
+	a.fsStats = make(map[string]*system.FsStats)
+
+	partitions, err := disk.Partitions(false)
+	if err != nil {
+		slog.Error("Error getting disk partitions", "err", err)
+	}
+	slog.Debug("Disk", "partitions", partitions)
+
+	// ioContext := context.WithValue(a.sensorsContext,
+	// 	common.EnvKey, common.EnvMap{common.HostProcEnvKey: "/tmp/testproc"},
+	// )
+	// diskIoCounters, err := disk.IOCountersWithContext(ioContext)
+
+	diskIoCounters, err := disk.IOCounters()
+	if err != nil {
+		slog.Error("Error getting diskstats", "err", err)
+	}
+	slog.Debug("Disk I/O", "diskstats", diskIoCounters)
+
+	// Helper function to add a filesystem to fsStats if it doesn't exist
+	addFsStat := func(device, mountpoint string, root bool) {
+		key := filepath.Base(device)
+		if _, exists := a.fsStats[key]; !exists {
+			if root {
+				slog.Info("Detected root device", "name", key)
+				// check if root device is in /proc/diskstats, use fallback if not
+				if _, exists := diskIoCounters[key]; !exists {
+					slog.Warn("Device not found in diskstats", "name", key)
+					key = findFallbackIoDevice(filesystem, diskIoCounters)
+					slog.Info("Using I/O fallback", "name", key)
+				}
+			}
+			a.fsStats[key] = &system.FsStats{Root: root, Mountpoint: mountpoint}
+		}
+	}
+
+	// Use FILESYSTEM env var to find root filesystem
+	if filesystem != "" {
+		for _, p := range partitions {
+			if strings.HasSuffix(p.Device, filesystem) || p.Mountpoint == filesystem {
+				addFsStat(p.Device, p.Mountpoint, true)
+				hasRoot = true
+				break
+			}
+		}
+		if !hasRoot {
+			slog.Warn("Partition details not found", "filesystem", filesystem)
+		}
+	}
+
+	// Add EXTRA_FILESYSTEMS env var values to fsStats
+	if extraFilesystems, exists := os.LookupEnv("EXTRA_FILESYSTEMS"); exists {
+		for _, fs := range strings.Split(extraFilesystems, ",") {
+			found := false
+			for _, p := range partitions {
+				if strings.HasSuffix(p.Device, fs) || p.Mountpoint == fs {
+					addFsStat(p.Device, p.Mountpoint, false)
+					found = true
+					break
+				}
+			}
+			// if not in partitions, test if we can get disk usage
+			if !found {
+				if _, err := disk.Usage(fs); err == nil {
+					addFsStat(filepath.Base(fs), fs, false)
+				} else {
+					slog.Error("Invalid filesystem", "name", fs, "err", err)
+				}
+			}
+		}
+	}
+
+	// Process partitions for various mount points
+	for _, p := range partitions {
+		// fmt.Println(p.Device, p.Mountpoint)
+		// Binary root fallback or docker root fallback
+		if !hasRoot && (p.Mountpoint == "/" || (p.Mountpoint == "/etc/hosts" && strings.HasPrefix(p.Device, "/dev") && !strings.Contains(p.Device, "mapper"))) {
+			addFsStat(p.Device, "/", true)
+			hasRoot = true
+		}
+
+		// Check if device is in /extra-filesystems
+		if strings.HasPrefix(p.Mountpoint, efPath) {
+			addFsStat(p.Device, p.Mountpoint, false)
+		}
+	}
+
+	// Check all folders in /extra-filesystems and add them if not already present
+	if folders, err := os.ReadDir(efPath); err == nil {
+		existingMountpoints := make(map[string]bool)
+		for _, stats := range a.fsStats {
+			existingMountpoints[stats.Mountpoint] = true
+		}
+		for _, folder := range folders {
+			if folder.IsDir() {
+				mountpoint := filepath.Join(efPath, folder.Name())
+				slog.Debug("/extra-filesystems", "mountpoint", mountpoint)
+				if !existingMountpoints[mountpoint] {
+					a.fsStats[folder.Name()] = &system.FsStats{Mountpoint: mountpoint}
+				}
+			}
+		}
+	}
+
+	// If no root filesystem set, use fallback
+	if !hasRoot {
+		rootDevice := findFallbackIoDevice(filepath.Base(filesystem), diskIoCounters)
+		slog.Info("Root disk", "mountpoint", "/", "io", rootDevice)
+		a.fsStats[rootDevice] = &system.FsStats{Root: true, Mountpoint: "/"}
+	}
+
+	a.initializeDiskIoStats(diskIoCounters)
+}
+
+// Returns the device with the most reads in /proc/diskstats,
+// or the device specified by the filesystem argument if it exists
+func findFallbackIoDevice(filesystem string, diskIoCounters map[string]disk.IOCountersStat) string {
+	var maxReadBytes uint64
+	maxReadDevice := "/"
+	for _, d := range diskIoCounters {
+		if d.Name == filesystem {
+			return d.Name
+		}
+		if d.ReadBytes > maxReadBytes {
+			maxReadBytes = d.ReadBytes
+			maxReadDevice = d.Name
+		}
+	}
+	return maxReadDevice
+}
+
+// Sets start values for disk I/O stats.
+func (a *Agent) initializeDiskIoStats(diskIoCounters map[string]disk.IOCountersStat) {
+	for device, stats := range a.fsStats {
+		// skip if not in diskIoCounters
+		d, exists := diskIoCounters[device]
+		if !exists {
+			slog.Warn("Device not found in diskstats", "name", device)
+			continue
+		}
+		// populate initial values
+		stats.Time = time.Now()
+		stats.TotalRead = d.ReadBytes
+		stats.TotalWrite = d.WriteBytes
+		// add to list of valid io device names
+		a.fsNames = append(a.fsNames, device)
+	}
+}
--- a/beszel/internal/agent/docker.go
+++ b/beszel/internal/agent/docker.go
@@ -0,0 +1,253 @@
+package agent
+
+import (
+	"beszel/internal/entities/container"
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/blang/semver"
+)
+
+type dockerManager struct {
+	client              *http.Client                // Client to query Docker API
+	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
+	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
+}
+
+// Add goroutine to the queue
+func (d *dockerManager) queue() {
+	d.sem <- struct{}{}
+	d.wg.Add(1)
+}
+
+// Remove goroutine from the queue
+func (d *dockerManager) dequeue() {
+	<-d.sem
+	d.wg.Done()
+}
+
+// Returns stats for all running containers
+func (dm *dockerManager) getDockerStats() ([]*container.Stats, error) {
+	resp, err := dm.client.Get("http://localhost/containers/json")
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if err := json.NewDecoder(resp.Body).Decode(&dm.apiContainerList); err != nil {
+		return nil, err
+	}
+
+	containersLength := len(*dm.apiContainerList)
+
+	// store valid ids to clean up old container ids from map
+	if dm.validIds == nil {
+		dm.validIds = make(map[string]struct{}, containersLength)
+	} else {
+		clear(dm.validIds)
+	}
+
+	for _, ctr := range *dm.apiContainerList {
+		ctr.IdShort = ctr.Id[:12]
+		dm.validIds[ctr.IdShort] = struct{}{}
+		// check if container is less than 1 minute old (possible restart)
+		// note: can't use Created field because it's not updated on restart
+		if strings.Contains(ctr.Status, "second") {
+			// if so, remove old container data
+			dm.deleteContainerStatsSync(ctr.IdShort)
+		}
+		dm.queue()
+		go func() {
+			defer dm.dequeue()
+			err := dm.updateContainerStats(ctr)
+			if err != nil {
+				dm.deleteContainerStatsSync(ctr.IdShort)
+				// retry once
+				err = dm.updateContainerStats(ctr)
+				if err != nil {
+					slog.Error("Error getting container stats", "err", err)
+				}
+			}
+		}()
+	}
+
+	dm.wg.Wait()
+
+	// populate final stats and remove old / invalid container stats
+	stats := make([]*container.Stats, 0, containersLength)
+	for id, v := range dm.containerStatsMap {
+		if _, exists := dm.validIds[id]; !exists {
+			delete(dm.containerStatsMap, id)
+		} else {
+			stats = append(stats, v)
+		}
+	}
+
+	return stats, nil
+}
+
+// Updates stats for individual container
+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")
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	dm.containerStatsMutex.Lock()
+	defer dm.containerStatsMutex.Unlock()
+
+	// add empty values if they doesn't exist in map
+	stats, initialized := dm.containerStatsMap[ctr.IdShort]
+	if !initialized {
+		stats = &container.Stats{Name: name}
+		dm.containerStatsMap[ctr.IdShort] = stats
+	}
+
+	// reset current stats
+	stats.Cpu = 0
+	stats.Mem = 0
+	stats.NetworkSent = 0
+	stats.NetworkRecv = 0
+
+	// docker host container stats response
+	var res container.ApiStats
+	if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
+		return err
+	}
+
+	// check if container has valid data, otherwise may be in restart loop (#103)
+	if res.MemoryStats.Usage == 0 {
+		return fmt.Errorf("%s - no memory stats - see https://github.com/henrygd/beszel/issues/144", name)
+	}
+
+	// memory (https://docs.docker.com/reference/cli/docker/container/stats/)
+	memCache := res.MemoryStats.Stats.InactiveFile
+	if memCache == 0 {
+		memCache = res.MemoryStats.Stats.Cache
+	}
+	usedMemory := res.MemoryStats.Usage - memCache
+
+	// cpu
+	cpuDelta := res.CPUStats.CPUUsage.TotalUsage - stats.PrevCpu[0]
+	systemDelta := res.CPUStats.SystemUsage - stats.PrevCpu[1]
+	cpuPct := float64(cpuDelta) / float64(systemDelta) * 100
+	if cpuPct > 100 {
+		return fmt.Errorf("%s cpu pct greater than 100: %+v", name, cpuPct)
+	}
+	stats.PrevCpu = [2]uint64{res.CPUStats.CPUUsage.TotalUsage, res.CPUStats.SystemUsage}
+
+	// network
+	var total_sent, total_recv uint64
+	for _, v := range res.Networks {
+		total_sent += v.TxBytes
+		total_recv += v.RxBytes
+	}
+	var sent_delta, recv_delta float64
+	// prevent first run from sending all prev sent/recv bytes
+	if initialized {
+		secondsElapsed := time.Since(stats.PrevNet.Time).Seconds()
+		sent_delta = float64(total_sent-stats.PrevNet.Sent) / secondsElapsed
+		recv_delta = float64(total_recv-stats.PrevNet.Recv) / secondsElapsed
+	}
+	stats.PrevNet.Sent = total_sent
+	stats.PrevNet.Recv = total_recv
+	stats.PrevNet.Time = time.Now()
+
+	stats.Cpu = twoDecimals(cpuPct)
+	stats.Mem = bytesToMegabytes(float64(usedMemory))
+	stats.NetworkSent = bytesToMegabytes(sent_delta)
+	stats.NetworkRecv = bytesToMegabytes(recv_delta)
+
+	return nil
+}
+
+// Delete container stats from map using mutex
+func (dm *dockerManager) deleteContainerStatsSync(id string) {
+	dm.containerStatsMutex.Lock()
+	defer dm.containerStatsMutex.Unlock()
+	delete(dm.containerStatsMap, id)
+}
+
+// Creates a new http client for Docker API
+func newDockerManager() *dockerManager {
+	dockerHost := "unix:///var/run/docker.sock"
+	if dockerHostEnv, exists := os.LookupEnv("DOCKER_HOST"); exists {
+		slog.Info("DOCKER_HOST", "host", dockerHostEnv)
+		dockerHost = dockerHostEnv
+	}
+
+	parsedURL, err := url.Parse(dockerHost)
+	if err != nil {
+		slog.Error("Error parsing DOCKER_HOST", "err", err)
+		os.Exit(1)
+	}
+
+	transport := &http.Transport{
+		DisableCompression: true,
+		MaxConnsPerHost:    0,
+	}
+
+	switch parsedURL.Scheme {
+	case "unix":
+		transport.DialContext = func(ctx context.Context, proto, addr string) (net.Conn, error) {
+			return (&net.Dialer{}).DialContext(ctx, "unix", parsedURL.Path)
+		}
+	case "tcp", "http", "https":
+		transport.DialContext = func(ctx context.Context, proto, addr string) (net.Conn, error) {
+			return (&net.Dialer{}).DialContext(ctx, "tcp", parsedURL.Host)
+		}
+	default:
+		slog.Error("Invalid DOCKER_HOST", "scheme", parsedURL.Scheme)
+		os.Exit(1)
+	}
+
+	dockerClient := &dockerManager{
+		client: &http.Client{
+			Timeout:   time.Millisecond * 1100,
+			Transport: transport,
+		},
+		containerStatsMap: make(map[string]*container.Stats),
+	}
+
+	// Make sure sem is initialized
+	concurrency := 200
+	defer func() { dockerClient.sem = make(chan struct{}, concurrency) }()
+
+	// Check docker version
+	// (versions before 25.0.0 have a bug with one-shot which requires all requests to be made in one batch)
+	var versionInfo struct {
+		Version string `json:"Version"`
+	}
+	resp, err := dockerClient.client.Get("http://localhost/version")
+	if err != nil {
+		return dockerClient
+	}
+
+	if err := json.NewDecoder(resp.Body).Decode(&versionInfo); err != nil {
+		return dockerClient
+	}
+
+	// if version > 25, one-shot works correctly and we can limit concurrent connections / goroutines to 5
+	if dockerVersion, err := semver.Parse(versionInfo.Version); err == nil && dockerVersion.Major > 24 {
+		concurrency = 5
+	}
+	slog.Debug("Docker", "version", versionInfo.Version, "concurrency", concurrency)
+
+	return dockerClient
+}
--- a/beszel/internal/agent/network.go
+++ b/beszel/internal/agent/network.go
@@ -0,0 +1,67 @@
+package agent
+
+import (
+	"log/slog"
+	"os"
+	"strings"
+	"time"
+
+	psutilNet "github.com/shirou/gopsutil/v4/net"
+)
+
+func (a *Agent) initializeNetIoStats() {
+	// reset valid network interfaces
+	a.netInterfaces = make(map[string]struct{}, 0)
+
+	// map of network interface names passed in via NICS env var
+	var nicsMap map[string]struct{}
+	nics, nicsEnvExists := os.LookupEnv("NICS")
+	if nicsEnvExists {
+		nicsMap = make(map[string]struct{}, 0)
+		for _, nic := range strings.Split(nics, ",") {
+			nicsMap[nic] = struct{}{}
+		}
+	}
+
+	// reset network I/O stats
+	a.netIoStats.BytesSent = 0
+	a.netIoStats.BytesRecv = 0
+
+	// get intial network I/O stats
+	if netIO, err := psutilNet.IOCounters(true); err == nil {
+		a.netIoStats.Time = time.Now()
+		for _, v := range netIO {
+			switch {
+			// skip if nics exists and the interface is not in the list
+			case nicsEnvExists:
+				if _, nameInNics := nicsMap[v.Name]; !nameInNics {
+					continue
+				}
+			// otherwise run the interface name through the skipNetworkInterface function
+			default:
+				if a.skipNetworkInterface(v) {
+					continue
+				}
+			}
+			slog.Info("Detected network interface", "name", v.Name, "sent", v.BytesSent, "recv", v.BytesRecv)
+			a.netIoStats.BytesSent += v.BytesSent
+			a.netIoStats.BytesRecv += v.BytesRecv
+			// store as a valid network interface
+			a.netInterfaces[v.Name] = struct{}{}
+		}
+	}
+}
+
+func (a *Agent) skipNetworkInterface(v psutilNet.IOCountersStat) bool {
+	switch {
+	case strings.HasPrefix(v.Name, "lo"),
+		strings.HasPrefix(v.Name, "docker"),
+		strings.HasPrefix(v.Name, "br-"),
+		strings.HasPrefix(v.Name, "veth"),
+		v.BytesRecv == 0,
+		v.BytesSent == 0:
+		return true
+	default:
+		return false
+	}
+}
--- a/beszel/internal/agent/server.go
+++ b/beszel/internal/agent/server.go
@@ -0,0 +1,35 @@
+package agent
+
+import (
+	"encoding/json"
+	"log/slog"
+	"os"
+
+	sshServer "github.com/gliderlabs/ssh"
+)
+
+func (a *Agent) startServer(pubKey []byte, addr string) {
+	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)
+	}
+}
+
+func (a *Agent) handleSession(s sshServer.Session) {
+	stats := a.GatherStats()
+	slog.Debug("Sending stats", "data", stats)
+	if err := json.NewEncoder(s).Encode(stats); err != nil {
+		slog.Error("Error encoding stats", "err", err)
+		s.Exit(1)
+		return
+	}
+	s.Exit(0)
+}
--- a/beszel/internal/agent/system.go
+++ b/beszel/internal/agent/system.go
@@ -0,0 +1,239 @@
+package agent
+
+import (
+	"beszel"
+	"beszel/internal/entities/system"
+	"bufio"
+	"fmt"
+	"log/slog"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/shirou/gopsutil/v4/cpu"
+	"github.com/shirou/gopsutil/v4/disk"
+	"github.com/shirou/gopsutil/v4/host"
+	"github.com/shirou/gopsutil/v4/mem"
+	psutilNet "github.com/shirou/gopsutil/v4/net"
+	"github.com/shirou/gopsutil/v4/sensors"
+)
+
+// Sets initial / non-changing values about the host system
+func (a *Agent) initializeSystemInfo() {
+	a.systemInfo.AgentVersion = beszel.Version
+	a.systemInfo.Hostname, _ = os.Hostname()
+	a.systemInfo.KernelVersion, _ = host.KernelVersion()
+
+	// cpu model
+	if info, err := cpu.Info(); err == nil && len(info) > 0 {
+		a.systemInfo.CpuModel = info[0].ModelName
+	}
+	// cores / threads
+	a.systemInfo.Cores, _ = cpu.Counts(false)
+	if threads, err := cpu.Counts(true); err == nil {
+		if threads > 0 && threads < a.systemInfo.Cores {
+			// in lxc logical cores reflects container limits, so use that as cores if lower
+			a.systemInfo.Cores = threads
+		} else {
+			a.systemInfo.Threads = threads
+		}
+	}
+
+	// zfs
+	if _, err := getARCSize(); err == nil {
+		a.zfs = true
+	} else {
+		slog.Debug("Not monitoring ZFS ARC", "err", err)
+	}
+}
+
+// Returns current info, stats about the host system
+func (a *Agent) getSystemStats() system.Stats {
+	systemStats := system.Stats{}
+
+	// cpu percent
+	cpuPct, err := cpu.Percent(0, false)
+	if err != nil {
+		slog.Error("Error getting cpu percent", "err", err)
+	} else if len(cpuPct) > 0 {
+		systemStats.Cpu = twoDecimals(cpuPct[0])
+	}
+
+	// memory
+	if v, err := mem.VirtualMemory(); err == nil {
+		// swap
+		systemStats.Swap = bytesToGigabytes(v.SwapTotal)
+		systemStats.SwapUsed = bytesToGigabytes(v.SwapTotal - v.SwapFree - v.SwapCached)
+		// cache + buffers value for default mem calculation
+		cacheBuff := v.Total - v.Free - v.Used
+		// htop memory calculation overrides
+		if a.memCalc == "htop" {
+			// note: gopsutil automatically adds SReclaimable to v.Cached
+			cacheBuff = v.Cached + v.Buffers - v.Shared
+			v.Used = v.Total - (v.Free + cacheBuff)
+			v.UsedPercent = float64(v.Used) / float64(v.Total) * 100.0
+		}
+		// subtract ZFS ARC size from used memory and add as its own category
+		if a.zfs {
+			if arcSize, _ := getARCSize(); arcSize > 0 && arcSize < v.Used {
+				v.Used = v.Used - arcSize
+				v.UsedPercent = float64(v.Used) / float64(v.Total) * 100.0
+				systemStats.MemZfsArc = bytesToGigabytes(arcSize)
+			}
+		}
+		systemStats.Mem = bytesToGigabytes(v.Total)
+		systemStats.MemBuffCache = bytesToGigabytes(cacheBuff)
+		systemStats.MemUsed = bytesToGigabytes(v.Used)
+		systemStats.MemPct = twoDecimals(v.UsedPercent)
+	}
+
+	// disk usage
+	for _, stats := range a.fsStats {
+		if d, err := disk.Usage(stats.Mountpoint); err == nil {
+			stats.DiskTotal = bytesToGigabytes(d.Total)
+			stats.DiskUsed = bytesToGigabytes(d.Used)
+			if stats.Root {
+				systemStats.DiskTotal = bytesToGigabytes(d.Total)
+				systemStats.DiskUsed = bytesToGigabytes(d.Used)
+				systemStats.DiskPct = twoDecimals(d.UsedPercent)
+			}
+		} else {
+			// reset stats if error (likely unmounted)
+			slog.Error("Error getting disk stats", "name", stats.Mountpoint, "err", err)
+			stats.DiskTotal = 0
+			stats.DiskUsed = 0
+			stats.TotalRead = 0
+			stats.TotalWrite = 0
+		}
+	}
+
+	// disk i/o
+	if ioCounters, err := disk.IOCounters(a.fsNames...); err == nil {
+		for _, d := range ioCounters {
+			stats := a.fsStats[d.Name]
+			if stats == nil {
+				continue
+			}
+			secondsElapsed := time.Since(stats.Time).Seconds()
+			readPerSecond := float64(d.ReadBytes-stats.TotalRead) / secondsElapsed
+			writePerSecond := float64(d.WriteBytes-stats.TotalWrite) / secondsElapsed
+			stats.Time = time.Now()
+			stats.DiskReadPs = bytesToMegabytes(readPerSecond)
+			stats.DiskWritePs = bytesToMegabytes(writePerSecond)
+			stats.TotalRead = d.ReadBytes
+			stats.TotalWrite = d.WriteBytes
+			// if root filesystem, update system stats
+			if stats.Root {
+				systemStats.DiskReadPs = stats.DiskReadPs
+				systemStats.DiskWritePs = stats.DiskWritePs
+			}
+		}
+	}
+
+	// network stats
+	if netIO, err := psutilNet.IOCounters(true); err == nil {
+		secondsElapsed := time.Since(a.netIoStats.Time).Seconds()
+		a.netIoStats.Time = time.Now()
+		bytesSent := uint64(0)
+		bytesRecv := uint64(0)
+		// sum all bytes sent and received
+		for _, v := range netIO {
+			// skip if not in valid network interfaces list
+			if _, exists := a.netInterfaces[v.Name]; !exists {
+				continue
+			}
+			bytesSent += v.BytesSent
+			bytesRecv += v.BytesRecv
+		}
+		// add to systemStats
+		sentPerSecond := float64(bytesSent-a.netIoStats.BytesSent) / secondsElapsed
+		recvPerSecond := float64(bytesRecv-a.netIoStats.BytesRecv) / secondsElapsed
+		networkSentPs := bytesToMegabytes(sentPerSecond)
+		networkRecvPs := bytesToMegabytes(recvPerSecond)
+		// add check for issue (#150) where sent is a massive number
+		if networkSentPs > 10_000 || networkRecvPs > 10_000 {
+			slog.Warn("Invalid network stats. Resetting.", "sent", networkSentPs, "recv", networkRecvPs)
+			for _, v := range netIO {
+				if _, exists := a.netInterfaces[v.Name]; !exists {
+					continue
+				}
+				slog.Info(v.Name, "recv", v.BytesRecv, "sent", v.BytesSent)
+			}
+			// reset network I/O stats
+			a.initializeNetIoStats()
+		} else {
+			systemStats.NetworkSent = networkSentPs
+			systemStats.NetworkRecv = networkRecvPs
+			// update netIoStats
+			a.netIoStats.BytesSent = bytesSent
+			a.netIoStats.BytesRecv = bytesRecv
+		}
+	}
+
+	// temperatures
+	temps, err := sensors.TemperaturesWithContext(a.sensorsContext)
+	if err != nil && a.debug {
+		err.(*sensors.Warnings).Verbose = true
+		slog.Debug("Sensor error", "errs", err)
+	}
+	if len(temps) > 0 {
+		slog.Debug("Temperatures", "data", temps)
+		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)
+				}
+			}
+		}
+	}
+
+	// update base system info
+	a.systemInfo.Cpu = systemStats.Cpu
+	a.systemInfo.MemPct = systemStats.MemPct
+	a.systemInfo.DiskPct = systemStats.DiskPct
+	a.systemInfo.Uptime, _ = host.Uptime()
+
+	return systemStats
+}
+
+// Returns the size of the ZFS ARC memory cache in bytes
+func getARCSize() (uint64, error) {
+	file, err := os.Open("/proc/spl/kstat/zfs/arcstats")
+	if err != nil {
+		return 0, err
+	}
+	defer file.Close()
+
+	// Scan the lines
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.HasPrefix(line, "size") {
+			// Example line: size 4 15032385536
+			fields := strings.Fields(line)
+			if len(fields) < 3 {
+				return 0, err
+			}
+			// Return the size as uint64
+			return strconv.ParseUint(fields[2], 10, 64)
+		}
+	}
+
+	return 0, fmt.Errorf("failed to parse size field")
+}
--- a/beszel/internal/agent/utils.go
+++ b/beszel/internal/agent/utils.go
@@ -0,0 +1,15 @@
+package agent
+
+import "math"
+
+func bytesToMegabytes(b float64) float64 {
+	return twoDecimals(b / 1048576)
+}
+
+func bytesToGigabytes(b uint64) float64 {
+	return twoDecimals(float64(b) / 1073741824)
+}
+
+func twoDecimals(value float64) float64 {
+	return math.Round(value*100) / 100
+}
--- a/beszel/internal/alerts/alerts.go
+++ b/beszel/internal/alerts/alerts.go
@@ -0,0 +1,288 @@
+// Package alerts handles alert management and delivery.
+package alerts
+
+import (
+	"beszel/internal/entities/system"
+	"fmt"
+	"net/mail"
+	"net/url"
+
+	"github.com/containrrr/shoutrrr"
+	"github.com/labstack/echo/v5"
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/apis"
+	"github.com/pocketbase/pocketbase/models"
+	"github.com/pocketbase/pocketbase/tools/mailer"
+)
+
+type AlertManager struct {
+	app *pocketbase.PocketBase
+}
+
+type AlertData struct {
+	UserID   string
+	Title    string
+	Message  string
+	Link     string
+	LinkText string
+}
+
+type UserNotificationSettings struct {
+	Emails   []string `json:"emails"`
+	Webhooks []string `json:"webhooks"`
+}
+
+func NewAlertManager(app *pocketbase.PocketBase) *AlertManager {
+	return &AlertManager{
+		app: app,
+	}
+}
+
+func (am *AlertManager) HandleSystemInfoAlerts(systemRecord *models.Record, systemInfo system.Info) {
+	alertRecords, err := am.app.Dao().FindRecordsByExpr("alerts",
+		dbx.NewExp("system={:system}", dbx.Params{"system": systemRecord.GetId()}),
+	)
+	if err != nil || len(alertRecords) == 0 {
+		// log.Println("no alerts found for system")
+		return
+	}
+	// log.Println("found alerts", len(alertRecords))
+	for _, alertRecord := range alertRecords {
+		name := alertRecord.GetString("name")
+		switch name {
+		case "CPU", "Memory", "Disk":
+			if name == "CPU" {
+				am.handleSlidingValueAlert(systemRecord, alertRecord, name, systemInfo.Cpu)
+			} else if name == "Memory" {
+				am.handleSlidingValueAlert(systemRecord, alertRecord, name, systemInfo.MemPct)
+			} else if name == "Disk" {
+				am.handleSlidingValueAlert(systemRecord, alertRecord, name, systemInfo.DiskPct)
+			}
+		}
+	}
+}
+
+func (am *AlertManager) handleSlidingValueAlert(systemRecord *models.Record, alertRecord *models.Record, name string, curValue float64) {
+	triggered := alertRecord.GetBool("triggered")
+	threshold := alertRecord.GetFloat("value")
+	// fmt.Println(name, curValue, "threshold", threshold, "triggered", triggered)
+	var subject string
+	var body string
+	var systemName string
+	if !triggered && curValue > threshold {
+		alertRecord.Set("triggered", true)
+		systemName = systemRecord.GetString("name")
+		subject = fmt.Sprintf("%s usage above threshold on %s", name, systemName)
+		body = fmt.Sprintf("%s usage on %s is %.1f%%.", name, systemName, curValue)
+	} else if triggered && curValue <= threshold {
+		alertRecord.Set("triggered", false)
+		systemName = systemRecord.GetString("name")
+		subject = fmt.Sprintf("%s usage below threshold on %s", name, systemName)
+		body = fmt.Sprintf("%s usage on %s is below threshold at %.1f%%.", name, systemName, curValue)
+	} else {
+		// fmt.Println(name, "not triggered")
+		return
+	}
+	if err := am.app.Dao().SaveRecord(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.Dao().ExpandRecord(alertRecord, []string{"user"}, nil); len(errs) > 0 {
+		// app.Logger().Error("failed to expand user relation", "errs", errs)
+		return
+	}
+	if user := alertRecord.ExpandedOne("user"); user != nil {
+		am.sendAlert(AlertData{
+			UserID:   user.GetId(),
+			Title:    subject,
+			Message:  body,
+			Link:     am.app.Settings().Meta.AppUrl + "/system/" + url.QueryEscape(systemName),
+			LinkText: "View " + systemName,
+		})
+	}
+}
+
+func (am *AlertManager) HandleStatusAlerts(newStatus string, oldSystemRecord *models.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.Dao().FindRecordsByExpr("alerts",
+		dbx.HashExp{
+			"system": oldSystemRecord.GetId(),
+			"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.Dao().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(AlertData{
+			UserID:   user.GetId(),
+			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.QueryEscape(systemName),
+			LinkText: "View " + systemName,
+		})
+	}
+	return nil
+}
+
+func (am *AlertManager) sendAlert(data AlertData) {
+	// get user settings
+	record, err := am.app.Dao().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
+	}
+	// unmarshal user settings
+	userAlertSettings := UserNotificationSettings{
+		Emails:   []string{},
+		Webhooks: []string{},
+	}
+	if err := record.UnmarshalJSONField("settings", &userAlertSettings); err != nil {
+		am.app.Logger().Error("Failed to unmarshal user settings", "err", err.Error())
+	}
+	// send alerts via webhooks
+	for _, webhook := range userAlertSettings.Webhooks {
+		if err := am.SendShoutrrrAlert(webhook, data.Title, data.Message, data.Link, data.LinkText); err != nil {
+			am.app.Logger().Error("Failed to send shoutrrr alert", "err", err.Error())
+		}
+	}
+	// send alerts via email
+	if len(userAlertSettings.Emails) == 0 {
+		// log.Println("No email addresses found")
+		return
+	}
+	addresses := []mail.Address{}
+	for _, email := range userAlertSettings.Emails {
+		addresses = append(addresses, mail.Address{Address: email})
+	}
+	message := mailer.Message{
+		To:      addresses,
+		Subject: data.Title,
+		Text:    data.Message + fmt.Sprintf("\n\n%s", data.Link),
+		From: mail.Address{
+			Address: am.app.Settings().Meta.SenderAddress,
+			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)
+	}
+}
+
+// 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 {
+		return fmt.Errorf("error parsing URL: %v", err)
+	}
+	scheme := parsedURL.Scheme
+	queryParams := parsedURL.Query()
+
+	// Add title
+	if sliceContains(supportsTitle, scheme) {
+		queryParams.Add("title", title)
+	} else if scheme == "mattermost" {
+		// use markdown title for mattermost
+		message = "##### " + title + "\n\n" + message
+	} else if scheme == "generic" && queryParams.Has("template") {
+		// add title as property if using generic with template json
+		titleKey := queryParams.Get("titlekey")
+		if titleKey == "" {
+			titleKey = "title"
+		}
+		queryParams.Add("$"+titleKey, title)
+	} else {
+		// otherwise just add title to message
+		message = title + "\n\n" + message
+	}
+
+	// Add link
+	if scheme == "ntfy" {
+		// if ntfy, add link to actions
+		queryParams.Add("Actions", fmt.Sprintf("view, %s, %s", linkText, link))
+	} else {
+		// else add link directly to the message
+		message += "\n\n" + link
+	}
+
+	// Encode the modified query parameters back into the URL
+	parsedURL.RawQuery = queryParams.Encode()
+	// log.Println("URL after modification:", parsedURL.String())
+
+	err = shoutrrr.Send(parsedURL.String(), message)
+
+	if err == nil {
+		am.app.Logger().Info("Sent shoutrrr alert", "title", title)
+	} else {
+		am.app.Logger().Error("Error sending shoutrrr alert", "err", err.Error())
+		return err
+	}
+	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(c echo.Context) error {
+	requestData := apis.RequestInfo(c)
+	if requestData.AuthRecord == nil {
+		return apis.NewForbiddenError("Forbidden", nil)
+	}
+	url := c.QueryParam("url")
+	// log.Println("url", url)
+	if url == "" {
+		return c.JSON(200, map[string]string{"err": "URL is required"})
+	}
+	err := am.SendShoutrrrAlert(url, "Test Alert", "This is a notification from Beszel.", am.app.Settings().Meta.AppUrl, "View Beszel")
+	if err != nil {
+		return c.JSON(200, map[string]string{"err": err.Error()})
+	}
+	return c.JSON(200, map[string]bool{"err": false})
+}
--- a/beszel/internal/entities/container/container.go
+++ b/beszel/internal/entities/container/container.go
@@ -1,50 +1,9 @@
-package main
+package container

 import "time"

-type SystemData struct {
-	Stats      *SystemStats      `json:"stats"`
-	Info       *SystemInfo       `json:"info"`
-	Containers []*ContainerStats `json:"container"`
-}
-
-type SystemInfo struct {
-	Cores    int    `json:"c"`
-	Threads  int    `json:"t"`
-	CpuModel string `json:"m"`
-	// Os       string  `json:"o"`
-	Uptime  uint64  `json:"u"`
-	Cpu     float64 `json:"cpu"`
-	MemPct  float64 `json:"mp"`
-	DiskPct float64 `json:"dp"`
-}
-
-type SystemStats struct {
-	Cpu          float64 `json:"cpu"`
-	Mem          float64 `json:"m"`
-	MemUsed      float64 `json:"mu"`
-	MemPct       float64 `json:"mp"`
-	MemBuffCache float64 `json:"mb"`
-	Swap         float64 `json:"s"`
-	SwapUsed     float64 `json:"su"`
-	Disk         float64 `json:"d"`
-	DiskUsed     float64 `json:"du"`
-	DiskPct      float64 `json:"dp"`
-	DiskRead     float64 `json:"dr"`
-	DiskWrite    float64 `json:"dw"`
-	NetworkSent  float64 `json:"ns"`
-	NetworkRecv  float64 `json:"nr"`
-}
-
-type ContainerStats struct {
-	Name        string  `json:"n"`
-	Cpu         float64 `json:"c"`
-	Mem         float64 `json:"m"`
-	NetworkSent float64 `json:"ns"`
-	NetworkRecv float64 `json:"nr"`
-}
-
-type Container struct {
+// Docker container info from /containers/json
+type ApiInfo struct {
 	Id      string
 	IdShort string
 	Names   []string
@@ -66,7 +25,8 @@ type Container struct {
 	// Mounts          []MountPoint
 }

-type CStats struct {
+// Docker container resources from /containers/{id}/stats
+type ApiStats struct {
 	// Common stats
 	// Read    time.Time `json:"read"`
 	// PreRead time.Time `json:"preread"`
@@ -125,15 +85,13 @@ type CPUUsage struct {
 }

 type MemoryStats struct {
-
 	// current res_counter usage for memory
 	Usage uint64 `json:"usage,omitempty"`
-	Cache uint64 `json:"cache,omitempty"`
+	// all the stats exported via memory.stat.
+	Stats MemoryStatsStats `json:"stats,omitempty"`
 	// maximum usage ever recorded.
 	// MaxUsage uint64 `json:"max_usage,omitempty"`
 	// TODO(vishh): Export these as stronger types.
-	// all the stats exported via memory.stat.
-	Stats map[string]uint64 `json:"stats,omitempty"`
 	// number of times memory usage hits limits.
 	// Failcnt uint64 `json:"failcnt,omitempty"`
 	// Limit   uint64 `json:"limit,omitempty"`
@@ -146,6 +104,11 @@ type MemoryStats struct {
 	// PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`
 }

+type MemoryStatsStats struct {
+	Cache        uint64 `json:"cache,omitempty"`
+	InactiveFile uint64 `json:"inactive_file,omitempty"`
+}
+
 type NetworkStats struct {
 	// Bytes received. Windows and Linux.
 	RxBytes uint64 `json:"rx_bytes"`
@@ -153,25 +116,19 @@ type NetworkStats struct {
 	TxBytes uint64 `json:"tx_bytes"`
 }

-type DiskIoStats struct {
-	Read       uint64
-	Write      uint64
-	Time       time.Time
-	Filesystem string
+type prevNetStats struct {
+	Sent uint64
+	Recv uint64
+	Time time.Time
 }

-type NetIoStats struct {
-	BytesRecv uint64
-	BytesSent uint64
-	Time      time.Time
-	Name      string
-}
-
-type PrevContainerStats struct {
-	Cpu [2]uint64
-	Net struct {
-		Sent uint64
-		Recv uint64
-		Time time.Time
-	}
+// Docker container stats
+type Stats struct {
+	Name        string       `json:"n"`
+	Cpu         float64      `json:"c"`
+	Mem         float64      `json:"m"`
+	NetworkSent float64      `json:"ns"`
+	NetworkRecv float64      `json:"nr"`
+	PrevCpu     [2]uint64    `json:"-"`
+	PrevNet     prevNetStats `json:"-"`
 }
--- a/beszel/internal/entities/system/system.go
+++ b/beszel/internal/entities/system/system.go
@@ -0,0 +1,65 @@
+package system
+
+import (
+	"beszel/internal/entities/container"
+	"time"
+)
+
+type Stats struct {
+	Cpu          float64             `json:"cpu"`
+	Mem          float64             `json:"m"`
+	MemUsed      float64             `json:"mu"`
+	MemPct       float64             `json:"mp"`
+	MemBuffCache float64             `json:"mb"`
+	MemZfsArc    float64             `json:"mz,omitempty"` // ZFS ARC memory
+	Swap         float64             `json:"s,omitempty"`
+	SwapUsed     float64             `json:"su,omitempty"`
+	DiskTotal    float64             `json:"d"`
+	DiskUsed     float64             `json:"du"`
+	DiskPct      float64             `json:"dp"`
+	DiskReadPs   float64             `json:"dr"`
+	DiskWritePs  float64             `json:"dw"`
+	NetworkSent  float64             `json:"ns"`
+	NetworkRecv  float64             `json:"nr"`
+	Temperatures map[string]float64  `json:"t,omitempty"`
+	ExtraFs      map[string]*FsStats `json:"efs,omitempty"`
+}
+
+type FsStats struct {
+	Time        time.Time `json:"-"`
+	Root        bool      `json:"-"`
+	Mountpoint  string    `json:"-"`
+	DiskTotal   float64   `json:"d"`
+	DiskUsed    float64   `json:"du"`
+	TotalRead   uint64    `json:"-"`
+	TotalWrite  uint64    `json:"-"`
+	DiskWritePs float64   `json:"w"`
+	DiskReadPs  float64   `json:"r"`
+}
+
+type NetIoStats struct {
+	BytesRecv uint64
+	BytesSent uint64
+	Time      time.Time
+	Name      string
+}
+
+type Info struct {
+	Hostname      string  `json:"h"`
+	KernelVersion string  `json:"k,omitempty"`
+	Cores         int     `json:"c"`
+	Threads       int     `json:"t,omitempty"`
+	CpuModel      string  `json:"m"`
+	Uptime        uint64  `json:"u"`
+	Cpu           float64 `json:"cpu"`
+	MemPct        float64 `json:"mp"`
+	DiskPct       float64 `json:"dp"`
+	AgentVersion  string  `json:"v"`
+}
+
+// Final data structure to return to the hub
+type CombinedData struct {
+	Stats      Stats              `json:"stats"`
+	Info       Info               `json:"info"`
+	Containers []*container.Stats `json:"container"`
+}
--- a/beszel/internal/hub/hub.go
+++ b/beszel/internal/hub/hub.go
@@ -0,0 +1,525 @@
+// Package hub handles updating systems and serving the web UI.
+package hub
+
+import (
+	"beszel"
+	"beszel/internal/agent"
+	"beszel/internal/alerts"
+	"beszel/internal/entities/system"
+	"beszel/internal/records"
+	"beszel/internal/users"
+	"beszel/site"
+
+	"context"
+	"crypto/ed25519"
+	"encoding/pem"
+	"fmt"
+	"log"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"os"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/goccy/go-json"
+	"github.com/labstack/echo/v5"
+	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/apis"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/models"
+	"github.com/pocketbase/pocketbase/plugins/migratecmd"
+	"github.com/pocketbase/pocketbase/tools/cron"
+	"golang.org/x/crypto/ssh"
+)
+
+type Hub struct {
+	app               *pocketbase.PocketBase
+	connectionLock    *sync.Mutex
+	systemConnections map[string]*ssh.Client
+	sshClientConfig   *ssh.ClientConfig
+	pubKey            string
+	am                *alerts.AlertManager
+	um                *users.UserManager
+	rm                *records.RecordManager
+	hubAgent          *agent.Agent
+}
+
+func NewHub(app *pocketbase.PocketBase) *Hub {
+	return &Hub{
+		app:               app,
+		connectionLock:    &sync.Mutex{},
+		systemConnections: make(map[string]*ssh.Client),
+		am:                alerts.NewAlertManager(app),
+		um:                users.NewUserManager(app),
+		rm:                records.NewRecordManager(app),
+	}
+}
+
+func (h *Hub) Run() {
+	// loosely check if it was executed using "go run"
+	isGoRun := strings.HasPrefix(os.Args[0], os.TempDir())
+
+	// // 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.OnBeforeServe().Add(func(e *core.ServeEvent) error {
+		// create ssh client config
+		if err := h.createSSHClientConfig(); err != nil {
+			log.Fatal(err)
+		}
+		// set auth settings
+		if usersCollection, err := h.app.Dao().FindCollectionByNameOrId("users"); err == nil {
+			usersAuthOptions := usersCollection.AuthOptions()
+			usersAuthOptions.AllowUsernameAuth = false
+			if os.Getenv("DISABLE_PASSWORD_AUTH") == "true" {
+				usersAuthOptions.AllowEmailAuth = false
+			} else {
+				usersAuthOptions.AllowEmailAuth = true
+			}
+			usersCollection.SetOptions(usersAuthOptions)
+			if err := h.app.Dao().SaveCollection(usersCollection); err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+
+	// serve web ui
+	h.app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
+		switch isGoRun {
+		case true:
+			proxy := httputil.NewSingleHostReverseProxy(&url.URL{
+				Scheme: "http",
+				Host:   "localhost:5173",
+			})
+			e.Router.Any("/*", echo.WrapHandler(proxy))
+		default:
+			csp, cspExists := os.LookupEnv("CSP")
+			e.Router.Any("/*", func(c echo.Context) error {
+				if cspExists {
+					c.Response().Header().Del("X-Frame-Options")
+					c.Response().Header().Set("Content-Security-Policy", csp)
+				}
+				indexFallback := !strings.HasPrefix(c.Request().URL.Path, "/static/")
+				return apis.StaticDirectoryHandler(site.Dist, indexFallback)(c)
+			})
+		}
+		return nil
+	})
+
+	// set up scheduled jobs / ticker for system updates
+	h.app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
+		// 15 second ticker for system updates
+		go h.startSystemUpdateTicker()
+		// set up cron jobs
+		scheduler := cron.New()
+		// delete old records once every hour
+		scheduler.MustAdd("delete old records", "8 * * * *", h.rm.DeleteOldRecords)
+		// create longer records every 10 minutes
+		scheduler.MustAdd("create longer records", "*/10 * * * *", h.rm.CreateLongerRecords)
+		scheduler.Start()
+		return nil
+	})
+
+	// custom api routes
+	h.app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
+		// returns public key
+		e.Router.GET("/api/beszel/getkey", func(c echo.Context) error {
+			requestData := apis.RequestInfo(c)
+			if requestData.AuthRecord == nil {
+				return apis.NewForbiddenError("Forbidden", nil)
+			}
+			return c.JSON(http.StatusOK, map[string]string{"key": h.pubKey, "v": beszel.Version})
+		})
+		// check if first time setup on login page
+		e.Router.GET("/api/beszel/first-run", func(c echo.Context) error {
+			adminNum, err := h.app.Dao().TotalAdmins()
+			if err != nil {
+				return err
+			}
+			return c.JSON(http.StatusOK, map[string]bool{"firstRun": adminNum == 0})
+		})
+		// send test notification
+		e.Router.GET("/api/beszel/send-test-notification", h.am.SendTestNotification)
+		return nil
+	})
+
+	// system creation defaults
+	h.app.OnModelBeforeCreate("systems").Add(func(e *core.ModelEvent) error {
+		record := e.Model.(*models.Record)
+		if record.GetString("host") == "hubsys" {
+			// todo: check for hubsys existance and return error if exists (or make sure user is admin)
+			if record.GetString("name") == "x" {
+				hostname, _ := os.Hostname()
+				if hostname == "" {
+					hostname = "localhost"
+				}
+				record.Set("name", hostname)
+			}
+		}
+		record.Set("info", system.Info{})
+		record.Set("status", "pending")
+		return nil
+	})
+
+	// immediately create connection for new systems
+	h.app.OnModelAfterCreate("systems").Add(func(e *core.ModelEvent) error {
+		go h.updateSystem(e.Model.(*models.Record))
+		return nil
+	})
+
+	// handle default values for user / user_settings creation
+	h.app.OnModelBeforeCreate("users").Add(h.um.InitializeUserRole)
+	h.app.OnModelBeforeCreate("user_settings").Add(h.um.InitializeUserSettings)
+
+	// do things after a systems record is updated
+	h.app.OnModelAfterUpdate("systems").Add(func(e *core.ModelEvent) error {
+		newRecord := e.Model.(*models.Record)
+		oldRecord := newRecord.OriginalCopy()
+		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 nil
+	})
+
+	// do things after a systems record is deleted
+	h.app.OnModelAfterDelete("systems").Add(func(e *core.ModelEvent) error {
+		// if system connection exists, close it
+		h.deleteSystemConnection(e.Model.(*models.Record))
+		return nil
+	})
+
+	if err := h.app.Start(); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func (h *Hub) startSystemUpdateTicker() {
+	ticker := time.NewTicker(15 * time.Second)
+	for range ticker.C {
+		h.updateSystems()
+	}
+}
+
+func (h *Hub) updateSystems() {
+	records, err := h.app.Dao().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 *models.Record) {
+	switch record.GetString("host") {
+	case "hubsys":
+		h.updateHubSystem(record)
+	default:
+		h.updateRemoteSystem(record)
+	}
+}
+
+// Update hub system stats with built-in agent
+func (h *Hub) updateHubSystem(record *models.Record) {
+	if h.hubAgent == nil {
+		h.hubAgent = agent.NewAgent()
+		h.hubAgent.Run(nil, "")
+	}
+	systemData := h.hubAgent.GatherStats()
+	h.saveSystemStats(record, &systemData)
+}
+
+// Connect to remote system and update system stats
+func (h *Hub) updateRemoteSystem(record *models.Record) {
+	var client *ssh.Client
+	var err error
+
+	// check if system connection data exists
+	if _, ok := h.systemConnections[record.Id]; ok {
+		client = h.systemConnections[record.Id]
+	} else {
+		// create system connection
+		client, err = h.createSystemConnection(record)
+		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
+		}
+		h.connectionLock.Lock()
+		h.systemConnections[record.Id] = client
+		h.connectionLock.Unlock()
+	}
+	// 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)
+			h.updateRemoteSystem(record)
+			return
+		}
+		h.app.Logger().Error("Failed to get system stats: ", "err", err.Error())
+		h.updateSystemStatus(record, "down")
+		return
+	}
+	// update system record
+	h.saveSystemStats(record, &systemData)
+}
+
+// Update system record with provided system.CombinedData
+func (h *Hub) saveSystemStats(record *models.Record, systemData *system.CombinedData) {
+	record.Set("status", "up")
+	record.Set("info", systemData.Info)
+	if err := h.app.Dao().SaveRecord(record); err != nil {
+		h.app.Logger().Error("Failed to update record: ", "err", err.Error())
+	}
+	// add new system_stats record
+	system_stats, _ := h.app.Dao().FindCollectionByNameOrId("system_stats")
+	systemStatsRecord := models.NewRecord(system_stats)
+	systemStatsRecord.Set("system", record.Id)
+	systemStatsRecord.Set("stats", systemData.Stats)
+	systemStatsRecord.Set("type", "1m")
+	if err := h.app.Dao().SaveRecord(systemStatsRecord); err != nil {
+		h.app.Logger().Error("Failed to save record: ", "err", err.Error())
+	}
+	// add new container_stats record
+	if len(systemData.Containers) > 0 {
+		container_stats, _ := h.app.Dao().FindCollectionByNameOrId("container_stats")
+		containerStatsRecord := models.NewRecord(container_stats)
+		containerStatsRecord.Set("system", record.Id)
+		containerStatsRecord.Set("stats", systemData.Containers)
+		containerStatsRecord.Set("type", "1m")
+		if err := h.app.Dao().SaveRecord(containerStatsRecord); err != nil {
+			h.app.Logger().Error("Failed to save record: ", "err", err.Error())
+		}
+	}
+	// system info alerts (todo: temp alerts, extra fs alerts)
+	h.am.HandleSystemInfoAlerts(record, systemData.Info)
+}
+
+// set system to specified status and save record
+func (h *Hub) updateSystemStatus(record *models.Record, status string) {
+	if record.GetString("status") != status {
+		record.Set("status", status)
+		if err := h.app.Dao().SaveRecord(record); err != nil {
+			h.app.Logger().Error("Failed to update record: ", "err", err.Error())
+		}
+	}
+}
+
+// Deletes the SSH connection (remote) or built-in agent reference
+func (h *Hub) deleteSystemConnection(record *models.Record) {
+	switch record.GetString("host") {
+	case "hubsys":
+		h.hubAgent = nil
+	default:
+		if _, ok := h.systemConnections[record.Id]; ok {
+			if h.systemConnections[record.Id] != nil {
+				h.systemConnections[record.Id].Close()
+			}
+			h.connectionLock.Lock()
+			defer h.connectionLock.Unlock()
+			delete(h.systemConnections, record.Id)
+		}
+	}
+}
+
+func (h *Hub) createSystemConnection(record *models.Record) (*ssh.Client, error) {
+	client, err := ssh.Dial("tcp", fmt.Sprintf("%s:%s", 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:         5 * 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, 5*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")
+	}
+}
+
+func (h *Hub) getSSHKey() ([]byte, error) {
+	dataDir := h.app.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 {
+			h.pubKey = strings.TrimSuffix(string(pubKey), "\n")
+		}
+		// return existing private key
+		return existingKey, nil
+	}
+
+	// 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())
+		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())
+		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())
+		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())
+		return nil, err
+	}
+
+	// Generate the public key in OpenSSH format
+	publicKey, err := ssh.NewPublicKey(pubKey)
+	if err != nil {
+		return nil, err
+	}
+
+	pubKeyBytes := ssh.MarshalAuthorizedKey(publicKey)
+	h.pubKey = strings.TrimSuffix(string(pubKeyBytes), "\n")
+
+	// Save the public key to a file
+	publicFile, err := os.Create(dataDir + "/id_ed25519.pub")
+	if err != nil {
+		return nil, err
+	}
+	defer publicFile.Close()
+
+	if _, err := publicFile.Write(pubKeyBytes); err != nil {
+		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")
+
+	existingKey, err = os.ReadFile(dataDir + "/id_ed25519")
+	if err == nil {
+		return existingKey, nil
+	}
+	return nil, err
+}
--- a/beszel/internal/records/records.go
+++ b/beszel/internal/records/records.go
@@ -0,0 +1,311 @@
+// Package records handles creating longer records and deleting old records.
+package records
+
+import (
+	"beszel/internal/entities/container"
+	"beszel/internal/entities/system"
+	"log"
+	"math"
+	"time"
+
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/daos"
+	"github.com/pocketbase/pocketbase/models"
+	"github.com/pocketbase/pocketbase/tools/types"
+)
+
+type RecordManager struct {
+	app *pocketbase.PocketBase
+}
+
+type LongerRecordData struct {
+	shorterType        string
+	longerType         string
+	longerTimeDuration time.Duration
+	minShorterRecords  int
+}
+
+type RecordDeletionData struct {
+	recordType string
+	retention  time.Duration
+}
+
+func NewRecordManager(app *pocketbase.PocketBase) *RecordManager {
+	return &RecordManager{app}
+}
+
+// Create longer records by averaging shorter records
+func (rm *RecordManager) CreateLongerRecords() {
+	// start := time.Now()
+	recordData := []LongerRecordData{
+		{
+			shorterType: "1m",
+			// change to 9 from 10 to allow edge case timing or short pauses
+			minShorterRecords:  9,
+			longerType:         "10m",
+			longerTimeDuration: -10 * time.Minute,
+		},
+		{
+			shorterType:        "10m",
+			minShorterRecords:  2,
+			longerType:         "20m",
+			longerTimeDuration: -20 * time.Minute,
+		},
+		{
+			shorterType:        "20m",
+			minShorterRecords:  6,
+			longerType:         "120m",
+			longerTimeDuration: -120 * time.Minute,
+		},
+		{
+			shorterType:        "120m",
+			minShorterRecords:  4,
+			longerType:         "480m",
+			longerTimeDuration: -480 * time.Minute,
+		},
+	}
+	// wrap the operations in a transaction
+	rm.app.Dao().RunInTransaction(func(txDao *daos.Dao) error {
+		activeSystems, err := txDao.FindRecordsByExpr("systems", dbx.NewExp("status = 'up'"))
+		if err != nil {
+			log.Println("failed to get active systems", "err", err.Error())
+			return err
+		}
+
+		collections := map[string]*models.Collection{}
+		for _, collectionName := range []string{"system_stats", "container_stats"} {
+			collection, _ := txDao.FindCollectionByNameOrId(collectionName)
+			collections[collectionName] = collection
+		}
+
+		// loop through all active systems, time periods, and collections
+		for _, system := range activeSystems {
+			// log.Println("processing system", system.GetString("name"))
+			for _, recordData := range recordData {
+				// log.Println("processing longer record type", recordData.longerType)
+				// add one minute padding for longer records because they are created slightly later than the job start time
+				longerRecordPeriod := time.Now().UTC().Add(recordData.longerTimeDuration + time.Minute)
+				// shorter records are created independently of longer records, so we shouldn't need to add padding
+				shorterRecordPeriod := time.Now().UTC().Add(recordData.longerTimeDuration)
+				// loop through both collections
+				for _, collection := range collections {
+					// check creation time of last longer record if not 10m, since 10m is created every run
+					if recordData.longerType != "10m" {
+						lastLongerRecord, err := txDao.FindFirstRecordByFilter(
+							collection.Id,
+							"type = {:type} && system = {:system} && created > {:created}",
+							dbx.Params{"type": recordData.longerType, "system": system.Id, "created": longerRecordPeriod},
+						)
+						// continue if longer record exists
+						if err == nil || lastLongerRecord != nil {
+							// log.Println("longer record found. continuing")
+							continue
+						}
+					}
+					// get shorter records from the past x minutes
+					allShorterRecords, err := txDao.FindRecordsByExpr(
+						collection.Id,
+						dbx.NewExp(
+							"type = {:type} AND system = {:system} AND created > {:created}",
+							dbx.Params{"type": recordData.shorterType, "system": system.Id, "created": shorterRecordPeriod},
+						),
+					)
+
+					// continue if not enough shorter records
+					if err != nil || len(allShorterRecords) < recordData.minShorterRecords {
+						// log.Println("not enough shorter records. continue.", len(allShorterRecords), recordData.expectedShorterRecords)
+						continue
+					}
+					// average the shorter records and create longer record
+					var stats interface{}
+					switch collection.Name {
+					case "system_stats":
+						stats = rm.AverageSystemStats(allShorterRecords)
+					case "container_stats":
+						stats = rm.AverageContainerStats(allShorterRecords)
+					}
+					longerRecord := models.NewRecord(collection)
+					longerRecord.Set("system", system.Id)
+					longerRecord.Set("stats", stats)
+					longerRecord.Set("type", recordData.longerType)
+					if err := txDao.SaveRecord(longerRecord); err != nil {
+						log.Println("failed to save longer record", "err", err.Error())
+					}
+				}
+			}
+		}
+
+		return nil
+	})
+
+	// log.Println("finished creating longer records", "time (ms)", time.Since(start).Milliseconds())
+}
+
+// Calculate the average stats of a list of system_stats records without reflect
+func (rm *RecordManager) AverageSystemStats(records []*models.Record) system.Stats {
+	sum := system.Stats{
+		Temperatures: make(map[string]float64),
+		ExtraFs:      make(map[string]*system.FsStats),
+	}
+
+	count := float64(len(records))
+	// use different counter for temps in case some records don't have them
+	tempCount := float64(0)
+
+	var stats system.Stats
+	for _, record := range records {
+		record.UnmarshalJSONField("stats", &stats)
+		sum.Cpu += stats.Cpu
+		sum.Mem += stats.Mem
+		sum.MemUsed += stats.MemUsed
+		sum.MemPct += stats.MemPct
+		sum.MemBuffCache += stats.MemBuffCache
+		sum.MemZfsArc += stats.MemZfsArc
+		sum.Swap += stats.Swap
+		sum.SwapUsed += stats.SwapUsed
+		sum.DiskTotal += stats.DiskTotal
+		sum.DiskUsed += stats.DiskUsed
+		sum.DiskPct += stats.DiskPct
+		sum.DiskReadPs += stats.DiskReadPs
+		sum.DiskWritePs += stats.DiskWritePs
+		sum.NetworkSent += stats.NetworkSent
+		sum.NetworkRecv += stats.NetworkRecv
+		// add temps to sum
+		if stats.Temperatures != nil {
+			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
+		if stats.ExtraFs != nil {
+			for key, value := range stats.ExtraFs {
+				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
+			}
+		}
+	}
+
+	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),
+	}
+
+	if len(sum.Temperatures) != 0 {
+		stats.Temperatures = make(map[string]float64)
+		for key, value := range sum.Temperatures {
+			stats.Temperatures[key] = twoDecimals(value / tempCount)
+		}
+	}
+
+	if len(sum.ExtraFs) != 0 {
+		stats.ExtraFs = make(map[string]*system.FsStats)
+		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),
+			}
+		}
+	}
+
+	return stats
+}
+
+// Calculate the average stats of a list of container_stats records
+func (rm *RecordManager) AverageContainerStats(records []*models.Record) []container.Stats {
+	sums := make(map[string]*container.Stats)
+	count := float64(len(records))
+
+	var containerStats []container.Stats
+	for _, record := range records {
+		record.UnmarshalJSONField("stats", &containerStats)
+		for _, stat := range containerStats {
+			if _, ok := sums[stat.Name]; !ok {
+				sums[stat.Name] = &container.Stats{Name: stat.Name}
+			}
+			sums[stat.Name].Cpu += stat.Cpu
+			sums[stat.Name].Mem += stat.Mem
+			sums[stat.Name].NetworkSent += stat.NetworkSent
+			sums[stat.Name].NetworkRecv += stat.NetworkRecv
+		}
+	}
+
+	result := make([]container.Stats, 0, len(sums))
+	for _, value := range sums {
+		result = append(result, container.Stats{
+			Name:        value.Name,
+			Cpu:         twoDecimals(value.Cpu / count),
+			Mem:         twoDecimals(value.Mem / count),
+			NetworkSent: twoDecimals(value.NetworkSent / count),
+			NetworkRecv: twoDecimals(value.NetworkRecv / count),
+		})
+	}
+	return result
+}
+
+// Deletes records older than what is displayed in the UI
+func (rm *RecordManager) DeleteOldRecords() {
+	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,
+		},
+	}
+	db := rm.app.Dao().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())
+			}
+		}
+	}
+}
+
+/* Round float to two decimals */
+func twoDecimals(value float64) float64 {
+	return math.Round(value*100) / 100
+}
--- a/beszel/internal/update/update.go
+++ b/beszel/internal/update/update.go
@@ -0,0 +1,100 @@
+// Package update handles updating beszel and beszel-agent.
+package update
+
+import (
+	"beszel"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/blang/semver"
+	"github.com/rhysd/go-github-selfupdate/selfupdate"
+)
+
+func UpdateBeszel() {
+	var latest *selfupdate.Release
+	var found bool
+	var err error
+	currentVersion := semver.MustParse(beszel.Version)
+	fmt.Println("beszel", currentVersion)
+	fmt.Println("Checking for updates...")
+	updater, _ := selfupdate.NewUpdater(selfupdate.Config{
+		Filters: []string{"beszel_"},
+	})
+	latest, found, err = updater.DetectLatest("henrygd/beszel")
+
+	if err != nil {
+		fmt.Println("Error checking for updates:", err)
+		os.Exit(1)
+	}
+
+	if !found {
+		fmt.Println("No updates found")
+		os.Exit(0)
+	}
+
+	fmt.Println("Latest version:", latest.Version)
+
+	if latest.Version.LTE(currentVersion) {
+		fmt.Println("You are up to date")
+		return
+	}
+
+	var binaryPath string
+	fmt.Printf("Updating from %s to %s...\n", currentVersion, latest.Version)
+	binaryPath, err = os.Executable()
+	if err != nil {
+		fmt.Println("Error getting binary path:", err)
+		os.Exit(1)
+	}
+	err = selfupdate.UpdateTo(latest.AssetURL, binaryPath)
+	if err != nil {
+		fmt.Println("Please try rerunning with sudo. Error:", err)
+		os.Exit(1)
+	}
+	fmt.Printf("Successfully updated to %s\n\n%s\n", latest.Version, strings.TrimSpace(latest.ReleaseNotes))
+}
+
+func UpdateBeszelAgent() {
+	var latest *selfupdate.Release
+	var found bool
+	var err error
+	currentVersion := semver.MustParse(beszel.Version)
+	fmt.Println("beszel-agent", currentVersion)
+	fmt.Println("Checking for updates...")
+	updater, _ := selfupdate.NewUpdater(selfupdate.Config{
+		Filters: []string{"beszel-agent"},
+	})
+	latest, found, err = updater.DetectLatest("henrygd/beszel")
+
+	if err != nil {
+		fmt.Println("Error checking for updates:", err)
+		os.Exit(1)
+	}
+
+	if !found {
+		fmt.Println("No updates found")
+		os.Exit(0)
+	}
+
+	fmt.Println("Latest version:", latest.Version)
+
+	if latest.Version.LTE(currentVersion) {
+		fmt.Println("You are up to date")
+		return
+	}
+
+	var binaryPath string
+	fmt.Printf("Updating from %s to %s...\n", currentVersion, latest.Version)
+	binaryPath, err = os.Executable()
+	if err != nil {
+		fmt.Println("Error getting binary path:", err)
+		os.Exit(1)
+	}
+	err = selfupdate.UpdateTo(latest.AssetURL, binaryPath)
+	if err != nil {
+		fmt.Println("Please try rerunning with sudo. Error:", err)
+		os.Exit(1)
+	}
+	fmt.Printf("Successfully updated to %s\n\n%s\n", latest.Version, strings.TrimSpace(latest.ReleaseNotes))
+}
--- a/beszel/internal/users/users.go
+++ b/beszel/internal/users/users.go
@@ -0,0 +1,65 @@
+// Package users handles user-related custom functionality.
+package users
+
+import (
+	"log"
+
+	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/models"
+)
+
+type UserManager struct {
+	app *pocketbase.PocketBase
+}
+
+type UserSettings struct {
+	ChartTime            string   `json:"chartTime"`
+	NotificationEmails   []string `json:"emails"`
+	NotificationWebhooks []string `json:"webhooks"`
+	// Language             string   `json:"lang"`
+}
+
+func NewUserManager(app *pocketbase.PocketBase) *UserManager {
+	return &UserManager{
+		app: app,
+	}
+}
+
+func (um *UserManager) InitializeUserRole(e *core.ModelEvent) error {
+	user := e.Model.(*models.Record)
+	if user.GetString("role") == "" {
+		user.Set("role", "user")
+	}
+	return nil
+}
+
+func (um *UserManager) InitializeUserSettings(e *core.ModelEvent) error {
+	record := e.Model.(*models.Record)
+	// intialize settings with defaults
+	settings := UserSettings{
+		// Language:             "en",
+		ChartTime:            "1h",
+		NotificationEmails:   []string{},
+		NotificationWebhooks: []string{},
+	}
+	record.UnmarshalJSONField("settings", &settings)
+	if len(settings.NotificationEmails) == 0 {
+		// get user email from auth record
+		if errs := um.app.Dao().ExpandRecord(record, []string{"user"}, nil); len(errs) == 0 {
+			// app.Logger().Error("failed to expand user relation", "errs", errs)
+			if user := record.ExpandedOne("user"); user != nil {
+				settings.NotificationEmails = []string{user.GetString("email")}
+			} else {
+				log.Println("Failed to get user email from auth record")
+			}
+		} else {
+			log.Println("failed to expand user relation", "errs", errs)
+		}
+	}
+	// if len(settings.NotificationWebhooks) == 0 {
+	// 	settings.NotificationWebhooks = []string{""}
+	// }
+	record.Set("settings", settings)
+	return nil
+}
--- a/beszel/migrations/1726183779_collections_snapshot.go
+++ b/beszel/migrations/1726183779_collections_snapshot.go
@@ -15,7 +15,7 @@ func init() {
 			{
 				"id": "2hz5ncl8tizk5nx",
 				"created": "2024-07-07 16:08:20.979Z",
-				"updated": "2024-07-28 17:00:47.996Z",
+				"updated": "2024-07-28 17:14:24.492Z",
 				"name": "systems",
 				"type": "base",
 				"system": false,
@@ -120,7 +120,7 @@ func init() {
 			{
 				"id": "ej9oowivz8b2mht",
 				"created": "2024-07-07 16:09:09.179Z",
-				"updated": "2024-07-22 20:13:31.324Z",
+				"updated": "2024-07-28 17:14:24.492Z",
 				"name": "system_stats",
 				"type": "base",
 				"system": false,
@@ -186,7 +186,7 @@ func init() {
 			{
 				"id": "juohu4jipgc13v7",
 				"created": "2024-07-07 16:09:57.976Z",
-				"updated": "2024-07-22 20:13:31.324Z",
+				"updated": "2024-07-28 17:14:24.492Z",
 				"name": "container_stats",
 				"type": "base",
 				"system": false,
@@ -250,7 +250,7 @@ func init() {
 			{
 				"id": "_pb_users_auth_",
 				"created": "2024-07-14 16:25:18.226Z",
-				"updated": "2024-07-28 17:02:08.311Z",
+				"updated": "2024-09-12 23:19:36.280Z",
 				"name": "users",
 				"type": "auth",
 				"system": false,
@@ -316,7 +316,7 @@ func init() {
 			{
 				"id": "elngm8x1l60zi2v",
 				"created": "2024-07-15 01:16:04.044Z",
-				"updated": "2024-07-22 20:13:31.324Z",
+				"updated": "2024-07-28 17:14:24.492Z",
 				"name": "alerts",
 				"type": "base",
 				"system": false,
@@ -403,6 +403,53 @@ func init() {
 				"updateRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
 				"deleteRule": "@request.auth.id != \"\" && user.id = @request.auth.id",
 				"options": {}
+			},
+			{
+				"id": "4afacsdnlu8q8r2",
+				"created": "2024-09-12 17:42:55.324Z",
+				"updated": "2024-09-12 21:19:59.114Z",
+				"name": "user_settings",
+				"type": "base",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "d5vztyxa",
+						"name": "user",
+						"type": "relation",
+						"required": true,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"collectionId": "_pb_users_auth_",
+							"cascadeDelete": false,
+							"minSelect": null,
+							"maxSelect": 1,
+							"displayFields": null
+						}
+					},
+					{
+						"system": false,
+						"id": "xcx4qgqq",
+						"name": "settings",
+						"type": "json",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"maxSize": 2000000
+						}
+					}
+				],
+				"indexes": [
+					"CREATE UNIQUE INDEX ` + "`" + `idx_30Lwgf2` + "`" + ` ON ` + "`" + `user_settings` + "`" + ` (` + "`" + `user` + "`" + `)"
+				],
+				"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,
+				"options": {}
 			}
 		]`

--- a/beszel/migrations/initial-settings.go
+++ b/beszel/migrations/initial-settings.go
--- a/beszel/site/.gitignore
+++ b/beszel/site/.gitignore
--- a/beszel/site/bun.lockb
+++ b/beszel/site/bun.lockb
--- a/beszel/site/components.json
+++ b/beszel/site/components.json
--- a/beszel/site/embed.go
+++ b/beszel/site/embed.go
@@ -11,5 +11,3 @@ import (
 var assets embed.FS

 var Dist = echo.MustSubFS(assets, "dist")
-
-var Static = echo.MustSubFS(assets, "dist/static")
--- a/beszel/site/index.html
+++ b/beszel/site/index.html
@@ -5,12 +5,6 @@
 		<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>
-		<link rel="preconnect" href="https://fonts.googleapis.com" />
-		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-		<link
-			href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap"
-			rel="stylesheet"
-		/>
 	</head>
 	<body>
 		<div id="app"></div>
--- a/beszel/site/package-lock.json
+++ b/beszel/site/package-lock.json
--- a/beszel/site/package.json
+++ b/beszel/site/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "site",
+	"name": "beszel",
 	"private": true,
 	"version": "0.0.0",
 	"type": "module",
@@ -22,8 +22,8 @@
 		"@radix-ui/react-switch": "^1.1.0",
 		"@radix-ui/react-toast": "^1.2.1",
 		"@radix-ui/react-tooltip": "^1.1.2",
-		"@tanstack/react-table": "^8.20.1",
-		"@vitejs/plugin-react": "^4.3.1",
+		"@tanstack/react-table": "^8.20.5",
+		"@vitejs/plugin-react": "^4.3.2",
 		"class-variance-authority": "^0.7.0",
 		"clsx": "^2.1.1",
 		"cmdk": "^1.0.0",
@@ -31,23 +31,22 @@
 		"d3-time": "^3.1.0",
 		"lucide-react": "^0.407.0",
 		"nanostores": "^0.10.3",
-		"pocketbase": "^0.21.4",
+		"pocketbase": "^0.21.5",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
-		"recharts": "^2.13.0-alpha.4",
-		"tailwind-merge": "^2.4.0",
+		"recharts": "^2.13.0-alpha.5",
+		"tailwind-merge": "^2.5.2",
 		"tailwindcss-animate": "^1.0.7",
-		"use-is-in-viewport": "^1.0.9",
 		"valibot": "^0.36.0"
 	},
 	"devDependencies": {
-		"@types/bun": "^1.1.6",
-		"@types/react": "^18.3.3",
+		"@types/bun": "^1.1.10",
+		"@types/react": "^18.3.10",
 		"@types/react-dom": "^18.3.0",
 		"autoprefixer": "^10.4.20",
-		"postcss": "^8.4.40",
-		"tailwindcss": "^3.4.7",
-		"typescript": "^5.5.4",
-		"vite": "^5.3.5"
+		"postcss": "^8.4.47",
+		"tailwindcss": "^3.4.13",
+		"typescript": "^5.6.2",
+		"vite": "^5.4.8"
 	}
 }
--- a/beszel/site/postcss.config.js
+++ b/beszel/site/postcss.config.js
--- a/beszel/site/public/static/InterVariable.woff2
+++ b/beszel/site/public/static/InterVariable.woff2
--- a/beszel/site/public/static/apple.svg
+++ b/beszel/site/public/static/apple.svg
--- a/beszel/site/public/static/bitbucket.svg
+++ b/beszel/site/public/static/bitbucket.svg
--- a/beszel/site/public/static/discord.svg
+++ b/beszel/site/public/static/discord.svg
--- a/beszel/site/public/static/facebook.svg
+++ b/beszel/site/public/static/facebook.svg
--- a/beszel/site/public/static/favicon-green.svg
+++ b/beszel/site/public/static/favicon-green.svg
--- a/beszel/site/public/static/favicon-red.svg
+++ b/beszel/site/public/static/favicon-red.svg
--- a/beszel/site/public/static/favicon.svg
+++ b/beszel/site/public/static/favicon.svg
--- a/beszel/site/public/static/gitea.svg
+++ b/beszel/site/public/static/gitea.svg
--- a/beszel/site/public/static/gitee.svg
+++ b/beszel/site/public/static/gitee.svg
--- a/beszel/site/public/static/github.svg
+++ b/beszel/site/public/static/github.svg
--- a/beszel/site/public/static/gitlab.svg
+++ b/beszel/site/public/static/gitlab.svg
--- a/beszel/site/public/static/google.svg
+++ b/beszel/site/public/static/google.svg
--- a/beszel/site/public/static/instagram.svg
+++ b/beszel/site/public/static/instagram.svg
--- a/beszel/site/public/static/lock.svg
+++ b/beszel/site/public/static/lock.svg
--- a/beszel/site/public/static/oidc.svg
+++ b/beszel/site/public/static/oidc.svg
--- a/beszel/site/public/static/patreon.svg
+++ b/beszel/site/public/static/patreon.svg
--- a/beszel/site/public/static/spotify.svg
+++ b/beszel/site/public/static/spotify.svg
--- a/beszel/site/public/static/strava.svg
+++ b/beszel/site/public/static/strava.svg
--- a/beszel/site/public/static/twitch.svg
+++ b/beszel/site/public/static/twitch.svg
--- a/beszel/site/public/static/twitter.svg
+++ b/beszel/site/public/static/twitter.svg
--- a/beszel/site/src/components/add-system.tsx
+++ b/beszel/site/src/components/add-system.tsx
@@ -13,12 +13,13 @@ import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '@/comp
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { $publicKey, pb } from '@/lib/stores'
-import { Copy, Plus } from 'lucide-react'
-import { useState, useRef, MutableRefObject, useEffect } from 'react'
+import { Copy, PlusIcon } from 'lucide-react'
+import { useState, useRef, MutableRefObject } from 'react'
 import { useStore } from '@nanostores/react'
-import { copyToClipboard } from '@/lib/utils'
+import { cn, copyToClipboard, isReadOnlyUser } from '@/lib/utils'
+import { navigate } from './router'

-export function AddSystemButton() {
+export function AddSystemButton({ className }: { className?: string }) {
 	const [open, setOpen] = useState(false)
 	const port = useRef() as MutableRefObject<HTMLInputElement>
 	const publicKey = useStore($publicKey)
@@ -32,22 +33,14 @@ export function AddSystemButton() {
    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/disk1/.beszel:/extra-filesystems/disk1:ro
    environment:
      PORT: ${port}
      KEY: "${publicKey}"
-      # FILESYSTEM: /dev/sda1 # set to the correct filesystem for disk I/O stats`)
+      # FILESYSTEM: /dev/sda1 # override the root partition / device for disk I/O stats`)
 	}

-	useEffect(() => {
-		if (publicKey || !open) {
-			return
-		}
-		// get public key
-		pb.send('/api/beszel/getkey', {}).then(({ key }) => {
-			$publicKey.set(key)
-		})
-	}, [open])
-
 	async function handleSubmit(e: SubmitEvent) {
 		e.preventDefault()
 		const formData = new FormData(e.target as HTMLFormElement)
@@ -56,6 +49,7 @@ export function AddSystemButton() {
 		try {
 			setOpen(false)
 			await pb.collection('systems').create(data)
+			navigate('/')
 			// console.log(record)
 		} catch (e) {
 			console.log(e)
@@ -65,9 +59,12 @@ export function AddSystemButton() {
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
 			<DialogTrigger asChild>
-				<Button variant="outline" className="flex gap-1">
-					<Plus className="h-4 w-4 mr-auto" />
-					Add <span className="hidden sm:inline">System</span>
+				<Button
+					variant="outline"
+					className={cn('flex gap-1 max-xs:h-[2.4rem]', className, isReadOnlyUser() && 'hidden')}
+				>
+					<PlusIcon className="h-4 w-4 -ml-1" />
+					Add <span className="hidden xs:inline">System</span>
 				</Button>
 			</DialogTrigger>
 			<DialogContent className="w-[90%] sm:max-w-[425px] rounded-lg">
--- a/beszel/site/src/components/charts/bandwidth-chart.tsx
+++ b/beszel/site/src/components/charts/bandwidth-chart.tsx
@@ -2,17 +2,17 @@ import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'

 import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
 import {
+	useYAxisWidth,
 	chartTimeData,
 	cn,
 	formatShortDate,
 	toFixedWithoutTrailingZeros,
-	useYaxisWidth,
+	twoDecimalString,
 } from '@/lib/utils'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
 import { $chartTime } from '@/lib/stores'
 import { SystemStatsRecord } from '@/types'
-import { useMemo, useRef } from 'react'

 export default function BandwidthChart({
 	ticks,
@@ -21,19 +21,16 @@ export default function BandwidthChart({
 	ticks: number[]
 	systemData: SystemStatsRecord[]
 }) {
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
 	const chartTime = useStore($chartTime)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	return (
-		<div ref={chartRef}>
+		<div>
 			{/* {!yAxisSet && <Spinner />} */}
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart
@@ -51,10 +48,13 @@ export default function BandwidthChart({
 						className="tracking-tighter"
 						width={yAxisWidth}
 						// domain={[0, (max: number) => (max <= 0.4 ? 0.4 : Math.ceil(max))]}
-						tickFormatter={(value) => toFixedWithoutTrailingZeros(value, 2)}
+						tickFormatter={(value) => {
+							const val = toFixedWithoutTrailingZeros(value, 2) + ' MB/s'
+							return updateYAxisWidth(val)
+						}}
 						tickLine={false}
 						axisLine={false}
-						unit={' MB/s'}
+						// unit={' MB/s'}
 					/>
 					<XAxis
 						dataKey="created"
@@ -72,8 +72,8 @@ export default function BandwidthChart({
 						animationDuration={150}
 						content={
 							<ChartTooltipContent
-								unit=" MB/s"
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								contentFormatter={(item) => twoDecimalString(item.value) + ' MB/s'}
 								indicator="line"
 							/>
 						}
@@ -83,7 +83,7 @@ export default function BandwidthChart({
 						name="Sent"
 						type="monotoneX"
 						fill="hsl(var(--chart-5))"
-						fillOpacity={0.4}
+						fillOpacity={0.2}
 						stroke="hsl(var(--chart-5))"
 						// animationDuration={1200}
 						isAnimationActive={false}
@@ -93,7 +93,7 @@ export default function BandwidthChart({
 						name="Received"
 						type="monotoneX"
 						fill="hsl(var(--chart-2))"
-						fillOpacity={0.4}
+						fillOpacity={0.2}
 						stroke="hsl(var(--chart-2))"
 						// animationDuration={1200}
 						isAnimationActive={false}
--- a/beszel/site/src/components/charts/chart-time-select.tsx
+++ b/beszel/site/src/components/charts/chart-time-select.tsx
@@ -9,6 +9,7 @@ import { $chartTime } from '@/lib/stores'
 import { chartTimeData, cn } from '@/lib/utils'
 import { ChartTimes } from '@/types'
 import { useStore } from '@nanostores/react'
+import { HistoryIcon } from 'lucide-react'

 export default function ChartTimeSelect({ className }: { className?: string }) {
 	const chartTime = useStore($chartTime)
@@ -19,7 +20,8 @@ export default function ChartTimeSelect({ className }: { className?: string }) {
 			value={chartTime}
 			onValueChange={(value: ChartTimes) => $chartTime.set(value)}
 		>
-			<SelectTrigger className={cn(className, 'px-5')}>
+			<SelectTrigger className={cn(className, 'relative pl-10 pr-5')}>
+				<HistoryIcon className="h-4 w-4 absolute left-4 top-1/2 -translate-y-1/2 opacity-85" />
 				<SelectValue />
 			</SelectTrigger>
 			<SelectContent>
--- a/beszel/site/src/components/charts/container-cpu-chart.tsx
+++ b/beszel/site/src/components/charts/container-cpu-chart.tsx
@@ -5,11 +5,11 @@ import {
 	ChartTooltip,
 	ChartTooltipContent,
 } from '@/components/ui/chart'
-import { useMemo, useRef } from 'react'
-import { chartTimeData, cn, formatShortDate, useYaxisWidth } from '@/lib/utils'
+import { useMemo } from 'react'
+import { useYAxisWidth, chartTimeData, cn, formatShortDate, twoDecimalString } from '@/lib/utils'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
-import { $chartTime } from '@/lib/stores'
+import { $chartTime, $containerFilter } from '@/lib/stores'

 export default function ContainerCpuChart({
 	chartData,
@@ -18,11 +18,9 @@ export default function ContainerCpuChart({
 	chartData: Record<string, number | string>[]
 	ticks: number[]
 }) {
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
 	const chartTime = useStore($chartTime)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+	const filter = useStore($containerFilter)
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	const chartConfig = useMemo(() => {
 		let config = {} as Record<
@@ -64,16 +62,17 @@ export default function ContainerCpuChart({
 	// }

 	return (
-		<div ref={chartRef}>
+		<div>
 			{/* {!yAxisSet && <Spinner />} */}
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart
 					accessibilityLayer
+					// syncId={'cpu'}
 					data={chartData}
 					margin={{
 						top: 10,
@@ -87,8 +86,10 @@ export default function ContainerCpuChart({
 						width={yAxisWidth}
 						tickLine={false}
 						axisLine={false}
-						unit={'%'}
-						tickFormatter={(x) => (x % 1 === 0 ? x : x.toFixed(1))}
+						tickFormatter={(x) => {
+							const val = (x % 1 === 0 ? x : x.toFixed(1)) + '%'
+							return updateYAxisWidth(val)
+						}}
 					/>
 					<XAxis
 						dataKey="time"
@@ -108,23 +109,33 @@ export default function ContainerCpuChart({
 						labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
 						// @ts-ignore
 						itemSorter={(a, b) => b.value - a.value}
-						content={<ChartTooltipContent unit="%" indicator="line" />}
+						content={
+							<ChartTooltipContent
+								filter={filter}
+								contentFormatter={(item) => twoDecimalString(item.value) + '%'}
+								indicator="line"
+							/>
+						}
 					/>
-					{Object.keys(chartConfig).map((key) => (
-						<Area
-							key={key}
-							// isAnimationActive={chartData.length < 20}
-							isAnimationActive={false}
-							// animateNewValues={false}
-							// animationDuration={1200}
-							dataKey={key}
-							type="monotoneX"
-							fill={chartConfig[key].color}
-							fillOpacity={0.4}
-							stroke={chartConfig[key].color}
-							stackId="a"
-						/>
-					))}
+					{Object.keys(chartConfig).map((key) => {
+						const filtered = filter && !key.includes(filter)
+						let fillOpacity = filtered ? 0.05 : 0.4
+						let strokeOpacity = filtered ? 0.1 : 1
+						return (
+							<Area
+								key={key}
+								isAnimationActive={false}
+								dataKey={key}
+								type="monotoneX"
+								fill={chartConfig[key].color}
+								fillOpacity={fillOpacity}
+								stroke={chartConfig[key].color}
+								strokeOpacity={strokeOpacity}
+								activeDot={{ opacity: filtered ? 0 : 1 }}
+								stackId="a"
+							/>
+						)
+					})}
 				</AreaChart>
 			</ChartContainer>
 		</div>
--- a/beszel/site/src/components/charts/container-mem-chart.tsx
+++ b/beszel/site/src/components/charts/container-mem-chart.tsx
@@ -5,17 +5,18 @@ import {
 	ChartTooltip,
 	ChartTooltipContent,
 } from '@/components/ui/chart'
-import { useMemo, useRef } from 'react'
+import { useMemo } from 'react'
 import {
+	useYAxisWidth,
 	chartTimeData,
 	cn,
 	formatShortDate,
 	toFixedWithoutTrailingZeros,
-	useYaxisWidth,
+	twoDecimalString,
 } from '@/lib/utils'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
-import { $chartTime } from '@/lib/stores'
+import { $chartTime, $containerFilter } from '@/lib/stores'

 export default function ContainerMemChart({
 	chartData,
@@ -25,10 +26,8 @@ export default function ContainerMemChart({
 	ticks: number[]
 }) {
 	const chartTime = useStore($chartTime)
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+	const filter = useStore($containerFilter)
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	const chartConfig = useMemo(() => {
 		let config = {} as Record<
@@ -70,12 +69,12 @@ export default function ContainerMemChart({
 	// }

 	return (
-		<div ref={chartRef}>
+		<div>
 			{/* {!yAxisSet && <Spinner />} */}
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart
@@ -92,9 +91,11 @@ export default function ContainerMemChart({
 						// domain={[0, (max: number) => Math.ceil(max)]}
 						tickLine={false}
 						axisLine={false}
-						unit={' GB'}
 						width={yAxisWidth}
-						tickFormatter={(value) => toFixedWithoutTrailingZeros(value / 1024, 2)}
+						tickFormatter={(value) => {
+							const val = toFixedWithoutTrailingZeros(value / 1024, 2) + ' GB'
+							return updateYAxisWidth(val)
+						}}
 					/>
 					<XAxis
 						dataKey="time"
@@ -114,21 +115,33 @@ export default function ContainerMemChart({
 						labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
 						// @ts-ignore
 						itemSorter={(a, b) => b.value - a.value}
-						content={<ChartTooltipContent unit=" MB" indicator="line" />}
+						content={
+							<ChartTooltipContent
+								filter={filter}
+								contentFormatter={(item) => twoDecimalString(item.value) + ' MB'}
+								indicator="line"
+							/>
+						}
 					/>
-					{Object.keys(chartConfig).map((key) => (
-						<Area
-							key={key}
-							// animationDuration={1200}
-							isAnimationActive={false}
-							dataKey={key}
-							type="monotoneX"
-							fill={chartConfig[key].color}
-							fillOpacity={0.4}
-							stroke={chartConfig[key].color}
-							stackId="a"
-						/>
-					))}
+					{Object.keys(chartConfig).map((key) => {
+						const filtered = filter && !key.includes(filter)
+						let fillOpacity = filtered ? 0.05 : 0.4
+						let strokeOpacity = filtered ? 0.1 : 1
+						return (
+							<Area
+								key={key}
+								isAnimationActive={false}
+								dataKey={key}
+								type="monotoneX"
+								fill={chartConfig[key].color}
+								strokeOpacity={strokeOpacity}
+								fillOpacity={fillOpacity}
+								stroke={chartConfig[key].color}
+								activeDot={filtered ? false : {}}
+								stackId="a"
+							/>
+						)
+					})}
 				</AreaChart>
 			</ChartContainer>
 		</div>
--- a/beszel/site/src/components/charts/container-net-chart.tsx
+++ b/beszel/site/src/components/charts/container-net-chart.tsx
@@ -5,17 +5,18 @@ import {
 	ChartTooltip,
 	ChartTooltipContent,
 } from '@/components/ui/chart'
-import { useMemo, useRef } from 'react'
+import { useMemo } from 'react'
 import {
+	useYAxisWidth,
 	chartTimeData,
 	cn,
 	formatShortDate,
 	toFixedWithoutTrailingZeros,
-	useYaxisWidth,
+	twoDecimalString,
 } from '@/lib/utils'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
-import { $chartTime } from '@/lib/stores'
+import { $chartTime, $containerFilter } from '@/lib/stores'
 import { Separator } from '@/components/ui/separator'

 export default function ContainerCpuChart({
@@ -26,10 +27,8 @@ export default function ContainerCpuChart({
 	ticks: number[]
 }) {
 	const chartTime = useStore($chartTime)
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+	const filter = useStore($containerFilter)
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	const chartConfig = useMemo(() => {
 		let config = {} as Record<
@@ -70,12 +69,12 @@ export default function ContainerCpuChart({
 	// }

 	return (
-		<div ref={chartRef}>
+		<div>
 			{/* {!yAxisSet && <Spinner />} */}
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart
@@ -93,8 +92,10 @@ export default function ContainerCpuChart({
 						width={yAxisWidth}
 						tickLine={false}
 						axisLine={false}
-						unit={' MB/s'}
-						tickFormatter={(value) => toFixedWithoutTrailingZeros(value, 2)}
+						tickFormatter={(value) => {
+							const val = toFixedWithoutTrailingZeros(value, 2) + ' MB/s'
+							return updateYAxisWidth(val)
+						}}
 					/>
 					<XAxis
 						dataKey="time"
@@ -116,6 +117,7 @@ export default function ContainerCpuChart({
 						itemSorter={(a, b) => b.value - a.value}
 						content={
 							<ChartTooltipContent
+								filter={filter}
 								indicator="line"
 								contentFormatter={(item, key) => {
 									try {
@@ -123,10 +125,10 @@ export default function ContainerCpuChart({
 										const received = item?.payload?.[key][1] ?? 0
 										return (
 											<span className="flex">
-												{received.toLocaleString()} MB/s
+												{twoDecimalString(received)} MB/s
 												<span className="opacity-70 ml-0.5"> rx </span>
 												<Separator orientation="vertical" className="h-3 mx-1.5 bg-primary/40" />
-												{sent.toLocaleString()} MB/s<span className="opacity-70 ml-0.5"> tx</span>
+												{twoDecimalString(sent)} MB/s<span className="opacity-70 ml-0.5"> tx</span>
 											</span>
 										)
 									} catch (e) {
@@ -136,20 +138,27 @@ export default function ContainerCpuChart({
 							/>
 						}
 					/>
-					{Object.keys(chartConfig).map((key) => (
-						<Area
-							key={key}
-							name={key}
-							// animationDuration={1200}
-							isAnimationActive={false}
-							dataKey={(data) => data?.[key]?.[2] ?? 0}
-							type="monotoneX"
-							fill={chartConfig[key].color}
-							fillOpacity={0.4}
-							stroke={chartConfig[key].color}
-							stackId="a"
-						/>
-					))}
+					{Object.keys(chartConfig).map((key) => {
+						const filtered = filter && !key.includes(filter)
+						let fillOpacity = filtered ? 0.05 : 0.4
+						let strokeOpacity = filtered ? 0.1 : 1
+						return (
+							<Area
+								key={key}
+								name={key}
+								// animationDuration={1200}
+								isAnimationActive={false}
+								dataKey={(data) => data?.[key]?.[2] ?? 0}
+								type="monotoneX"
+								fill={chartConfig[key].color}
+								fillOpacity={fillOpacity}
+								stroke={chartConfig[key].color}
+								strokeOpacity={strokeOpacity}
+								activeDot={{ opacity: filtered ? 0 : 1 }}
+								stackId="a"
+							/>
+						)
+					})}
 				</AreaChart>
 			</ChartContainer>
 		</div>
--- a/beszel/site/src/components/charts/cpu-chart.tsx
+++ b/beszel/site/src/components/charts/cpu-chart.tsx
@@ -1,12 +1,11 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'

 import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
-import { chartTimeData, cn, formatShortDate, useYaxisWidth } from '@/lib/utils'
+import { useYAxisWidth, chartTimeData, cn, formatShortDate, twoDecimalString } from '@/lib/utils'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
 import { $chartTime } from '@/lib/stores'
 import { SystemStatsRecord } from '@/types'
-import { useMemo, useRef } from 'react'

 export default function CpuChart({
 	ticks,
@@ -16,20 +15,22 @@ export default function CpuChart({
 	systemData: SystemStatsRecord[]
 }) {
 	const chartTime = useStore($chartTime)
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	return (
-		<div ref={chartRef}>
+		<div>
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
-				<AreaChart accessibilityLayer data={systemData} margin={{ top: 10 }}>
+				<AreaChart
+					accessibilityLayer
+					data={systemData}
+					margin={{ top: 10 }}
+					// syncId={'cpu'}
+				>
 					<CartesianGrid vertical={false} />
 					<YAxis
 						className="tracking-tighter"
@@ -37,7 +38,7 @@ export default function CpuChart({
 						width={yAxisWidth}
 						tickLine={false}
 						axisLine={false}
-						unit={'%'}
+						tickFormatter={(value) => updateYAxisWidth(value + '%')}
 					/>
 					<XAxis
 						dataKey="created"
@@ -55,8 +56,8 @@ export default function CpuChart({
 						animationDuration={150}
 						content={
 							<ChartTooltipContent
-								unit="%"
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								contentFormatter={(item) => twoDecimalString(item.value) + '%'}
 								indicator="line"
 							/>
 						}
--- a/beszel/site/src/components/charts/disk-chart.tsx
+++ b/beszel/site/src/components/charts/disk-chart.tsx
@@ -1,8 +1,17 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'

 import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
-import { chartTimeData, cn, formatShortDate, useYaxisWidth } from '@/lib/utils'
-import { useMemo, useRef } from 'react'
+import {
+	useYAxisWidth,
+	chartTimeData,
+	cn,
+	formatShortDate,
+	twoDecimalString,
+	toFixedFloat,
+	getSizeVal,
+	getSizeUnit,
+} from '@/lib/utils'
+// import { useMemo } from 'react'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
 import { $chartTime } from '@/lib/stores'
@@ -11,40 +20,24 @@ import { SystemStatsRecord } from '@/types'
 export default function DiskChart({
 	ticks,
 	systemData,
+	dataKey,
+	diskSize,
 }: {
 	ticks: number[]
 	systemData: SystemStatsRecord[]
+	dataKey: string
+	diskSize: number
 }) {
 	const chartTime = useStore($chartTime)
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
-
-	const diskSize = useMemo(() => {
-		return Math.round(systemData[0]?.stats.d)
-	}, [systemData])
-
-	// const ticks = useMemo(() => {
-	// 	let ticks = [0]
-	// 	for (let i = 1; i < diskSize; i += diskSize / 5) {
-	// 		ticks.push(Math.trunc(i))
-	// 	}
-	// 	ticks.push(diskSize)
-	// 	return ticks
-	// }, [diskSize])
-
-	// if (!systemData.length || !ticks.length) {
-	// 	return <Spinner />
-	// }
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	return (
-		<div ref={chartRef}>
+		<div>
 			{/* {!yAxisSet && <Spinner />} */}
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart
@@ -63,9 +56,12 @@ export default function DiskChart({
 						width={yAxisWidth}
 						domain={[0, diskSize]}
 						tickCount={9}
+						minTickGap={6}
 						tickLine={false}
 						axisLine={false}
-						unit={' GB'}
+						tickFormatter={(value) =>
+							updateYAxisWidth(toFixedFloat(getSizeVal(value), 2) + getSizeUnit(value))
+						}
 					/>
 					<XAxis
 						dataKey="created"
@@ -83,14 +79,16 @@ export default function DiskChart({
 						animationDuration={150}
 						content={
 							<ChartTooltipContent
-								unit=" GB"
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								contentFormatter={({ value }) =>
+									twoDecimalString(getSizeVal(value)) + getSizeUnit(value)
+								}
 								indicator="line"
 							/>
 						}
 					/>
 					<Area
-						dataKey="stats.du"
+						dataKey={dataKey}
 						name="Disk Usage"
 						type="monotoneX"
 						fill="hsl(var(--chart-4))"
--- a/beszel/site/src/components/charts/disk-io-chart.tsx
+++ b/beszel/site/src/components/charts/disk-io-chart.tsx
@@ -2,42 +2,37 @@ import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'

 import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
 import {
+	useYAxisWidth,
 	chartTimeData,
 	cn,
 	formatShortDate,
 	toFixedWithoutTrailingZeros,
-	useYaxisWidth,
+	twoDecimalString,
 } from '@/lib/utils'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
 import { $chartTime } from '@/lib/stores'
 import { SystemStatsRecord } from '@/types'
-import { useMemo, useRef } from 'react'

 export default function DiskIoChart({
 	ticks,
 	systemData,
+	dataKeys,
 }: {
 	ticks: number[]
 	systemData: SystemStatsRecord[]
+	dataKeys: string[]
 }) {
 	const chartTime = useStore($chartTime)
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
-
-	// if (!systemData.length || !ticks.length) {
-	// 	return <Spinner />
-	// }
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	return (
-		<div ref={chartRef}>
+		<div>
 			{/* {!yAxisSet && <Spinner />} */}
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart
@@ -55,10 +50,12 @@ export default function DiskIoChart({
 						className="tracking-tighter"
 						width={yAxisWidth}
 						// domain={[0, (max: number) => (max <= 0.4 ? 0.4 : Math.ceil(max))]}
-						tickFormatter={(value) => toFixedWithoutTrailingZeros(value, 2)}
+						tickFormatter={(value) => {
+							const val = toFixedWithoutTrailingZeros(value, 2) + ' MB/s'
+							return updateYAxisWidth(val)
+						}}
 						tickLine={false}
 						axisLine={false}
-						unit={' MB/s'}
 					/>
 					<XAxis
 						dataKey="created"
@@ -76,32 +73,28 @@ export default function DiskIoChart({
 						animationDuration={150}
 						content={
 							<ChartTooltipContent
-								unit=" MB/s"
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								contentFormatter={(item) => twoDecimalString(item.value) + ' MB/s'}
 								indicator="line"
 							/>
 						}
 					/>
-					<Area
-						dataKey="stats.dw"
-						name="Write"
-						type="monotoneX"
-						fill="hsl(var(--chart-3))"
-						fillOpacity={0.4}
-						stroke="hsl(var(--chart-3))"
-						// animationDuration={1200}
-						isAnimationActive={false}
-					/>
-					<Area
-						dataKey="stats.dr"
-						name="Read"
-						type="monotoneX"
-						fill="hsl(var(--chart-1))"
-						fillOpacity={0.4}
-						stroke="hsl(var(--chart-1))"
-						// animationDuration={1200}
-						isAnimationActive={false}
-					/>
+					{dataKeys.map((dataKey, i) => {
+						const action = i ? 'Read' : 'Write'
+						const color = i ? 'hsl(var(--chart-1))' : 'hsl(var(--chart-3))'
+						return (
+							<Area
+								key={i}
+								dataKey={dataKey}
+								name={action}
+								type="monotoneX"
+								fill={color}
+								fillOpacity={0.3}
+								stroke={color}
+								isAnimationActive={false}
+							/>
+						)
+					})}
 				</AreaChart>
 			</ChartContainer>
 		</div>
--- a/beszel/site/src/components/charts/mem-chart.tsx
+++ b/beszel/site/src/components/charts/mem-chart.tsx
@@ -1,9 +1,15 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'

 import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
-import { chartTimeData, cn, formatShortDate, toFixedFloat, useYaxisWidth } from '@/lib/utils'
-import { useMemo, useRef } from 'react'
-// import Spinner from '../spinner'
+import {
+	useYAxisWidth,
+	chartTimeData,
+	cn,
+	toFixedFloat,
+	twoDecimalString,
+	formatShortDate,
+} from '@/lib/utils'
+import { useMemo } from 'react'
 import { useStore } from '@nanostores/react'
 import { $chartTime } from '@/lib/stores'
 import { SystemStatsRecord } from '@/types'
@@ -15,23 +21,20 @@ export default function MemChart({
 	ticks: number[]
 	systemData: SystemStatsRecord[]
 }) {
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
 	const chartTime = useStore($chartTime)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	const totalMem = useMemo(() => {
 		return toFixedFloat(systemData.at(-1)?.stats.m ?? 0, 1)
 	}, [systemData])

 	return (
-		<div ref={chartRef}>
+		<div>
 			{/* {!yAxisSet && <Spinner />} */}
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart
@@ -46,11 +49,15 @@ export default function MemChart({
 						<YAxis
 							// use "ticks" instead of domain / tickcount if need more control
 							domain={[0, totalMem]}
+							tickCount={9}
 							className="tracking-tighter"
 							width={yAxisWidth}
 							tickLine={false}
 							axisLine={false}
-							unit={' GB'}
+							tickFormatter={(value) => {
+								const val = toFixedFloat(value, 1)
+								return updateYAxisWidth(val + ' GB')
+							}}
 						/>
 					)}
 					<XAxis
@@ -70,17 +77,18 @@ export default function MemChart({
 						animationDuration={150}
 						content={
 							<ChartTooltipContent
-								unit=" GB"
 								// @ts-ignore
-								itemSorter={(a, b) => a.name.localeCompare(b.name)}
+								itemSorter={(a, b) => a.order - b.order}
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								contentFormatter={(item) => twoDecimalString(item.value) + ' GB'}
 								indicator="line"
 							/>
 						}
 					/>
 					<Area
-						dataKey="stats.mu"
 						name="Used"
+						order={3}
+						dataKey="stats.mu"
 						type="monotoneX"
 						fill="hsl(var(--chart-2))"
 						fillOpacity={0.4}
@@ -88,14 +96,28 @@ export default function MemChart({
 						stackId="1"
 						isAnimationActive={false}
 					/>
+					{systemData.at(-1)?.stats.mz && (
+						<Area
+							name="ZFS ARC"
+							order={2}
+							dataKey="stats.mz"
+							type="monotoneX"
+							fill="hsla(175 60% 45% / 0.8)"
+							fillOpacity={0.5}
+							stroke="hsla(175 60% 45% / 0.8)"
+							stackId="1"
+							isAnimationActive={false}
+						/>
+					)}
 					<Area
-						dataKey="stats.mb"
 						name="Cache / Buffers"
+						order={1}
+						dataKey="stats.mb"
 						type="monotoneX"
-						fill="hsl(var(--chart-2))"
-						fillOpacity={0.2}
-						strokeOpacity={0.3}
-						stroke="hsl(var(--chart-2))"
+						fill="hsla(160 60% 45% / 0.5)"
+						fillOpacity={0.4}
+						// strokeOpacity={1}
+						stroke="hsla(160 60% 45% / 0.5)"
 						stackId="1"
 						isAnimationActive={false}
 					/>
--- a/beszel/site/src/components/charts/swap-chart.tsx
+++ b/beszel/site/src/components/charts/swap-chart.tsx
@@ -2,17 +2,17 @@ import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'

 import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
 import {
+	useYAxisWidth,
 	chartTimeData,
 	cn,
 	formatShortDate,
 	toFixedWithoutTrailingZeros,
-	useYaxisWidth,
+	twoDecimalString,
 } from '@/lib/utils'
 // import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
 import { $chartTime } from '@/lib/stores'
 import { SystemStatsRecord } from '@/types'
-import { useMemo, useRef } from 'react'

 export default function SwapChart({
 	ticks,
@@ -22,17 +22,14 @@ export default function SwapChart({
 	systemData: SystemStatsRecord[]
 }) {
 	const chartTime = useStore($chartTime)
-	const chartRef = useRef<HTMLDivElement>(null)
-	const yAxisWidth = useYaxisWidth(chartRef)
-
-	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()

 	return (
-		<div ref={chartRef}>
+		<div>
 			<ChartContainer
 				config={{}}
 				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
-					'opacity-100': yAxisSet,
+					'opacity-100': yAxisWidth,
 				})}
 			>
 				<AreaChart accessibilityLayer data={systemData} margin={{ top: 10 }}>
@@ -43,7 +40,7 @@ export default function SwapChart({
 						width={yAxisWidth}
 						tickLine={false}
 						axisLine={false}
-						unit={' GB'}
+						tickFormatter={(value) => updateYAxisWidth(value + ' GB')}
 					/>
 					<XAxis
 						dataKey="created"
@@ -61,8 +58,8 @@ export default function SwapChart({
 						animationDuration={150}
 						content={
 							<ChartTooltipContent
-								unit=" GB"
 								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								contentFormatter={(item) => twoDecimalString(item.value) + ' GB'}
 								indicator="line"
 							/>
 						}
--- a/beszel/site/src/components/charts/temperature-chart.tsx
+++ b/beszel/site/src/components/charts/temperature-chart.tsx
@@ -0,0 +1,131 @@
+import { CartesianGrid, Line, LineChart, XAxis, YAxis } from 'recharts'
+
+import {
+	ChartContainer,
+	ChartLegend,
+	ChartLegendContent,
+	ChartTooltip,
+	ChartTooltipContent,
+} from '@/components/ui/chart'
+import {
+	useYAxisWidth,
+	chartTimeData,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	twoDecimalString,
+} from '@/lib/utils'
+import { useStore } from '@nanostores/react'
+import { $chartTime } from '@/lib/stores'
+import { SystemStatsRecord } from '@/types'
+import { useMemo } from 'react'
+
+export default function TemperatureChart({
+	ticks,
+	systemData,
+}: {
+	ticks: number[]
+	systemData: SystemStatsRecord[]
+}) {
+	const chartTime = useStore($chartTime)
+	const { yAxisWidth, updateYAxisWidth } = useYAxisWidth()
+
+	/** Format temperature data for chart and assign colors */
+	const newChartData = useMemo(() => {
+		const chartData = { data: [], colors: {} } as {
+			data: Record<string, number | string>[]
+			colors: Record<string, string>
+		}
+		const tempSums = {} as Record<string, number>
+		for (let data of systemData) {
+			let newData = { created: data.created } as Record<string, number | string>
+			let keys = Object.keys(data.stats?.t ?? {})
+			for (let i = 0; i < keys.length; i++) {
+				let key = keys[i]
+				newData[key] = data.stats.t![key]
+				tempSums[key] = (tempSums[key] ?? 0) + newData[key]
+			}
+			chartData.data.push(newData)
+		}
+		const keys = Object.keys(tempSums).sort((a, b) => tempSums[b] - tempSums[a])
+		for (let key of keys) {
+			chartData.colors[key] = `hsl(${((keys.indexOf(key) * 360) / keys.length) % 360}, 60%, 55%)`
+		}
+		return chartData
+	}, [systemData])
+
+	const colors = Object.keys(newChartData.colors)
+
+	return (
+		<div>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisWidth,
+				})}
+			>
+				<LineChart
+					accessibilityLayer
+					data={newChartData.data}
+					margin={{
+						left: 0,
+						right: 0,
+						top: 10,
+						bottom: 0,
+					}}
+				>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						domain={[0, 'auto']}
+						width={yAxisWidth}
+						tickFormatter={(value) => {
+							const val = toFixedWithoutTrailingZeros(value, 2)
+							return updateYAxisWidth(val + ' °C')
+						}}
+						tickLine={false}
+						axisLine={false}
+					/>
+					<XAxis
+						dataKey="created"
+						domain={[ticks[0], ticks.at(-1)!]}
+						ticks={ticks}
+						type="number"
+						scale={'time'}
+						minTickGap={35}
+						tickMargin={8}
+						axisLine={false}
+						tickFormatter={chartTimeData[chartTime].format}
+					/>
+					<ChartTooltip
+						animationEasing="ease-out"
+						animationDuration={150}
+						// @ts-ignore
+						itemSorter={(a, b) => b.value - a.value}
+						content={
+							<ChartTooltipContent
+								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								contentFormatter={(item) => twoDecimalString(item.value) + ' °C'}
+								indicator="line"
+							/>
+						}
+					/>
+					{colors.map((key) => (
+						<Line
+							key={key}
+							dataKey={key}
+							name={key}
+							type="monotoneX"
+							dot={false}
+							strokeWidth={1.5}
+							stroke={newChartData.colors[key]}
+							isAnimationActive={false}
+						/>
+					))}
+					{colors.length < 12 && <ChartLegend content={<ChartLegendContent />} />}
+				</LineChart>
+			</ChartContainer>
+		</div>
+	)
+}
--- a/beszel/site/src/components/command-palette.tsx
+++ b/beszel/site/src/components/command-palette.tsx
@@ -6,6 +6,7 @@ import {
 	LogsIcon,
 	MailIcon,
 	Server,
+	SettingsIcon,
 	UsersIcon,
 } from 'lucide-react'

@@ -43,10 +44,30 @@ export default function CommandPalette() {

 	return (
 		<CommandDialog open={open} onOpenChange={setOpen}>
-			<CommandInput placeholder="Type a command or search..." />
+			<CommandInput placeholder="Search for systems or settings..." />
 			<CommandList>
 				<CommandEmpty>No results found.</CommandEmpty>
-				<CommandGroup heading="Suggestions">
+				{systems.length > 0 && (
+					<>
+						<CommandGroup>
+							{systems.map((system) => (
+								<CommandItem
+									key={system.id}
+									onSelect={() => {
+										navigate(`/system/${encodeURIComponent(system.name)}`)
+										setOpen(false)
+									}}
+								>
+									<Server className="mr-2 h-4 w-4" />
+									<span>{system.name}</span>
+									<CommandShortcut>{system.host}</CommandShortcut>
+								</CommandItem>
+							))}
+						</CommandGroup>
+						<CommandSeparator className="mb-1.5" />
+					</>
+				)}
+				<CommandGroup heading="Pages / Settings">
 					<CommandItem
 						keywords={['home']}
 						onSelect={() => {
@@ -58,6 +79,27 @@ export default function CommandPalette() {
 						<span>Dashboard</span>
 						<CommandShortcut>Page</CommandShortcut>
 					</CommandItem>
+					<CommandItem
+						onSelect={() => {
+							navigate('/settings/general')
+							setOpen((open) => !open)
+						}}
+					>
+						<SettingsIcon className="mr-2 h-4 w-4" />
+						<span>Settings</span>
+						<CommandShortcut>Settings</CommandShortcut>
+					</CommandItem>
+					<CommandItem
+						keywords={['alerts']}
+						onSelect={() => {
+							navigate('/settings/notifications')
+							setOpen((open) => !open)
+						}}
+					>
+						<MailIcon className="mr-2 h-4 w-4" />
+						<span>Notification settings</span>
+						<CommandShortcut>Settings</CommandShortcut>
+					</CommandItem>
 					<CommandItem
 						keywords={['github']}
 						onSelect={() => {
@@ -69,29 +111,9 @@ export default function CommandPalette() {
 						<CommandShortcut>GitHub</CommandShortcut>
 					</CommandItem>
 				</CommandGroup>
-				{systems.length > 0 && (
-					<>
-						<CommandSeparator />
-						<CommandGroup heading="Systems">
-							{systems.map((system) => (
-								<CommandItem
-									key={system.id}
-									onSelect={() => {
-										navigate(`/system/${system.name}`)
-										setOpen(false)
-									}}
-								>
-									<Server className="mr-2 h-4 w-4" />
-									<span>{system.name}</span>
-									<CommandShortcut>{system.host}</CommandShortcut>
-								</CommandItem>
-							))}
-						</CommandGroup>
-					</>
-				)}
 				{isAdmin() && (
 					<>
-						<CommandSeparator />
+						<CommandSeparator className="mb-1.5" />
 						<CommandGroup heading="Admin">
 							<CommandItem
 								keywords={['pocketbase']}
--- a/beszel/site/src/components/copy-to-clipboard.tsx
+++ b/beszel/site/src/components/copy-to-clipboard.tsx
@@ -0,0 +1,49 @@
+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'
+
+export default function CopyToClipboard({ content }: { content: string }) {
+	return (
+		<Dialog defaultOpen={true}>
+			<DialogContent className="w-[90%] rounded-lg" style={{ maxWidth: 530 }}>
+				<DialogHeader>
+					<DialogTitle>Could not copy to clipboard</DialogTitle>
+					<DialogDescription>Please copy the text manually.</DialogDescription>
+				</DialogHeader>
+				<CopyTextarea content={content} />
+				<p className="text-sm text-muted-foreground">
+					Clipboard API requires a secure context (https, localhost, or *.localhost)
+				</p>
+			</DialogContent>
+		</Dialog>
+	)
+}
+
+function CopyTextarea({ content }: { content: string }) {
+	const textareaRef = useRef<HTMLTextAreaElement>(null)
+
+	const rows = useMemo(() => {
+		return content.split('\n').length
+	}, [content])
+
+	useEffect(() => {
+		if (textareaRef.current) {
+			textareaRef.current.select()
+		}
+	}, [textareaRef])
+
+	useEffect(() => {
+		return () => $copyContent.set('')
+	}, [])
+
+	return (
+		<Textarea
+			className="font-mono overflow-hidden whitespace-pre"
+			rows={rows}
+			value={content}
+			readOnly
+			ref={textareaRef}
+		/>
+	)
+}
--- a/beszel/site/src/components/login/auth-form.tsx
+++ b/beszel/site/src/components/login/auth-form.tsx
@@ -94,13 +94,15 @@ export function UserAuthForm({
 						setErrors({ passwordConfirm: msg })
 						return
 					}
+					// create admin user
 					await pb.admins.create({
 						email,
 						password,
 						passwordConfirm: password,
 					})
 					await pb.admins.authWithPassword(email, password)
-					await pb.collection('users').create({
+					// create regular user
+					const user = await pb.collection('users').create({
 						username,
 						email,
 						password,
@@ -108,6 +110,13 @@ export function UserAuthForm({
 						role: 'admin',
 						verified: true,
 					})
+					// create hubsys
+					await pb.collection('systems').create({
+						name: 'x',
+						port: 'x',
+						host: 'hubsys',
+						users: user.id,
+					})
 					await pb.collection('users').authWithPassword(email, password)
 				} else {
 					await pb.collection('users').authWithPassword(email, password)
--- a/beszel/site/src/components/login/forgot-pass-form.tsx
+++ b/beszel/site/src/components/login/forgot-pass-form.tsx
--- a/beszel/site/src/components/login/login.tsx
+++ b/beszel/site/src/components/login/login.tsx
--- a/beszel/site/src/components/logo.tsx
+++ b/beszel/site/src/components/logo.tsx
--- a/beszel/site/src/components/mode-toggle.tsx
+++ b/beszel/site/src/components/mode-toggle.tsx
@@ -1,4 +1,4 @@
-import { MoonStarIcon, Sun } from 'lucide-react'
+import { LaptopIcon, MoonStarIcon, SunIcon } from 'lucide-react'

 import { Button } from '@/components/ui/button'
 import {
@@ -16,15 +16,24 @@ export function ModeToggle() {
 		<DropdownMenu>
 			<DropdownMenuTrigger asChild>
 				<Button variant={'ghost'} size="icon">
-					<Sun className="h-[1.2rem] w-[1.2rem] dark:opacity-0" />
+					<SunIcon className="h-[1.2rem] w-[1.2rem] dark:opacity-0" />
 					<MoonStarIcon className="absolute h-[1.2rem] w-[1.2rem] opacity-0 dark:opacity-100" />
 					<span className="sr-only">Toggle theme</span>
 				</Button>
 			</DropdownMenuTrigger>
 			<DropdownMenuContent>
-				<DropdownMenuItem onClick={() => setTheme('light')}>Light</DropdownMenuItem>
-				<DropdownMenuItem onClick={() => setTheme('dark')}>Dark</DropdownMenuItem>
-				<DropdownMenuItem onClick={() => setTheme('system')}>System</DropdownMenuItem>
+				<DropdownMenuItem onClick={() => setTheme('light')}>
+					<SunIcon className="mr-2.5 h-4 w-4" />
+					Light
+				</DropdownMenuItem>
+				<DropdownMenuItem onClick={() => setTheme('dark')}>
+					<MoonStarIcon className="mr-2.5 h-4 w-4" />
+					Dark
+				</DropdownMenuItem>
+				<DropdownMenuItem onClick={() => setTheme('system')}>
+					<LaptopIcon className="mr-2.5 h-4 w-4" />
+					System
+				</DropdownMenuItem>
 			</DropdownMenuContent>
 		</DropdownMenu>
 	)
--- a/beszel/site/src/components/router.tsx
+++ b/beszel/site/src/components/router.tsx
@@ -4,7 +4,7 @@ export const $router = createRouter(
 	{
 		home: '/',
 		server: '/system/:name',
-		'forgot-password': '/forgot-password',
+		settings: '/settings/:name?',
 	},
 	{ links: false }
 )
@@ -16,7 +16,7 @@ export const navigate = (urlString: string) => {

 function onClick(e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
 	e.preventDefault()
-	$router.open(new URL((e.target as HTMLAnchorElement).href).pathname)
+	$router.open(new URL((e.currentTarget as HTMLAnchorElement).href).pathname)
 }

 export const Link = (props: React.AnchorHTMLAttributes<HTMLAnchorElement>) => {
--- a/beszel/site/src/components/routes/home.tsx
+++ b/beszel/site/src/components/routes/home.tsx
@@ -0,0 +1,85 @@
+import { Suspense, lazy, useEffect, useState } from 'react'
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui/card'
+import { $alerts, $hubVersion, $systems, pb } from '@/lib/stores'
+import { useStore } from '@nanostores/react'
+import { GithubIcon } from 'lucide-react'
+import { Separator } from '../ui/separator'
+import { updateRecordList, updateSystemList } from '@/lib/utils'
+import { AlertRecord, SystemRecord } from '@/types'
+import { Input } from '../ui/input'
+
+const SystemsTable = lazy(() => import('../systems-table/systems-table'))
+
+export default function () {
+	const hubVersion = useStore($hubVersion)
+	const [filter, setFilter] = useState<string>()
+
+	useEffect(() => {
+		document.title = 'Dashboard / Beszel'
+
+		// make sure we have the latest list of systems
+		updateSystemList()
+
+		// subscribe to real time updates for systems / alerts
+		pb.collection<SystemRecord>('systems').subscribe('*', (e) => {
+			updateRecordList(e, $systems)
+		})
+		pb.collection<AlertRecord>('alerts').subscribe('*', (e) => {
+			updateRecordList(e, $alerts)
+		})
+		return () => {
+			pb.collection('systems').unsubscribe('*')
+			pb.collection('alerts').unsubscribe('*')
+		}
+	}, [])
+
+	return (
+		<>
+			<Card>
+				<CardHeader className="pb-5 px-2 sm:px-6 max-sm:pt-5 max-sm:pb-1">
+					<div className="grid md:flex gap-3 w-full items-end">
+						<div className="px-2 sm:px-1">
+							<CardTitle className="mb-2.5">All Systems</CardTitle>
+							<CardDescription>
+								Updated in real time. Press{' '}
+								<kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-0.5 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium text-muted-foreground opacity-100">
+									<span className="text-xs">⌘</span>K
+								</kbd>{' '}
+								to open the command palette.
+							</CardDescription>
+						</div>
+						<Input
+							placeholder="Filter..."
+							onChange={(e) => setFilter(e.target.value)}
+							className="w-full md:w-56 lg:w-80 ml-auto px-4"
+						/>
+					</div>
+				</CardHeader>
+				<CardContent className="max-sm:p-2">
+					<Suspense>
+						<SystemsTable filter={filter} />
+					</Suspense>
+				</CardContent>
+			</Card>
+			{hubVersion && (
+				<div className="flex gap-1.5 justify-end items-center pr-3 sm:pr-6 mt-3.5 text-xs opacity-80">
+					<a
+						href="https://github.com/henrygd/beszel"
+						target="_blank"
+						className="flex items-center gap-0.5 text-muted-foreground hover:text-foreground duration-75"
+					>
+						<GithubIcon className="h-3 w-3" /> GitHub
+					</a>
+					<Separator orientation="vertical" className="h-2.5 bg-muted-foreground opacity-70" />
+					<a
+						href="https://github.com/henrygd/beszel/releases"
+						target="_blank"
+						className="text-muted-foreground hover:text-foreground duration-75"
+					>
+						Beszel {hubVersion}
+					</a>
+				</div>
+			)}
+		</>
+	)
+}
--- a/beszel/site/src/components/routes/settings/general.tsx
+++ b/beszel/site/src/components/routes/settings/general.tsx
@@ -0,0 +1,110 @@
+import { Button } from '@/components/ui/button'
+import { Label } from '@/components/ui/label'
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from '@/components/ui/select'
+import { chartTimeData } from '@/lib/utils'
+import { Separator } from '@/components/ui/separator'
+import { LoaderCircleIcon, SaveIcon } from 'lucide-react'
+import { UserSettings } from '@/types'
+import { saveSettings } from './layout'
+import { useState } from 'react'
+// import { Input } from '@/components/ui/input'
+
+export default function SettingsProfilePage({ userSettings }: { userSettings: UserSettings }) {
+	const [isLoading, setIsLoading] = useState(false)
+
+	async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+		e.preventDefault()
+		setIsLoading(true)
+		const formData = new FormData(e.target as HTMLFormElement)
+		const data = Object.fromEntries(formData) as Partial<UserSettings>
+		await saveSettings(data)
+		setIsLoading(false)
+	}
+
+	return (
+		<div>
+			<div>
+				<h3 className="text-xl font-medium mb-2">General</h3>
+				<p className="text-sm text-muted-foreground leading-relaxed">
+					Change general application options.
+				</p>
+			</div>
+			<Separator className="my-4" />
+			<form onSubmit={handleSubmit} className="space-y-5">
+				{/* <Separator />
+				<div className="space-y-2">
+					<div className="mb-4">
+						<h3 className="mb-1 text-lg font-medium">Language</h3>
+						<p className="text-sm text-muted-foreground leading-relaxed">
+							Internationalization will be added in a future release. Please see the{' '}
+							<a href="#" className="link" target="_blank">
+								discussion on GitHub
+							</a>{' '}
+							for more details.
+						</p>
+					</div>
+					<Label className="block" htmlFor="lang">
+						Preferred language
+					</Label>
+					<Select defaultValue="en">
+						<SelectTrigger id="lang">
+							<SelectValue />
+						</SelectTrigger>
+						<SelectContent>
+							<SelectItem value="en">English</SelectItem>
+						</SelectContent>
+					</Select>
+				</div> */}
+				<div className="space-y-2">
+					<div className="mb-4">
+						<h3 className="mb-1 text-lg font-medium">Chart options</h3>
+						<p className="text-sm text-muted-foreground leading-relaxed">
+							Adjust display options for charts.
+						</p>
+					</div>
+					<Label className="block" htmlFor="chartTime">
+						Default time period
+					</Label>
+					<Select
+						name="chartTime"
+						key={userSettings.chartTime}
+						defaultValue={userSettings.chartTime}
+					>
+						<SelectTrigger id="chartTime">
+							<SelectValue />
+						</SelectTrigger>
+						<SelectContent>
+							{Object.entries(chartTimeData).map(([value, { label }]) => (
+								<SelectItem key={label} value={value}>
+									{label}
+								</SelectItem>
+							))}
+						</SelectContent>
+					</Select>
+					<p className="text-[0.8rem] text-muted-foreground">
+						Sets the default time range for charts when a system is viewed.
+					</p>
+				</div>
+				<Separator />
+				<Button
+					type="submit"
+					className="flex items-center gap-1.5 disabled:opacity-100"
+					disabled={isLoading}
+				>
+					{isLoading ? (
+						<LoaderCircleIcon className="h-4 w-4 animate-spin" />
+					) : (
+						<SaveIcon className="h-4 w-4" />
+					)}
+					Save settings
+				</Button>
+			</form>
+		</div>
+	)
+}
--- a/beszel/site/src/components/routes/settings/layout.tsx
+++ b/beszel/site/src/components/routes/settings/layout.tsx
@@ -0,0 +1,98 @@
+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 { BellIcon, SettingsIcon } from 'lucide-react'
+import { $userSettings, pb } from '@/lib/stores.ts'
+import { toast } from '@/components/ui/use-toast.ts'
+import { UserSettings } from '@/types.js'
+import General from './general.tsx'
+import Notifications from './notifications.tsx'
+
+const sidebarNavItems = [
+	{
+		title: 'General',
+		href: '/settings/general',
+		icon: SettingsIcon,
+	},
+	{
+		title: 'Notifications',
+		href: '/settings/notifications',
+		icon: BellIcon,
+	},
+]
+
+export async function saveSettings(newSettings: Partial<UserSettings>) {
+	try {
+		// get fresh copy of settings
+		const req = await pb.collection('user_settings').getFirstListItem('', {
+			fields: 'id,settings',
+		})
+		// update user settings
+		const updatedSettings = await pb.collection('user_settings').update(req.id, {
+			settings: {
+				...req.settings,
+				...newSettings,
+			},
+		})
+		$userSettings.set(updatedSettings.settings)
+		toast({
+			title: 'Settings saved',
+			description: 'Your user settings have been updated.',
+		})
+	} catch (e) {
+		// console.error('update settings', e)
+		toast({
+			title: 'Failed to save settings',
+			description: 'Check logs for more details.',
+			variant: 'destructive',
+		})
+	}
+}
+
+export default function SettingsLayout() {
+	const page = useStore($router)
+
+	useEffect(() => {
+		document.title = 'Settings / Beszel'
+		// redirect to account page if no page is specified
+		if (page?.path === '/settings') {
+			redirectPage($router, 'settings', { name: 'general' })
+		}
+	}, [])
+
+	return (
+		<Card className="pt-5 px-4 pb-8 sm:pt-6 sm:px-7">
+			<CardHeader className="p-0">
+				<CardTitle className="mb-1">Settings</CardTitle>
+				<CardDescription>Manage display and notification preferences.</CardDescription>
+			</CardHeader>
+			<CardContent className="p-0">
+				<Separator className="hidden md:block my-5" />
+				<div className="flex flex-col gap-3.5 md:flex-row md:gap-5 lg:gap-10">
+					<aside className="md:w-48 w-full">
+						<SidebarNav items={sidebarNavItems} />
+					</aside>
+					<div className="flex-1">
+						{/* @ts-ignore */}
+						<SettingsContent name={page?.params?.name ?? 'general'} />
+					</div>
+				</div>
+			</CardContent>
+		</Card>
+	)
+}
+
+function SettingsContent({ name }: { name: string }) {
+	const userSettings = useStore($userSettings)
+
+	switch (name) {
+		case 'general':
+			return <General userSettings={userSettings} />
+		case 'notifications':
+			return <Notifications userSettings={userSettings} />
+	}
+}
--- a/beszel/site/src/components/routes/settings/notifications.tsx
+++ b/beszel/site/src/components/routes/settings/notifications.tsx
@@ -0,0 +1,233 @@
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { pb } from '@/lib/stores'
+import { Separator } from '@/components/ui/separator'
+import { Card } from '@/components/ui/card'
+import { BellIcon, LoaderCircleIcon, PlusIcon, SaveIcon, Trash2Icon } from 'lucide-react'
+import { ChangeEventHandler, useEffect, useState } from 'react'
+import { toast } from '@/components/ui/use-toast'
+import { InputTags } from '@/components/ui/input-tags'
+import { UserSettings } from '@/types'
+import { saveSettings } from './layout'
+import * as v from 'valibot'
+import { isAdmin } from '@/lib/utils'
+
+interface ShoutrrrUrlCardProps {
+	url: string
+	onUrlChange: ChangeEventHandler<HTMLInputElement>
+	onRemove: () => void
+}
+
+const NotificationSchema = v.object({
+	emails: v.array(v.pipe(v.string(), v.email())),
+	webhooks: v.array(v.pipe(v.string(), v.url())),
+})
+
+const SettingsNotificationsPage = ({ userSettings }: { userSettings: UserSettings }) => {
+	const [webhooks, setWebhooks] = useState(userSettings.webhooks ?? [])
+	const [emails, setEmails] = useState<string[]>(userSettings.emails ?? [])
+	const [isLoading, setIsLoading] = useState(false)
+
+	// update values when userSettings changes
+	useEffect(() => {
+		setWebhooks(userSettings.webhooks ?? [])
+		setEmails(userSettings.emails ?? [])
+	}, [userSettings])
+
+	function addWebhook() {
+		setWebhooks([...webhooks, ''])
+		// focus on the new input
+		queueMicrotask(() => {
+			const inputs = document.querySelectorAll('#webhooks input') as NodeListOf<HTMLInputElement>
+			inputs[inputs.length - 1]?.focus()
+		})
+	}
+	const removeWebhook = (index: number) => setWebhooks(webhooks.filter((_, i) => i !== index))
+
+	function updateWebhook(index: number, value: string) {
+		const newWebhooks = [...webhooks]
+		newWebhooks[index] = value
+		setWebhooks(newWebhooks)
+	}
+
+	async function updateSettings() {
+		setIsLoading(true)
+		try {
+			const parsedData = v.parse(NotificationSchema, { emails, webhooks })
+			await saveSettings(parsedData)
+		} catch (e: any) {
+			toast({
+				title: 'Failed to save settings',
+				description: e.message,
+				variant: 'destructive',
+			})
+		}
+		setIsLoading(false)
+	}
+
+	return (
+		<div>
+			<div>
+				<h3 className="text-xl font-medium mb-2">Notifications</h3>
+				<p className="text-sm text-muted-foreground leading-relaxed">
+					Configure how you receive alert notifications.
+				</p>
+				<p className="text-sm text-muted-foreground mt-1.5 leading-relaxed">
+					Looking instead for where to create alerts? Click the bell{' '}
+					<BellIcon className="inline h-4 w-4" /> icons in the systems table.
+				</p>
+			</div>
+			<Separator className="my-4" />
+			<div className="space-y-5">
+				<div className="space-y-2">
+					<div className="mb-4">
+						<h3 className="mb-1 text-lg font-medium">Email notifications</h3>
+						{isAdmin() && (
+							<p className="text-sm text-muted-foreground leading-relaxed">
+								Please{' '}
+								<a href="/_/#/settings/mail" className="link" target="_blank">
+									configure an SMTP server
+								</a>{' '}
+								to ensure alerts are delivered.{' '}
+							</p>
+						)}
+					</div>
+					<Label className="block" htmlFor="email">
+						To email(s)
+					</Label>
+					<InputTags
+						value={emails}
+						onChange={setEmails}
+						placeholder="Enter email address..."
+						className="w-full"
+						type="email"
+						id="email"
+					/>
+					<p className="text-[0.8rem] text-muted-foreground">
+						Save address using enter key or comma. Leave blank to disable email notifications.
+					</p>
+				</div>
+				<Separator />
+				<div className="space-y-3">
+					<div>
+						<h3 className="mb-1 text-lg font-medium">Webhook / Push notifications</h3>
+						<p className="text-sm text-muted-foreground leading-relaxed">
+							Beszel uses{' '}
+							<a
+								href="https://containrrr.dev/shoutrrr/services/overview/"
+								target="_blank"
+								className="link"
+							>
+								Shoutrrr
+							</a>{' '}
+							to integrate with popular notification services.
+						</p>
+					</div>
+					{webhooks.length > 0 && (
+						<div className="grid gap-2.5" id="webhooks">
+							{webhooks.map((webhook, index) => (
+								<ShoutrrrUrlCard
+									key={index}
+									url={webhook}
+									onUrlChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+										updateWebhook(index, e.target.value)
+									}
+									onRemove={() => removeWebhook(index)}
+								/>
+							))}
+						</div>
+					)}
+					<Button
+						type="button"
+						variant="outline"
+						size="sm"
+						className="mt-2 flex items-center gap-1"
+						onClick={addWebhook}
+					>
+						<PlusIcon className="h-4 w-4 -ml-0.5" />
+						Add URL
+					</Button>
+				</div>
+				<Separator />
+				<Button
+					type="button"
+					className="flex items-center gap-1.5 disabled:opacity-100"
+					onClick={updateSettings}
+					disabled={isLoading}
+				>
+					{isLoading ? (
+						<LoaderCircleIcon className="h-4 w-4 animate-spin" />
+					) : (
+						<SaveIcon className="h-4 w-4" />
+					)}
+					Save settings
+				</Button>
+			</div>
+		</div>
+	)
+}
+
+const ShoutrrrUrlCard = ({ url, onUrlChange, onRemove }: ShoutrrrUrlCardProps) => {
+	const [isLoading, setIsLoading] = useState(false)
+
+	const sendTestNotification = async () => {
+		setIsLoading(true)
+		const res = await pb.send('/api/beszel/send-test-notification', { url })
+		if ('err' in res && !res.err) {
+			toast({
+				title: 'Test notification sent',
+				description: 'Check your notification service',
+			})
+		} else {
+			toast({
+				title: 'Error',
+				description: res.err ?? 'Failed to send test notification',
+				variant: 'destructive',
+			})
+		}
+		setIsLoading(false)
+	}
+
+	return (
+		<Card className="bg-muted/30 p-2 md:p-3">
+			<div className="flex items-center gap-1">
+				<Input
+					type="url"
+					className="light:bg-card"
+					required
+					placeholder="generic://webhook.site/xxxxxx"
+					value={url}
+					onChange={onUrlChange}
+				/>
+				<Button
+					type="button"
+					variant="outline"
+					className="w-20 md:w-28"
+					disabled={isLoading || url === ''}
+					onClick={sendTestNotification}
+				>
+					{isLoading ? (
+						<LoaderCircleIcon className="h-4 w-4 animate-spin" />
+					) : (
+						<span>
+							Test <span className="hidden md:inline">URL</span>
+						</span>
+					)}
+				</Button>
+				<Button
+					type="button"
+					variant="outline"
+					size="icon"
+					className="shrink-0"
+					aria-label="Delete"
+					onClick={onRemove}
+				>
+					<Trash2Icon className="h-4 w-4" />
+				</Button>
+			</div>
+		</Card>
+	)
+}
+
+export default SettingsNotificationsPage
--- a/beszel/site/src/components/routes/settings/sidebar-nav.tsx
+++ b/beszel/site/src/components/routes/settings/sidebar-nav.tsx
@@ -0,0 +1,68 @@
+import React from 'react'
+import { cn } from '@/lib/utils'
+import { buttonVariants } from '../../ui/button'
+import { $router, Link, navigate } from '../../router'
+import { useStore } from '@nanostores/react'
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from '@/components/ui/select'
+import { Separator } from '@/components/ui/separator'
+
+interface SidebarNavProps extends React.HTMLAttributes<HTMLElement> {
+	items: {
+		href: string
+		title: string
+		icon?: React.FC<React.SVGProps<SVGSVGElement>>
+	}[]
+}
+
+export function SidebarNav({ className, items, ...props }: SidebarNavProps) {
+	const page = useStore($router)
+
+	return (
+		<>
+			{/* Mobile View */}
+			<div className="md:hidden">
+				<Select onValueChange={(value: string) => navigate(value)} value={page?.path}>
+					<SelectTrigger className="w-full my-3.5">
+						<SelectValue placeholder="Select a page" />
+					</SelectTrigger>
+					<SelectContent>
+						{items.map((item) => (
+							<SelectItem key={item.href} value={item.href}>
+								<span className="flex items-center gap-2">
+									{item.icon && <item.icon className="h-4 w-4" />}
+									{item.title}
+								</span>
+							</SelectItem>
+						))}
+					</SelectContent>
+				</Select>
+				<Separator />
+			</div>
+
+			{/* Desktop View */}
+			<nav className={cn('hidden md:grid gap-1', className)} {...props}>
+				{items.map((item) => (
+					<Link
+						key={item.href}
+						href={item.href}
+						className={cn(
+							buttonVariants({ variant: 'ghost' }),
+							'flex items-center gap-3',
+							page?.path === item.href ? 'bg-muted hover:bg-muted' : 'hover:bg-muted/50',
+							'justify-start'
+						)}
+					>
+						{item.icon && <item.icon className="h-4 w-4" />}
+						{item.title}
+					</Link>
+				))}
+			</nav>
+		</>
+	)
+}
--- a/beszel/site/src/components/routes/system.tsx
+++ b/beszel/site/src/components/routes/system.tsx
@@ -0,0 +1,521 @@
+import { $systems, pb, $chartTime, $containerFilter, $userSettings } from '@/lib/stores'
+import { ContainerStatsRecord, SystemRecord, SystemStatsRecord } from '@/types'
+import { Suspense, lazy, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { Card, CardHeader, CardTitle, CardDescription, CardContent } 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, useLocalStorage } from '@/lib/utils'
+import { Separator } from '../ui/separator'
+import { scaleTime } from 'd3-scale'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip'
+import { Button, buttonVariants } from '../ui/button'
+import { Input } from '../ui/input'
+import { Rows, TuxIcon } from '../ui/icons'
+import { useIntersectionObserver } from '@/lib/use-intersection-observer'
+
+const CpuChart = lazy(() => import('../charts/cpu-chart'))
+const ContainerCpuChart = lazy(() => import('../charts/container-cpu-chart'))
+const MemChart = lazy(() => import('../charts/mem-chart'))
+const ContainerMemChart = lazy(() => import('../charts/container-mem-chart'))
+const DiskChart = lazy(() => import('../charts/disk-chart'))
+const DiskIoChart = lazy(() => import('../charts/disk-io-chart'))
+const BandwidthChart = lazy(() => import('../charts/bandwidth-chart'))
+const ContainerNetChart = lazy(() => import('../charts/container-net-chart'))
+const SwapChart = lazy(() => import('../charts/swap-chart'))
+const TemperatureChart = lazy(() => import('../charts/temperature-chart'))
+
+export default function SystemDetail({ name }: { name: string }) {
+	const systems = useStore($systems)
+	const chartTime = useStore($chartTime)
+	const [grid, setGrid] = useLocalStorage('grid', true)
+	const [ticks, setTicks] = useState([] as number[])
+	const [system, setSystem] = useState({} as SystemRecord)
+	const [systemStats, setSystemStats] = useState([] as SystemStatsRecord[])
+	const netCardRef = useRef<HTMLDivElement>(null)
+	const [dockerCpuChartData, setDockerCpuChartData] = useState<Record<string, number | string>[]>(
+		[]
+	)
+	const [dockerMemChartData, setDockerMemChartData] = useState<Record<string, number | string>[]>(
+		[]
+	)
+	const [dockerNetChartData, setDockerNetChartData] = useState<Record<string, number | number[]>[]>(
+		[]
+	)
+	const hasDockerStats = dockerCpuChartData.length > 0
+
+	useEffect(() => {
+		document.title = `${name} / Beszel`
+		return () => {
+			resetCharts()
+			$chartTime.set($userSettings.get().chartTime)
+			$containerFilter.set('')
+			// setHasDocker(false)
+		}
+	}, [name])
+
+	function resetCharts() {
+		setSystemStats([])
+		setDockerCpuChartData([])
+		setDockerMemChartData([])
+		setDockerNetChartData([])
+	}
+
+	useEffect(resetCharts, [chartTime])
+
+	useEffect(() => {
+		if (system.id && system.name === name) {
+			return
+		}
+		const matchingSystem = systems.find((s) => s.name === name) as SystemRecord
+		if (matchingSystem) {
+			setSystem(matchingSystem)
+		}
+	}, [name, system, systems])
+
+	// update system when new data is available
+	useEffect(() => {
+		if (!system.id) {
+			return
+		}
+		pb.collection<SystemRecord>('systems').subscribe(system.id, (e) => {
+			setSystem(e.record)
+		})
+		return () => {
+			pb.collection('systems').unsubscribe(system.id)
+		}
+	}, [system])
+
+	async function getStats<T>(collection: string): Promise<T[]> {
+		return await pb.collection<T>(collection).getFullList({
+			filter: pb.filter('system={:id} && created > {:created} && type={:type}', {
+				id: system.id,
+				created: getPbTimestamp(chartTime),
+				type: chartTimeData[chartTime].type,
+			}),
+			fields: 'created,stats',
+			sort: 'created',
+		})
+	}
+
+	// add empty values between records to make gaps if interval is too large
+	function addEmptyValues<T extends SystemStatsRecord | ContainerStatsRecord>(
+		records: T[],
+		expectedInterval: number
+	) {
+		const modifiedRecords: T[] = []
+		let prevTime = 0
+		for (let i = 0; i < records.length; i++) {
+			const record = records[i]
+			record.created = new Date(record.created).getTime()
+			if (prevTime) {
+				const interval = record.created - prevTime
+				// if interval is too large, add a null record
+				if (interval > expectedInterval / 2 + expectedInterval) {
+					// @ts-ignore
+					modifiedRecords.push({ created: null, stats: null })
+				}
+			}
+			prevTime = record.created
+			modifiedRecords.push(record)
+		}
+		return modifiedRecords
+	}
+
+	// get stats
+	useEffect(() => {
+		if (!system.id || !chartTime) {
+			return
+		}
+		Promise.allSettled([
+			getStats<SystemStatsRecord>('system_stats'),
+			getStats<ContainerStatsRecord>('container_stats'),
+		]).then(([systemStats, containerStats]) => {
+			const expectedInterval = chartTimeData[chartTime].expectedInterval
+			if (containerStats.status === 'fulfilled' && containerStats.value.length) {
+				makeContainerData(addEmptyValues(containerStats.value, expectedInterval))
+			}
+			if (systemStats.status === 'fulfilled') {
+				setSystemStats(addEmptyValues(systemStats.value, expectedInterval))
+			}
+		})
+	}, [system, chartTime])
+
+	useEffect(() => {
+		if (!systemStats.length) {
+			return
+		}
+		const now = new Date()
+		const startTime = chartTimeData[chartTime].getOffset(now)
+		const scale = scaleTime([startTime.getTime(), now], [0, systemStats.length])
+		setTicks(scale.ticks(chartTimeData[chartTime].ticks).map((d) => d.getTime()))
+	}, [chartTime, systemStats])
+
+	// make container stats for charts
+	const makeContainerData = useCallback((containers: ContainerStatsRecord[]) => {
+		// console.log('containers', containers)
+		const dockerCpuData = []
+		const dockerMemData = []
+		const dockerNetData = []
+		for (let { created, stats } of containers) {
+			if (!created) {
+				let nullData = { time: null } as unknown
+				dockerCpuData.push(nullData as Record<string, number | string>)
+				dockerMemData.push(nullData as Record<string, number | string>)
+				dockerNetData.push(nullData as Record<string, number | number[]>)
+				continue
+			}
+			const time = new Date(created).getTime()
+			let cpuData = { time } as Record<string, number | string>
+			let memData = { time } as Record<string, number | string>
+			let netData = { time } as Record<string, number | number[]>
+			for (let container of stats) {
+				cpuData[container.n] = container.c
+				memData[container.n] = container.m
+				netData[container.n] = [container.ns, container.nr, container.ns + container.nr] // sent, received, total
+			}
+			dockerCpuData.push(cpuData)
+			dockerMemData.push(memData)
+			dockerNetData.push(netData)
+		}
+		setDockerCpuChartData(dockerCpuData)
+		setDockerMemChartData(dockerMemData)
+		setDockerNetChartData(dockerNetData)
+	}, [])
+
+	// values for system info bar
+	const systemInfo = useMemo(() => {
+		if (!system.info) {
+			return []
+		}
+		let uptime: number | string = system.info.u
+		if (system.info.u < 172800) {
+			const hours = Math.trunc(uptime / 3600)
+			uptime = `${hours} hour${hours > 1 ? 's' : ''}`
+		} else {
+			uptime = `${Math.trunc(system.info?.u / 86400)} days`
+		}
+		return [
+			{ value: system.host, Icon: GlobeIcon, hide: system.host === 'hubsys' },
+			{
+				value: system.info.h,
+				Icon: MonitorIcon,
+				label: 'Hostname',
+				// hide if hostname is same as host or name
+				hide: system.info.h === system.host || system.info.h === system.name,
+			},
+			{ value: uptime, Icon: ClockArrowUp, label: 'Uptime' },
+			{ value: system.info.k, Icon: TuxIcon, label: 'Kernel' },
+			{
+				value: `${system.info.m} (${system.info.c}c${system.info.t ? `/${system.info.t}t` : ''})`,
+				Icon: CpuIcon,
+				hide: !system.info.m,
+			},
+		] as {
+			value: string | number | undefined
+			label?: string
+			Icon: any
+			hide?: boolean
+		}[]
+	}, [system.info])
+
+	/** Space for tooltip if more than 12 containers */
+	const bottomSpacing = useMemo(() => {
+		if (!netCardRef.current || !dockerNetChartData.length) {
+			return 0
+		}
+		const tooltipHeight = (Object.keys(dockerNetChartData[0]).length - 11) * 17.8 - 40
+		const wrapperEl = document.getElementById('chartwrap') as HTMLDivElement
+		const wrapperRect = wrapperEl.getBoundingClientRect()
+		const chartRect = netCardRef.current.getBoundingClientRect()
+		const distanceToBottom = wrapperRect.bottom - chartRect.bottom
+		return tooltipHeight - distanceToBottom
+	}, [netCardRef.current, dockerNetChartData])
+
+	if (!system.id) {
+		return null
+	}
+
+	return (
+		<>
+			<div id="chartwrap" className="grid gap-4 mb-10">
+				{/* system info */}
+				<Card>
+					<div className="grid lg:flex items-center gap-4 px-4 sm:px-6 pt-3 sm:pt-4 pb-5">
+						<div>
+							<h1 className="text-[1.6rem] font-semibold mb-1.5">{system.name}</h1>
+							<div className="flex flex-wrap items-center gap-3 gap-y-2 text-sm opacity-90">
+								<div className="capitalize flex gap-2 items-center">
+									<span className={cn('relative flex h-3 w-3')}>
+										{system.status === 'up' && (
+											<span
+												className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"
+												style={{ animationDuration: '1.5s' }}
+											></span>
+										)}
+										<span
+											className={cn('relative inline-flex rounded-full h-3 w-3', {
+												'bg-green-500': system.status === 'up',
+												'bg-red-500': system.status === 'down',
+												'bg-primary/40': system.status === 'paused',
+												'bg-yellow-500': system.status === 'pending',
+											})}
+										></span>
+									</span>
+									{system.status}
+								</div>
+								{systemInfo.map(({ value, label, Icon, hide }, i) => {
+									if (hide || !value) {
+										return null
+									}
+									const content = (
+										<div className="flex gap-1.5 items-center">
+											<Icon className="h-4 w-4" /> {value}
+										</div>
+									)
+									return (
+										<div key={i} className="contents">
+											<Separator orientation="vertical" className="h-4 bg-primary/30" />
+											{label ? (
+												<TooltipProvider>
+													<Tooltip delayDuration={150}>
+														<TooltipTrigger asChild>{content}</TooltipTrigger>
+														<TooltipContent>{label}</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											) : (
+												content
+											)}
+										</div>
+									)
+								})}
+							</div>
+						</div>
+						<div className="lg:ml-auto flex items-center gap-2 max-sm:-mb-1">
+							<ChartTimeSelect className="w-full lg:w-40" />
+							<TooltipProvider delayDuration={100}>
+								<Tooltip>
+									<TooltipTrigger asChild>
+										<Button
+											aria-label="Toggle grid"
+											className={cn(
+												buttonVariants({ variant: 'outline', size: 'icon' }),
+												'hidden lg:flex p-0 text-primary'
+											)}
+											onClick={() => setGrid(!grid)}
+										>
+											{grid ? (
+												<LayoutGridIcon className="h-[1.2rem] w-[1.2rem] opacity-85" />
+											) : (
+												<Rows className="h-[1.3rem] w-[1.3rem] opacity-85" />
+											)}
+										</Button>
+									</TooltipTrigger>
+									<TooltipContent>Toggle grid</TooltipContent>
+								</Tooltip>
+							</TooltipProvider>
+						</div>
+					</div>
+				</Card>
+
+				{/* main charts */}
+				<div className="grid lg:grid-cols-2 gap-4">
+					<ChartCard
+						grid={grid}
+						title="Total CPU Usage"
+						description="Average system-wide CPU utilization"
+					>
+						<CpuChart ticks={ticks} systemData={systemStats} />
+					</ChartCard>
+
+					{hasDockerStats && (
+						<ChartCard
+							grid={grid}
+							title="Docker CPU Usage"
+							description="CPU utilization of docker containers"
+							isContainerChart={true}
+						>
+							<ContainerCpuChart chartData={dockerCpuChartData} ticks={ticks} />
+						</ChartCard>
+					)}
+
+					<ChartCard
+						grid={grid}
+						title="Total Memory Usage"
+						description="Precise utilization at the recorded time"
+					>
+						<MemChart ticks={ticks} systemData={systemStats} />
+					</ChartCard>
+
+					{hasDockerStats && (
+						<ChartCard
+							grid={grid}
+							title="Docker Memory Usage"
+							description="Memory usage of docker containers"
+							isContainerChart={true}
+						>
+							<ContainerMemChart chartData={dockerMemChartData} ticks={ticks} />
+						</ChartCard>
+					)}
+
+					<ChartCard grid={grid} title="Disk Space" description="Usage of root partition">
+						<DiskChart
+							ticks={ticks}
+							systemData={systemStats}
+							dataKey="stats.du"
+							diskSize={Math.round(systemStats.at(-1)?.stats.d ?? NaN)}
+						/>
+					</ChartCard>
+
+					<ChartCard grid={grid} title="Disk I/O" description="Throughput of root filesystem">
+						<DiskIoChart
+							ticks={ticks}
+							systemData={systemStats}
+							dataKeys={['stats.dw', 'stats.dr']}
+						/>
+					</ChartCard>
+
+					<ChartCard
+						grid={grid}
+						title="Bandwidth"
+						description="Network traffic of public interfaces"
+					>
+						<BandwidthChart ticks={ticks} systemData={systemStats} />
+					</ChartCard>
+
+					{hasDockerStats && dockerNetChartData.length > 0 && (
+						<div
+							ref={netCardRef}
+							className={cn({
+								'col-span-full': !grid,
+							})}
+						>
+							<ChartCard
+								title="Docker Network I/O"
+								description="Includes traffic between internal services"
+								isContainerChart={true}
+							>
+								<ContainerNetChart chartData={dockerNetChartData} ticks={ticks} />
+							</ChartCard>
+						</div>
+					)}
+
+					{(systemStats.at(-1)?.stats.su ?? 0) > 0 && (
+						<ChartCard grid={grid} title="Swap Usage" description="Swap space used by the system">
+							<SwapChart ticks={ticks} systemData={systemStats} />
+						</ChartCard>
+					)}
+
+					{systemStats.at(-1)?.stats.t && (
+						<ChartCard grid={grid} title="Temperature" description="Temperatures of system sensors">
+							<TemperatureChart ticks={ticks} systemData={systemStats} />
+						</ChartCard>
+					)}
+				</div>
+
+				{/* extra filesystem charts */}
+				{Object.keys(systemStats.at(-1)?.stats.efs ?? {}).length > 0 && (
+					<div className="grid lg:grid-cols-2 gap-4">
+						{Object.keys(systemStats.at(-1)?.stats.efs ?? {}).map((extraFsName) => {
+							return (
+								<div key={extraFsName} className="contents">
+									<ChartCard
+										grid={grid}
+										title={`${extraFsName} Usage`}
+										description={`Disk usage of ${extraFsName}`}
+									>
+										<DiskChart
+											ticks={ticks}
+											systemData={systemStats}
+											dataKey={`stats.efs.${extraFsName}.du`}
+											diskSize={Math.round(systemStats.at(-1)?.stats.efs?.[extraFsName].d ?? NaN)}
+										/>
+									</ChartCard>
+									<ChartCard
+										grid={grid}
+										title={`${extraFsName} I/O`}
+										description={`Throughput of ${extraFsName}`}
+									>
+										<DiskIoChart
+											ticks={ticks}
+											systemData={systemStats}
+											dataKeys={[`stats.efs.${extraFsName}.w`, `stats.efs.${extraFsName}.r`]}
+										/>
+									</ChartCard>
+								</div>
+							)
+						})}
+					</div>
+				)}
+			</div>
+
+			{/* add space for tooltip if more than 12 containers */}
+			{bottomSpacing > 0 && <span className="block" style={{ height: bottomSpacing }} />}
+		</>
+	)
+}
+
+function ContainerFilterBar() {
+	const containerFilter = useStore($containerFilter)
+
+	const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+		$containerFilter.set(e.target.value)
+	}, []) // Use an empty dependency array to prevent re-creation
+
+	return (
+		<div className="relative py-1 block sm:w-44 sm:absolute sm:top-2.5 sm:right-3.5">
+			<Input
+				placeholder="Filter..."
+				className="pl-4 pr-8"
+				value={containerFilter}
+				onChange={handleChange}
+			/>
+			{containerFilter && (
+				<Button
+					type="button"
+					variant="ghost"
+					size="icon"
+					aria-label="Clear"
+					className="absolute right-1 top-1/2 -translate-y-1/2 h-7 w-7 text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-100"
+					onClick={() => $containerFilter.set('')}
+				>
+					<XIcon className="h-4 w-4" />
+				</Button>
+			)}
+		</div>
+	)
+}
+
+function ChartCard({
+	title,
+	description,
+	children,
+	grid,
+	isContainerChart,
+}: {
+	title: string
+	description: string
+	children: React.ReactNode
+	grid?: boolean
+	isContainerChart?: boolean
+}) {
+	const { isIntersecting, ref } = useIntersectionObserver()
+
+	return (
+		<Card
+			className={cn('pb-2 sm:pb-4 odd:last-of-type:col-span-full', { 'col-span-full': !grid })}
+			ref={ref}
+		>
+			<CardHeader className="pb-5 pt-4 relative space-y-1 max-sm:py-3 max-sm:px-4">
+				<CardTitle className="text-xl sm:text-2xl">{title}</CardTitle>
+				<CardDescription>{description}</CardDescription>
+				{isContainerChart && <ContainerFilterBar />}
+			</CardHeader>
+			<CardContent className="pl-0 w-[calc(100%-1.6em)] h-52 relative">
+				{<Spinner />}
+				{isIntersecting && <Suspense>{children}</Suspense>}
+			</CardContent>
+		</Card>
+	)
+}
--- a/beszel/site/src/components/spinner.tsx
+++ b/beszel/site/src/components/spinner.tsx
--- a/beszel/site/src/components/systems-table/columns.tsx
+++ b/beszel/site/src/components/systems-table/columns.tsx
--- a/beszel/site/src/components/systems-table/systems-table.tsx
+++ b/beszel/site/src/components/systems-table/systems-table.tsx
@@ -21,7 +21,6 @@ import {
 } from '@/components/ui/table'

 import { Button, buttonVariants } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'

 import {
 	DropdownMenu,
@@ -55,11 +54,11 @@ import {
 	PauseCircleIcon,
 	PlayCircleIcon,
 	Trash2Icon,
+	WifiIcon,
 } from 'lucide-react'
-import { useMemo, useState } from 'react'
-import { $systems, pb } from '@/lib/stores'
+import { useEffect, useMemo, useState } from 'react'
+import { $hubVersion, $systems, pb } from '@/lib/stores'
 import { useStore } from '@nanostores/react'
-import { AddSystemButton } from '../add-system'
 import { cn, copyToClipboard, isReadOnlyUser } from '@/lib/utils'
 import AlertsButton from '../table-alerts'
 import { navigate } from '../router'
@@ -73,7 +72,7 @@ function CellFormatter(info: CellContext<SystemRecord, unknown>) {
 				<span
 					className={cn(
 						'absolute inset-0 w-full h-full origin-left',
-						(val < 60 && 'bg-green-500') || (val < 90 && 'bg-yellow-500') || 'bg-red-600'
+						(val < 65 && 'bg-green-500') || (val < 90 && 'bg-yellow-500') || 'bg-red-600'
 					)}
 					style={{ transform: `scalex(${val}%)` }}
 				></span>
@@ -82,7 +81,12 @@ function CellFormatter(info: CellContext<SystemRecord, unknown>) {
 	)
 }

-function sortableHeader(column: Column<SystemRecord, unknown>, name: string, Icon: any) {
+function sortableHeader(
+	column: Column<SystemRecord, unknown>,
+	name: string,
+	Icon: any,
+	hideSortIcon = false
+) {
 	return (
 		<Button
 			variant="ghost"
@@ -91,16 +95,23 @@ function sortableHeader(column: Column<SystemRecord, unknown>, name: string, Ico
 		>
 			<Icon className="mr-2 h-4 w-4" />
 			{name}
-			<ArrowUpDown className="ml-2 h-4 w-4" />
+			{!hideSortIcon && <ArrowUpDown className="ml-2 h-4 w-4" />}
 		</Button>
 	)
 }

-export default function SystemsTable() {
+export default function SystemsTable({ filter }: { filter?: string }) {
 	const data = useStore($systems)
+	const hubVersion = useStore($hubVersion)
 	const [sorting, setSorting] = useState<SortingState>([])
 	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])

+	useEffect(() => {
+		if (filter !== undefined) {
+			table.getColumn('name')?.setFilterValue(filter)
+		}
+	}, [filter])
+
 	const columns: ColumnDef<SystemRecord>[] = useMemo(() => {
 		return [
 			{
@@ -124,7 +135,7 @@ export default function SystemsTable() {
 							<Button
 								data-nolink
 								variant={'ghost'}
-								className="text-foreground/90 h-7 px-1.5 gap-1.5"
+								className="text-primary/90 h-7 px-1.5 gap-1.5"
 								onClick={() => copyToClipboard(info.getValue() as string)}
 							>
 								{info.getValue() as string}
@@ -150,6 +161,29 @@ export default function SystemsTable() {
 				cell: CellFormatter,
 				header: ({ column }) => sortableHeader(column, 'Disk', HardDrive),
 			},
+			{
+				accessorKey: 'info.v',
+				size: 50,
+				cell: (info) => {
+					const version = info.getValue() as string
+					if (!version || !hubVersion) {
+						return null
+					}
+					return (
+						<span className="flex gap-2 items-center md:pr-5 tabular-nums pl-1">
+							<span
+								className={cn(
+									'w-2 h-2 left-0 rounded-full',
+									version === hubVersion ? 'bg-green-500' : 'bg-yellow-500'
+								)}
+								style={{ marginBottom: '-1px' }}
+							></span>
+							<span>{info.getValue() as string}</span>
+						</span>
+					)
+				},
+				header: ({ column }) => sortableHeader(column, 'Agent', WifiIcon, true),
+			},
 			{
 				id: 'actions',
 				size: 120,
@@ -226,7 +260,7 @@ export default function SystemsTable() {
 				},
 			},
 		]
-	}, [])
+	}, [hubVersion])

 	const table = useReactTable({
 		data,
@@ -248,80 +282,64 @@ export default function SystemsTable() {
 	})

 	return (
-		<>
-			<div className="w-full">
-				<div className="flex items-center mb-4 gap-2">
-					<Input
-						// @ts-ignore
-						placeholder="Filter..."
-						value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
-						onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
-						className="max-w-sm"
-					/>
-					<div className={cn('ml-auto flex gap-2', isReadOnlyUser() && 'hidden')}>
-						<AddSystemButton />
-					</div>
-				</div>
-				<div className="rounded-md border overflow-hidden">
-					<Table>
-						<TableHeader className="bg-muted/40">
-							{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/${row.original.name}`)
-											}
+		<div className="rounded-md border overflow-hidden">
+			<Table>
+				<TableHeader className="bg-muted/40">
+					{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')}
 									>
-										{row.getVisibleCells().map((cell) => (
-											<TableCell
-												key={cell.id}
-												style={{
-													width:
-														cell.column.getSize() === Number.MAX_SAFE_INTEGER
-															? 'auto'
-															: cell.column.getSize(),
-												}}
-												className={'overflow-hidden relative py-2.5'}
-											>
-												{flexRender(cell.column.columnDef.cell, cell.getContext())}
-											</TableCell>
-										))}
-									</TableRow>
-								))
-							) : (
-								<TableRow>
-									<TableCell colSpan={columns.length} className="h-24 text-center">
-										No systems found
+										{flexRender(cell.column.columnDef.cell, cell.getContext())}
 									</TableCell>
-								</TableRow>
-							)}
-						</TableBody>
-					</Table>
-				</div>
-			</div>
-		</>
+								))}
+							</TableRow>
+						))
+					) : (
+						<TableRow>
+							<TableCell colSpan={columns.length} className="h-24 text-center">
+								No systems found
+							</TableCell>
+						</TableRow>
+					)}
+				</TableBody>
+			</Table>
+		</div>
 	)
 }
--- a/beszel/site/src/components/table-alerts.tsx
+++ b/beszel/site/src/components/table-alerts.tsx
@@ -9,12 +9,13 @@ import {
 	DialogTitle,
 } from '@/components/ui/dialog'
 import { BellIcon } from 'lucide-react'
-import { cn, isAdmin } from '@/lib/utils'
+import { cn } from '@/lib/utils'
 import { Button } from '@/components/ui/button'
 import { Switch } from '@/components/ui/switch'
 import { AlertRecord, SystemRecord } from '@/types'
 import { lazy, Suspense, useMemo, useState } from 'react'
 import { toast } from './ui/use-toast'
+import { Link } from './router'

 const Slider = lazy(() => import('./ui/slider'))

@@ -49,20 +50,13 @@ export default function AlertsButton({ system }: { system: SystemRecord }) {
 			</DialogTrigger>
 			<DialogContent className="max-h-full overflow-auto">
 				<DialogHeader>
-					<DialogTitle className="mb-1">Alerts for {system.name}</DialogTitle>
-					<DialogDescription>
-						{isAdmin() && (
-							<span>
-								Please{' '}
-								<a
-									href="/_/#/settings/mail"
-									className="font-medium text-primary opacity-80 hover:opacity-100 duration-100"
-								>
-									configure an SMTP server
-								</a>{' '}
-								to ensure alerts are delivered.{' '}
-							</span>
-						)}
+					<DialogTitle className="text-xl">{system.name} alerts</DialogTitle>
+					<DialogDescription className="mb-1">
+						See{' '}
+						<Link href="/settings/notifications" className="link">
+							notification settings
+						</Link>{' '}
+						to configure how you receive alerts.
 					</DialogDescription>
 				</DialogHeader>
 				<div className="grid gap-3">
@@ -86,7 +80,7 @@ export default function AlertsButton({ system }: { system: SystemRecord }) {
 						alerts={systemAlerts}
 						name="Disk"
 						title="Disk Usage"
-						description="Triggers when disk usage exceeds a threshold."
+						description="Triggers when root usage exceeds a threshold."
 					/>
 				</div>
 			</DialogContent>
--- a/beszel/site/src/components/theme-provider.tsx
+++ b/beszel/site/src/components/theme-provider.tsx
--- a/beszel/site/src/components/ui/alert-dialog.tsx
+++ b/beszel/site/src/components/ui/alert-dialog.tsx
--- a/beszel/site/src/components/ui/badge.tsx
+++ b/beszel/site/src/components/ui/badge.tsx
@@ -0,0 +1,36 @@
+import * as React from "react"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils"
+
+const badgeVariants = cva(
+  "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
+  {
+    variants: {
+      variant: {
+        default:
+          "border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
+        secondary:
+          "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        destructive:
+          "border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
+        outline: "text-foreground",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  }
+)
+
+export interface BadgeProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    VariantProps<typeof badgeVariants> {}
+
+function Badge({ className, variant, ...props }: BadgeProps) {
+  return (
+    <div className={cn(badgeVariants({ variant }), className)} {...props} />
+  )
+}
+
+export { Badge, badgeVariants }
--- a/beszel/site/src/components/ui/button.tsx
+++ b/beszel/site/src/components/ui/button.tsx
--- a/beszel/site/src/components/ui/card.tsx
+++ b/beszel/site/src/components/ui/card.tsx
--- a/beszel/site/src/components/ui/chart.tsx
+++ b/beszel/site/src/components/ui/chart.tsx
@@ -100,6 +100,7 @@ const ChartTooltipContent = React.forwardRef<
 			nameKey?: string
 			labelKey?: string
 			unit?: string
+			filter?: string
 			contentFormatter?: (item: any, key: string) => React.ReactNode | string
 		}
 >(
@@ -119,6 +120,7 @@ const ChartTooltipContent = React.forwardRef<
 			nameKey,
 			labelKey,
 			unit,
+			filter,
 			itemSorter,
 			contentFormatter: content = undefined,
 		},
@@ -127,6 +129,9 @@ const ChartTooltipContent = React.forwardRef<
 		const { config } = useChart()

 		React.useMemo(() => {
+			if (filter) {
+				payload = payload?.filter((item) => (item.name as string)?.includes(filter))
+			}
 			if (itemSorter) {
 				// @ts-ignore
 				payload?.sort(itemSorter)
@@ -229,7 +234,7 @@ const ChartTooltipContent = React.forwardRef<
 												</span>
 											</div>
 											{item.value !== undefined && (
-												<span className="font-mono font-medium tabular-nums text-foreground">
+												<span className="font-medium tabular-nums text-foreground">
 													{content && typeof content === 'function'
 														? content(item, key)
 														: item.value.toLocaleString() + (unit ? unit : '')}
@@ -258,7 +263,7 @@ const ChartLegendContent = React.forwardRef<
 			nameKey?: string
 		}
 >(({ className, hideIcon = false, payload, verticalAlign = 'bottom', nameKey }, ref) => {
-	const { config } = useChart()
+	// const { config } = useChart()

 	if (!payload?.length) {
 		return null
@@ -268,33 +273,35 @@ const ChartLegendContent = React.forwardRef<
 		<div
 			ref={ref}
 			className={cn(
-				'flex items-center justify-center gap-4',
+				'flex items-center justify-center gap-4 gap-y-1 flex-wrap',
 				verticalAlign === 'top' ? 'pb-3' : 'pt-3',
 				className
 			)}
 		>
 			{payload.map((item) => {
-				const key = `${nameKey || item.dataKey || 'value'}`
-				const itemConfig = getPayloadConfigFromPayload(config, item, key)
+				// const key = `${nameKey || item.dataKey || 'value'}`
+				// const itemConfig = getPayloadConfigFromPayload(config, item, key)

 				return (
 					<div
 						key={item.value}
 						className={cn(
-							'flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3 [&>svg]:text-muted-foreground'
+							// 'flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3 [&>svg]:text-muted-foreground text-muted-foreground'
+							'flex items-center gap-1.5 text-muted-foreground'
 						)}
 					>
-						{itemConfig?.icon && !hideIcon ? (
+						{/* {itemConfig?.icon && !hideIcon ? (
 							<itemConfig.icon />
-						) : (
-							<div
-								className="h-2 w-2 shrink-0 rounded-[2px]"
-								style={{
-									backgroundColor: item.color,
-								}}
-							/>
-						)}
-						{itemConfig?.label}
+						) : ( */}
+						<div
+							className="h-2 w-2 shrink-0 rounded-[2px]"
+							style={{
+								backgroundColor: item.color,
+							}}
+						/>
+						{item.value}
+						{/* )} */}
+						{/* {itemConfig?.label} */}
 					</div>
 				)
 			})}
--- a/beszel/site/src/components/ui/command.tsx
+++ b/beszel/site/src/components/ui/command.tsx
@@ -13,7 +13,7 @@ const Command = React.forwardRef<
 	<CommandPrimitive
 		ref={ref}
 		className={cn(
-			'flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground',
+			'flex h-full w-full flex-col overflow-hidden bg-popover text-popover-foreground',
 			className
 		)}
 		{...props}
--- a/beszel/site/src/components/ui/dialog.tsx
+++ b/beszel/site/src/components/ui/dialog.tsx
--- a/beszel/site/src/components/ui/dropdown-menu.tsx
+++ b/beszel/site/src/components/ui/dropdown-menu.tsx
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Henry Dollman	8de2dee4e9	built-in agent	2024-10-07 18:58:57 -04:00
Henry Dollman	7a82571921	add time back to memory chart tooltip	2024-10-07 18:19:28 -04:00
Henry Dollman	e81f8ac387	add zfs arc to longer records	2024-10-07 11:45:09 -04:00
Henry Dollman	05faa88e6a	release 0.5.2	2024-10-05 18:30:10 -04:00
Henry Dollman	73aae62c2e	add ZFS ARC memory accounting	2024-10-05 18:07:42 -04:00
Henry Dollman	af4877ca30	add MEM_CALC env var	2024-10-05 15:29:27 -04:00
Henry Dollman	c407fe9af0	exclude sensor if temp <=0 \|\| temp >= 200	2024-10-05 11:14:20 -04:00
hank	13c9497951	Merge pull request #199 from Bot-wxt1221/main fix(package-lock.json): fix for nixpkgs	2024-10-04 11:06:58 -04:00
wxt	4274096645	fix(package-lock.json): fix for nixpkgs	2024-10-03 16:18:31 +08:00
Henry Dollman	a213b70a1c	release 0.5.1	2024-10-02 19:58:44 -04:00
Henry Dollman	66cc0a4b24	log stats on startup if log level is debug	2024-10-02 19:58:02 -04:00
Henry Dollman	f051f6a5f8	add dockerManager / fix for Docker 24 and older * dockerManager now handles all docker api interaction and container metrics tracking * sets unlimited concurrency for docker 24 and older	2024-10-02 19:45:26 -04:00
Henry Dollman	b9f142c28c	update go deps (gopsutil v4.24.9)	2024-10-02 19:11:13 -04:00
Henry Dollman	45e1283b83	move system.Info to Agent struct * cleaner to store entire info struct rather than separate properties for unchanging values	2024-10-02 12:34:42 -04:00
Henry Dollman	94cb5f2798	fix uptime hours pluralization	2024-10-02 12:33:31 -04:00
Henry Dollman	2883467b2b	update docker image workflow - change tag to "*v" - remove cache	2024-10-02 12:32:19 -04:00
Lindemberg Barbosa	0c77190161	fix: readme link for Monitoring additional disks, partitions, or remote mounts (#195 )	2024-10-02 10:40:12 -04:00
Henry Dollman	8d4d072343	fix readme backticks for telnet command	2024-09-30 15:45:46 -04:00
Henry Dollman	d6e0daf52a	update js deps and add package-lock.json (#192 ) - replaces use-is-in-viewport package with lib/use-intersection-observer.ts due to npm dependency conflict	2024-09-30 14:37:59 -04:00
Henry Dollman	22e9ede766	release 0.5.0	2024-09-29 16:37:09 -04:00
Henry Dollman	9ab359d3cf	add SENSORS env var	2024-09-29 16:36:32 -04:00
Henry Dollman	5447ccad47	make sure temp chart starts at 0 degrees	2024-09-29 16:33:23 -04:00
Henry Dollman	3e51d79c37	update memory chart colors	2024-09-29 15:14:55 -04:00
Henry Dollman	0996d60224	update go deps	2024-09-29 14:22:21 -04:00
Henry Dollman	7a5ec067f5	refactor records package	2024-09-29 13:36:03 -04:00
Henry Dollman	98563d643d	refactor alerts and move managers to hub struct - resource alerts called from updateSystem to avoid needing to pull from db after update	2024-09-29 13:35:38 -04:00
Henry Dollman	268e364bd4	update MemoryStats type	2024-09-29 12:36:19 -04:00
Henry Dollman	dd84a9fd35	remove semaphore and limit docker host connections to 10	2024-09-29 12:30:30 -04:00
Henry Dollman	2f4e537f72	change containerStatsMutex to a RWMutex	2024-09-28 19:13:24 -04:00
Henry Dollman	9637363cf3	combine container.Stats and container.PrevContainerStats	2024-09-28 18:51:46 -04:00
Henry Dollman	73d0dd25ec	agent refactoring - create agent/docker.go, agent/system.go	2024-09-28 17:49:04 -04:00
Henry Dollman	2ecf5572ba	remove addr, pubKey fields from agent struct	2024-09-28 16:48:55 -04:00
Henry Dollman	5e97167ee0	Fetch kernel, hostname, cpu at start rather than every run	2024-09-28 16:38:52 -04:00
Henry Dollman	1a4862ecd9	remove containerStats mutex and add stats by index	2024-09-27 19:06:37 -04:00
Henry Dollman	6235d15fa2	tweak colors in memory chart	2024-09-27 19:03:46 -04:00
Henry Dollman	4694642674	add apiContainerList variable to reduce memory allocations	2024-09-27 16:10:31 -04:00
Henry Dollman	56c0b86025	rename variables for clarity	2024-09-27 14:56:53 -04:00
Henry Dollman	82e3f3c7c1	Fix temperature sensors not reporting if any sensor lacks valid data (#167 )	2024-09-27 13:10:13 -04:00
Henry Dollman	38a9c535b8	change x axis time format for 1 week chart and add key	2024-09-27 13:08:48 -04:00
Henry Dollman	34c83e7c17	hide temp sensors chart legend if more than 11 sensors	2024-09-27 13:08:11 -04:00
Henry Dollman	fe5732d75a	replace icon and remove unneeded usememo in system.tsx	2024-09-27 13:06:31 -04:00
Henry Dollman	cc32b50d82	add agent.debug and comments	2024-09-27 12:17:19 -04:00
Henry Dollman	764e043e83	add slog and LOG_LEVEL to agent	2024-09-26 20:07:35 -04:00
Henry Dollman	cec9339f6d	allow monitoring remote mounts (#178 ) and handle I/O edge case (#183 )	2024-09-26 18:01:52 -04:00
Henry Dollman	f96f04f876	change swap chart placement	2024-09-26 16:55:31 -04:00
Henry Dollman	06b1c2200b	reorganize agent package	2024-09-26 15:08:26 -04:00
Henry Dollman	e88e2bf3dc	agent binary - show correct cores in lxc	2024-09-26 15:00:48 -04:00
Henry Dollman	8621a45383	remove unnecessary buffer pool	2024-09-26 14:57:01 -04:00
Henry Dollman	f2ddee9216	Fix typo in extra disk I/O chart (closes #187 )	2024-09-26 10:50:23 -04:00
Henry Dollman	f350d61ee2	add CSP env var to set a custom Content-Security-Policy header value	2024-09-24 15:22:47 -04:00
Henry Dollman	2d670c585d	optimize deletion of old records	2024-09-23 17:17:30 -04:00
Henry Dollman	55d1c00903	use same disk I/O chart component for root and extra fs	2024-09-23 13:56:15 -04:00
Henry Dollman	78a9086b55	use same disk usage chart component for root and extra fs	2024-09-23 13:42:44 -04:00
Henry Dollman	4ee169fea5	display TB in disk usage charts if value >= 1 TB	2024-09-23 13:34:40 -04:00
Henry Dollman	a286bed54c	update SystemInfo ts type	2024-09-18 13:02:53 -04:00
Henry Dollman	314cee081a	system info refactoring	2024-09-18 12:47:06 -04:00
Henry Dollman	e287124632	show swap chart only if swap is in use	2024-09-18 12:46:15 -04:00
Stavros	9cccefd3fa	feat: add kernel version text (#170 )	2024-09-17 13:43:58 -04:00
Henry Dollman	ec95f63806	limit fields when fetching server list	2024-09-16 18:40:11 -04:00
Henry Dollman	812fe20df7	fix: update settings when visiting a settings page directly	2024-09-16 16:51:23 -04:00
Henry Dollman	ddfcbc546b	release 0.4.0	2024-09-16 14:05:00 -04:00
Henry Dollman	c74d5496af	update go deps	2024-09-16 14:04:48 -04:00
Henry Dollman	060846d70a	update command palette items	2024-09-16 13:38:03 -04:00
Henry Dollman	e03e2b8d67	fix wrapping of y axis chart labels	2024-09-16 13:14:23 -04:00
Henry Dollman	c46879694d	allow FILESYSTEM env var to override root usage stats	2024-09-15 18:16:36 -04:00
Henry Dollman	61a68e5be1	refactor findMaxReadsDevice to use disk.IOCounters	2024-09-15 16:29:55 -04:00
Henry Dollman	bd43a2a2c2	focus on input when new webhook added	2024-09-15 11:31:44 -04:00
Henry Dollman	3aeca6af2f	add SYS_SENSORS env var	2024-09-14 18:46:16 -04:00
Henry Dollman	3e95269a7c	add hostname to system info	2024-09-14 18:09:38 -04:00
Henry Dollman	53b02dd55f	change extra disk charts to follow grid layout selection	2024-09-14 17:40:47 -04:00
Henry Dollman	43ba9d5c6a	change NIC env var to NICS to support multiple interfaces	2024-09-14 17:30:42 -04:00
Henry Dollman	1cb4a711c3	add NIC env var	2024-09-14 16:47:12 -04:00
Henry Dollman	aef99c3bd9	update package comments	2024-09-14 16:46:48 -04:00
Henry Dollman	138cbc13d6	rename package user to users	2024-09-14 16:44:53 -04:00
Henry Dollman	62d5ae8236	clean up / small refactoring	2024-09-14 15:46:42 -04:00
Henry Dollman	8ce605d65e	create UserManager	2024-09-14 15:45:57 -04:00
Henry Dollman	c8743201a2	allow creation of 10m record if nine 1m records	2024-09-14 15:27:42 -04:00
Henry Dollman	f16e22e521	updates to settings page and alerts	2024-09-13 18:19:12 -04:00
Henry Dollman	9710d0d2f1	shoutrrr alerts / settings page	2024-09-12 19:39:27 -04:00
Henry Dollman	2889d151ea	alert / settings page updates	2024-09-11 17:47:36 -04:00
Henry Dollman	ce6e887d1b	progress on settings / alerts	2024-09-11 15:50:15 -04:00
Henry Dollman	b4cf5bb1c0	alerts updates	2024-09-10 19:38:32 -04:00
Henry Dollman	9bc7773607	further progress on settings / alerts	2024-09-10 19:03:08 -04:00
Henry Dollman	3362a3d1cf	progress on settings page	2024-09-09 20:00:09 -04:00
Henry Dollman	3b13fadde2	rm shoutrrr config info from readme	2024-09-09 13:37:09 -04:00
parnic	99d79f7d2d	Add support for alerts via shoutrrr (#145 ) * Add support for alerts via shoutrrr This provides users the ability to use a wide variety of notification platforms instead of just email. If there's a problem sending a notification via shoutrrr, an error is logged and email is attempted as a fallback. Since this uses Viper, users can set a notification type and URL via either a config file or environment variable. In the beszel_data folder (where the sqlite dbs reside), create an alerts.env file to set values that way. Values: * NOTIFICATION_TYPE * If this is `shoutrrr`, then the shoutrrr library is used. Any other value, including not being set, uses the fallback email behavior. * NOTIFICATION_URL * If NOTIFICATION_TYPE is shoutrrr, this is the URL given to shoutrrr to send the alert. See list of supported services: https://containrrr.dev/shoutrrr/services/overview/ Note: there's currently a bug in viper v1.18.2+ where environment variable overrides aren't functioning when no config file exists, so this library should remain pinned to 1.18.1 until that's fixed. See: https://github.com/spf13/viper/issues/1895 * Update documentation * Log shoutrrr URL instead of unused "to" var	2024-09-09 13:34:43 -04:00
hank	1fb23ff673	Create SECURITY.md	2024-09-04 16:53:13 -04:00
Henry Dollman	29529d1a84	add EXTRA_FILESYSTEMS to systemd script and example	2024-09-04 16:22:01 -04:00
Bart	9f84629b92	Enhanced README.md (#156 ) * Enhanced README.md * Changed back to 'Sentence case' * Changed text to reflect comment	2024-09-04 15:29:14 -04:00
Henry Dollman	d2284c3fed	release 0.3.0	2024-09-03 18:37:02 -04:00
Henry Dollman	eb420bef3a	update go deps	2024-09-03 18:31:01 -04:00
Henry Dollman	9cf6c167b0	don't reset container filter when changing chart time	2024-09-03 18:26:28 -04:00
Henry Dollman	fbc7f79660	add instructions for monitoring additional disks / partitions	2024-09-03 18:23:09 -04:00
Henry Dollman	37170f2bdb	refactor network io stats collection (ref #150 )	2024-09-03 18:10:45 -04:00
Henry Dollman	af4c05e692	standardize chart values to two decimals	2024-09-03 16:49:12 -04:00
Henry Dollman	202a506485	add dialog for copy to clipboard fallback (fixes #152 )	2024-09-02 19:37:44 -04:00
Henry Dollman	aa3866c8ed	better alignment for readonly user account menu	2024-09-02 17:32:59 -04:00
Henry Dollman	f9c0d0b89d	don't cache mail client (fixes #149 )	2024-09-02 16:34:53 -04:00
Henry Dollman	ec5b1a833d	extra fs charts and filter bar for container charts	2024-09-02 16:13:07 -04:00
Henry Dollman	1cfda8fb9f	add icons to theme menu	2024-09-02 15:56:57 -04:00
Henry Dollman	2168db6ebd	remove toggle component	2024-09-02 15:56:14 -04:00
Henry Dollman	e64ef49e97	update js deps / exclude package-lock.json	2024-09-02 15:49:41 -04:00
Henry Dollman	54e0240dd8	remove external fonts	2024-09-02 12:12:52 -04:00
Henry Dollman	05f52ad15a	update readme	2024-09-01 19:17:17 -04:00
Henry Dollman	8ffb3a0cc8	update agent docker-compose.yml	2024-09-01 18:50:38 -04:00
Henry Dollman	953d7cac1e	use GOGC=75 for docker images	2024-09-01 18:25:40 -04:00
Henry Dollman	1cfd3cdd30	add support for multiple disks	2024-09-01 18:23:57 -04:00
Henry Dollman	b4a3cb9ce6	add timeout to ssh session creation to avoid hanging	2024-08-30 19:06:16 -04:00
Henry Dollman	7a6fbc8346	add toggle for chart grid layout	2024-08-25 18:19:47 -04:00
Henry Dollman	76cffb16de	formatting	2024-08-25 18:19:03 -04:00
Henry Dollman	13f7d016e6	fix blurry command pallette on some setups (closes #137 )	2024-08-25 16:20:58 -04:00
Henry Dollman	7a8dccfc97	use css color-scheme instead of custom scrollbar styles	2024-08-25 16:19:31 -04:00
Stavros	68824935e9	feat: style scrollbar (#135 ) * feat: style scrollbar * refactor(index.css): increase the border radius a bit * chore: revert prettier styling	2024-08-25 13:05:55 -04:00
Henry Dollman	42e2e3463e	release 0.2.0	2024-08-22 15:43:44 -04:00
Henry Dollman	2ef54bae36	add linux/arm/v7 docker images	2024-08-22 15:29:14 -04:00
Henry Dollman	6766a8120a	update go dependencies + hub dockerfile	2024-08-22 15:07:22 -04:00
Henry Dollman	9fcf1e7164	use grid layout for charts	2024-08-22 14:10:03 -04:00
Henry Dollman	130c9bd696	add temperature chart	2024-08-21 22:14:56 -04:00
Henry Dollman	88db920ebe	add icon to time select	2024-08-21 15:36:46 -04:00
Henry Dollman	5278805d79	web ui design updates	2024-08-21 15:06:33 -04:00
Henry Dollman	55863f849c	get rid of updatedSystem store	2024-08-21 12:50:12 -04:00
Henry Dollman	0590facc89	rerender table if hub version loaded after first render	2024-08-20 18:02:29 -04:00
Henry Dollman	3ff339ba1d	change agent check for invalid data to use memory usage rather than networks	2024-08-20 17:40:27 -04:00
Henry Dollman	e92a1d8a4d	log sent alert emails in pocketbase	2024-08-20 17:11:16 -04:00
Henry Dollman	2590f5612c	add null values to create gaps in chart if expected interval is exceeded. closes #100	2024-08-20 17:10:32 -04:00
Henry Dollman	112685bdf4	Merge branch 'theRealBassist-fix-container-lifetime-check'	2024-08-20 14:23:50 -04:00
Henry Dollman	7e1455161d	update container status check	2024-08-20 14:23:24 -04:00
Henry Dollman	be98b77634	Merge branch 'fix-container-lifetime-check' of https://github.com/theRealBassist/beszel into theRealBassist-fix-container-lifetime-check	2024-08-20 14:12:17 -04:00
Henry Dollman	cb75923f9f	Merge branch 'theRealBassist-add-agent-version-info'	2024-08-20 14:04:37 -04:00
Henry Dollman	87ab4961fd	move gh button + update agent display in table	2024-08-20 14:04:09 -04:00
Henry Dollman	d053f16058	add agent version to getkey route	2024-08-20 14:00:15 -04:00
theRealBassist	19272c05bf	Adds a version listing in the hub for each agent.	2024-08-19 17:45:15 -04:00
theRealBassist	e56c5f30e0	Fixes edge cases where container health message does not have expected suffix	2024-08-19 15:29:50 -04:00
Henry Dollman	7cf7b706c1	add check to catch containers in restart loop. closes #103	2024-08-19 13:01:01 -04:00
Henry Dollman	58fe9f723a	fix: uri encode system url. closes #102	2024-08-19 12:13:18 -04:00
Henry Dollman	a337ece52e	Merge branch 'TOomaAh-feature/change-file-structure'	2024-08-18 18:33:17 -04:00
Henry Dollman	61723a24e0	tweak opacity of non-stacked area charts	2024-08-18 18:32:15 -04:00
Henry Dollman	b7934931cf	refactor hub requestJsonFromAgent	2024-08-18 18:30:44 -04:00
Henry Dollman	0566433aa1	move longer records creation to a scheduled job	2024-08-18 18:23:17 -04:00
Henry Dollman	b5607025f7	slight improvements to agent memory usage	2024-08-18 17:45:39 -04:00
Henry Dollman	683dc74cbf	update workflows	2024-08-14 14:56:01 -04:00
Henry Dollman	c7e67a9b63	refactor: agent and entities	2024-08-14 14:14:41 -04:00
Henry Dollman	083da9598e	refactor: hub	2024-08-14 11:28:43 -04:00
Henry Dollman	f8d2161489	refactor: alerts / emails	2024-08-12 19:13:42 -04:00
Henry Dollman	d0d4e546d9	update dockerfiles and docker workflow	2024-08-11 16:21:02 -04:00
Henry Dollman	2ac5d797d2	update readme / .gitignore	2024-08-11 16:20:29 -04:00
Henry Dollman	4105567051	remove cobra dependency for agent	2024-08-11 15:54:27 -04:00
Henry Dollman	c06eabefe0	add docker compose examples for hub / agent to supplemental	2024-08-11 15:22:30 -04:00
Henry Dollman	9d2192f323	update migrations / gitignore	2024-08-11 15:14:58 -04:00
Henry Dollman	dd55e74ec9	update goreleaser config	2024-08-11 13:57:09 -04:00
Henry Dollman	9da1e5751a	move application code into beszel folder	2024-08-11 13:41:57 -04:00
TOomaAh	ea71492d13	fix migrations	2024-08-11 02:18:24 +02:00
THOMAS B	b51770a703	Merge branch 'henrygd:main' into feature/change-file-structure	2024-08-10 11:21:02 +02:00
Henry Dollman	39596b8da8	add -p flag to hub installer and run on 0.0.0.0	2024-08-09 12:17:22 -04:00
TOomaAh	932d126117	remove global variable	2024-08-09 17:58:09 +02:00
TOomaAh	034a5c21eb	change agent file structure	2024-08-09 17:52:02 +02:00
TOomaAh	d840178cc0	change hub file structure	2024-08-07 23:59:02 +02:00