release 0.1.2

subtract mem cache from container stats

.gitignore

@@ -6,4 +6,5 @@ temp
 beszel
 beszel-agent
 beszel_data
+beszel_data*
 dist

agent/.goreleaser.yml

@@ -12,9 +12,15 @@ builds:
     goos:
       - linux
       - darwin
+      - freebsd
     goarch:
       - amd64
       - arm64
+      - arm
+      - mips64
+    ignore:
+      - goos: freebsd
+        goarch: arm
 
 archives:
   - format: tar.gz

agent/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     restart: unless-stopped
     network_mode: host
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       PORT: 45876
       KEY: 'ssh-ed25519 YOUR_PUBLIC_KEY'

agent/dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:alpine as builder
+FROM --platform=$BUILDPLATFORM golang:alpine AS builder
 
 WORKDIR /app
 

agent/go.mod

@@ -6,15 +6,14 @@ 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.6
+	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/golang/protobuf v1.3.2 // indirect
 	github.com/google/go-github/v30 v30.1.0 // indirect
-	github.com/google/go-querystring v1.0.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
@@ -22,11 +21,10 @@ require (
 	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.9 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	google.golang.org/appengine v1.3.0 // 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
 )

agent/go.sum

@@ -11,14 +11,15 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
 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 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 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 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 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=
@@ -36,8 +37,8 @@ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt
 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.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64=
-github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA=
+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=
@@ -50,23 +51,25 @@ github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZ
 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 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I=
 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.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.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.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+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 h1:JIqe8uIcRBHXDQVvZtHwp80ai3Lw3IJAeJEs55Dc1W0=
 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=
@@ -74,18 +77,18 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 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.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
-golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+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.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+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 h1:FBSsiFRMz3LBeXIomRnVzrQwSDj4ibvcRexLG0LZGQk=
 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=

agent/main.go

@@ -1,14 +1,15 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"log"
 	"math"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 	"sync"
@@ -23,10 +24,20 @@ import (
 	psutilNet "github.com/shirou/gopsutil/v4/net"
 )
 
-var Version = "0.0.1-alpha.6"
+var Version = "0.1.2"
 
-var containerCpuMap = make(map[string][2]uint64)
-var containerCpuMutex = &sync.Mutex{}
+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,
@@ -43,86 +54,37 @@ var netIoStats = NetIoStats{
 }
 
 // client for docker engine api
-var client = &http.Client{
-	Timeout: time.Second * 5,
-	Transport: &http.Transport{
-		Dial: func(proto, addr string) (net.Conn, error) {
-			return net.Dial("unix", "/var/run/docker.sock")
-		},
-		ForceAttemptHTTP2:   false,
-		MaxIdleConns:        100,
-		MaxIdleConnsPerHost: 100,
-		IdleConnTimeout:     90 * time.Second,
-		DisableKeepAlives:   false,
-	},
-}
+var dockerClient = newDockerClient()
 
-type SystemData struct {
-	Stats      SystemStats      `json:"stats"`
-	Info       SystemInfo       `json:"info"`
-	Containers []ContainerStats `json:"container"`
-}
+func getSystemStats() (*SystemInfo, *SystemStats) {
+	systemStats := &SystemStats{}
 
-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"`
-	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"`
-	// MemPct float64 `json:"mp"`
-}
-
-func getSystemStats() (SystemInfo, SystemStats) {
-	c, _ := cpu.Percent(0, false)
-	v, _ := mem.VirtualMemory()
-	d, _ := disk.Usage("/")
-
-	cpuPct := twoDecimals(c[0])
-	memPct := twoDecimals(v.UsedPercent)
-	diskPct := twoDecimals(d.UsedPercent)
-
-	systemStats := SystemStats{
-		Cpu:          cpuPct,
-		Mem:          bytesToGigabytes(v.Total),
-		MemUsed:      bytesToGigabytes(v.Used),
-		MemBuffCache: bytesToGigabytes(v.Total - v.Free - v.Used),
-		MemPct:       memPct,
-		Disk:         bytesToGigabytes(d.Total),
-		DiskUsed:     bytesToGigabytes(d.Used),
-		DiskPct:      diskPct,
+	// 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])
 	}
 
-	systemInfo := SystemInfo{
-		Cpu:     cpuPct,
-		MemPct:  memPct,
-		DiskPct: diskPct,
+	// 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)
 	}
 
-	// add disk stats
+	// 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
@@ -138,12 +100,12 @@ func getSystemStats() (SystemInfo, SystemStats) {
 		}
 	}
 
-	// add network stats
+	// network stats
 	if netIO, err := psutilNet.IOCounters(true); err == nil {
 		bytesSent := uint64(0)
 		bytesRecv := uint64(0)
 		for _, v := range netIO {
-			if skipNetworkInterface(v.Name) {
+			if skipNetworkInterface(&v) {
 				continue
 			}
 			// log.Printf("%+v: %+v recv, %+v sent\n", v.Name, v.BytesRecv, v.BytesSent)
@@ -162,13 +124,19 @@ func getSystemStats() (SystemInfo, SystemStats) {
 		netIoStats.Time = time.Now()
 	}
 
-	// add host stats
+	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 {
+	if info, err := cpu.Info(); err == nil && len(info) > 0 {
 		systemInfo.CpuModel = info[0].ModelName
 	}
 	if cores, err := cpu.Counts(false); err == nil {
@@ -182,54 +150,79 @@ func getSystemStats() (SystemInfo, SystemStats) {
 
 }
 
-func getDockerStats() ([]ContainerStats, error) {
-	resp, err := client.Get("http://localhost/containers/json")
+func getDockerStats() ([]*ContainerStats, error) {
+	resp, err := dockerClient.Get("http://localhost/containers/json")
 	if err != nil {
-		return []ContainerStats{}, err
+		closeIdleConnections(err)
+		return []*ContainerStats{}, err
 	}
 	defer resp.Body.Close()
 
-	var containers []Container
+	var containers []*Container
 	if err := json.NewDecoder(resp.Body).Decode(&containers); err != nil {
-		panic(err)
+		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
-	var containerStats []ContainerStats
 
 	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 {
-				log.Printf("Error getting container stats: %+v\n", err)
-				return
+				// 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)
 		}()
 	}
 
-	// clean up old containers from map
-	validNames := make(map[string]struct{}, len(containers))
-	for _, ctr := range containers {
-		validNames[ctr.Names[0][1:]] = struct{}{}
-	}
-	for name := range containerCpuMap {
-		if _, exists := validNames[name]; !exists {
-			delete(containerCpuMap, name)
+	wg.Wait()
+
+	for id := range containerStatsMap {
+		if _, exists := validIds[id]; !exists {
+			// log.Printf("Removing container cpu map entry: %+v\n", id)
+			delete(containerStatsMap, id)
 		}
 	}
 
-	wg.Wait()
-
 	return containerStats, nil
 }
 
-func getContainerStats(ctr Container) (ContainerStats, error) {
-	resp, err := client.Get("http://localhost/containers/" + ctr.ID + "/stats?stream=0&one-shot=1")
+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
+		return &ContainerStats{}, err
 	}
 	defer resp.Body.Close()
 
@@ -240,40 +233,73 @@ func getContainerStats(ctr Container) (ContainerStats, error) {
 
 	name := ctr.Names[0][1:]
 
-	// memory
-	usedMemory := statsJson.MemoryStats.Usage - statsJson.MemoryStats.Cache
-	// pctMemory := float64(usedMemory) / float64(statsJson.MemoryStats.Limit) * 100
+	// 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
-	// add default values to containerCpu if it doesn't exist
-	containerCpuMutex.Lock()
-	defer containerCpuMutex.Unlock()
-	if _, ok := containerCpuMap[name]; !ok {
-		containerCpuMap[name] = [2]uint64{0, 0}
-	}
-	cpuDelta := statsJson.CPUStats.CPUUsage.TotalUsage - containerCpuMap[name][0]
-	systemDelta := statsJson.CPUStats.SystemUsage - containerCpuMap[name][1]
+	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{}, errors.New("cpu pct is greater than 100")
+		return &ContainerStats{}, fmt.Errorf("%s cpu pct greater than 100: %+v", name, cpuPct)
 	}
-	containerCpuMap[name] = [2]uint64{statsJson.CPUStats.CPUUsage.TotalUsage, statsJson.CPUStats.SystemUsage}
+	stats.Cpu = [2]uint64{statsJson.CPUStats.CPUUsage.TotalUsage, statsJson.CPUStats.SystemUsage}
 
-	cStats := ContainerStats{
-		Name: name,
-		Cpu:  twoDecimals(cpuPct),
-		Mem:  bytesToMegabytes(float64(usedMemory)),
-		// MemPct: twoDecimals(pctMemory),
+	// 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
 }
 
-func gatherStats() SystemData {
+// 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 := &SystemData{
 		Stats:      systemStats,
 		Info:       systemInfo,
-		Containers: []ContainerStats{},
+		Containers: []*ContainerStats{},
 	}
 	containerStats, err := getDockerStats()
 	if err == nil {
@@ -283,7 +309,7 @@ func gatherStats() SystemData {
 	return stats
 }
 
-func startServer(port string, pubKey []byte) {
+func startServer(addr string, pubKey []byte) {
 	sshServer.Handle(func(s sshServer.Session) {
 		stats := gatherStats()
 		var jsonStats []byte
@@ -292,8 +318,8 @@ func startServer(port string, pubKey []byte) {
 		s.Exit(0)
 	})
 
-	log.Printf("Starting SSH server on port %s", port)
-	if err := sshServer.ListenAndServe(":"+port, nil, sshServer.NoPty(),
+	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)
@@ -333,9 +359,13 @@ func main() {
 	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)
+		startServer(":45876", pubKey)
 	}
 }
 
@@ -363,8 +393,18 @@ func findDefaultFilesystem() string {
 	return ""
 }
 
-func skipNetworkInterface(name string) bool {
-	return strings.HasPrefix(name, "lo") || strings.HasPrefix(name, "docker") || strings.HasPrefix(name, "br-") || strings.HasPrefix(name, "veth")
+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() {
@@ -382,7 +422,7 @@ func initializeNetIoStats() {
 		bytesSent := uint64(0)
 		bytesRecv := uint64(0)
 		for _, v := range netIO {
-			if skipNetworkInterface(v.Name) {
+			if skipNetworkInterface(&v) {
 				continue
 			}
 			log.Printf("Found network interface: %+v (%+v recv, %+v sent)\n", v.Name, v.BytesRecv, v.BytesSent)
@@ -394,3 +434,47 @@ func initializeNetIoStats() {
 		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()
+}

agent/types.go

@@ -2,43 +2,88 @@ package main
 
 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 {
-	ID      string `json:"Id"`
+	Id      string
+	IdShort string
 	Names   []string
-	Image   string
-	ImageID string
-	Command string
-	Created int64
+	Status  string
+	// Image   string
+	// ImageID string
+	// Command string
+	// Created int64
 	// Ports      []Port
-	SizeRw     int64 `json:",omitempty"`
-	SizeRootFs int64 `json:",omitempty"`
-	Labels     map[string]string
-	State      string
-	Status     string
-	HostConfig struct {
-		NetworkMode string            `json:",omitempty"`
-		Annotations map[string]string `json:",omitempty"`
-	}
+	// SizeRw     int64 `json:",omitempty"`
+	// SizeRootFs int64 `json:",omitempty"`
+	// Labels     map[string]string
+	// State      string
+	// HostConfig struct {
+	// 	NetworkMode string            `json:",omitempty"`
+	// 	Annotations map[string]string `json:",omitempty"`
+	// }
 	// NetworkSettings *SummaryNetworkSettings
 	// Mounts          []MountPoint
 }
 
 type CStats struct {
 	// Common stats
-	Read    time.Time `json:"read"`
-	PreRead time.Time `json:"preread"`
+	// Read    time.Time `json:"read"`
+	// PreRead time.Time `json:"preread"`
 
 	// Linux specific stats, not populated on Windows.
 	// PidsStats  PidsStats  `json:"pids_stats,omitempty"`
 	// BlkioStats BlkioStats `json:"blkio_stats,omitempty"`
 
 	// Windows specific stats, not populated on Linux.
-	NumProcs uint32 `json:"num_procs"`
+	// NumProcs uint32 `json:"num_procs"`
 	// StorageStats StorageStats `json:"storage_stats,omitempty"`
+	// Networks request version >=1.21
+	Networks map[string]NetworkStats
 
 	// Shared stats
-	CPUStats    CPUStats    `json:"cpu_stats,omitempty"`
-	PreCPUStats CPUStats    `json:"precpu_stats,omitempty"` // "Pre"="Previous"
+	CPUStats CPUStats `json:"cpu_stats,omitempty"`
+	// PreCPUStats CPUStats    `json:"precpu_stats,omitempty"` // "Pre"="Previous"
 	MemoryStats MemoryStats `json:"memory_stats,omitempty"`
 }
 
@@ -50,7 +95,7 @@ type CPUStats struct {
 	SystemUsage uint64 `json:"system_cpu_usage,omitempty"`
 
 	// Online CPUs. Linux only.
-	OnlineCPUs uint32 `json:"online_cpus,omitempty"`
+	// OnlineCPUs uint32 `json:"online_cpus,omitempty"`
 
 	// Throttling Data. Linux only.
 	// ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`
@@ -64,19 +109,19 @@ type CPUUsage struct {
 
 	// Total CPU time consumed per core (Linux). Not used on Windows.
 	// Units: nanoseconds.
-	PercpuUsage []uint64 `json:"percpu_usage,omitempty"`
+	// PercpuUsage []uint64 `json:"percpu_usage,omitempty"`
 
 	// Time spent by tasks of the cgroup in kernel mode (Linux).
 	// Time spent by all container processes in kernel mode (Windows).
 	// Units: nanoseconds (Linux).
 	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers.
-	UsageInKernelmode uint64 `json:"usage_in_kernelmode"`
+	// UsageInKernelmode uint64 `json:"usage_in_kernelmode"`
 
 	// Time spent by tasks of the cgroup in user mode (Linux).
 	// Time spent by all container processes in user mode (Windows).
 	// Units: nanoseconds (Linux).
 	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers
-	UsageInUsermode uint64 `json:"usage_in_usermode"`
+	// UsageInUsermode uint64 `json:"usage_in_usermode"`
 }
 
 type MemoryStats struct {
@@ -85,20 +130,27 @@ type MemoryStats struct {
 	Usage uint64 `json:"usage,omitempty"`
 	Cache uint64 `json:"cache,omitempty"`
 	// maximum usage ever recorded.
-	MaxUsage uint64 `json:"max_usage,omitempty"`
+	// 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"`
+	// Failcnt uint64 `json:"failcnt,omitempty"`
+	// Limit   uint64 `json:"limit,omitempty"`
 
-	// committed bytes
-	Commit uint64 `json:"commitbytes,omitempty"`
-	// peak committed bytes
-	CommitPeak uint64 `json:"commitpeakbytes,omitempty"`
-	// private working set
-	PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`
+	// // committed bytes
+	// Commit uint64 `json:"commitbytes,omitempty"`
+	// // peak committed bytes
+	// CommitPeak uint64 `json:"commitpeakbytes,omitempty"`
+	// // private working set
+	// PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`
+}
+
+type NetworkStats struct {
+	// Bytes received. Windows and Linux.
+	RxBytes uint64 `json:"rx_bytes"`
+	// Bytes sent. Windows and Linux.
+	TxBytes uint64 `json:"tx_bytes"`
 }
 
 type DiskIoStats struct {
@@ -114,3 +166,12 @@ type NetIoStats struct {
 	Time      time.Time
 	Name      string
 }
+
+type PrevContainerStats struct {
+	Cpu [2]uint64
+	Net struct {
+		Sent uint64
+		Recv uint64
+		Time time.Time
+	}
+}

hub/.goreleaser.yml

@@ -15,6 +15,7 @@ builds:
     goarch:
       - amd64
       - arm64
+      - arm
 
 archives:
   - format: tar.gz

hub/alerts.go

@@ -1,19 +1,17 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/mail"
 
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/models"
 	"github.com/pocketbase/pocketbase/tools/mailer"
-	"github.com/pocketbase/pocketbase/tools/types"
 )
 
 func handleSystemAlerts(newStatus string, newRecord *models.Record, oldRecord *models.Record) {
 	alertRecords, err := app.Dao().FindRecordsByExpr("alerts",
-		dbx.NewExp("system = {:system}", dbx.Params{"system": oldRecord.Get("id")}),
+		dbx.NewExp("system = {:system}", dbx.Params{"system": oldRecord.GetId()}),
 	)
 	if err != nil || len(alertRecords) == 0 {
 		// log.Println("no alerts found for system")
@@ -22,7 +20,7 @@ func handleSystemAlerts(newStatus string, newRecord *models.Record, oldRecord *m
 	// log.Println("found alerts", len(alertRecords))
 	var systemInfo *SystemInfo
 	for _, alertRecord := range alertRecords {
-		name := alertRecord.Get("name").(string)
+		name := alertRecord.GetString("name")
 		switch name {
 		case "Status":
 			handleStatusAlerts(newStatus, oldRecord, alertRecord)
@@ -46,24 +44,24 @@ func handleSystemAlerts(newStatus string, newRecord *models.Record, oldRecord *m
 
 func getSystemInfo(record *models.Record) *SystemInfo {
 	var SystemInfo SystemInfo
-	json.Unmarshal([]byte(record.Get("info").(types.JsonRaw)), &SystemInfo)
+	record.UnmarshalJSONField("info", &SystemInfo)
 	return &SystemInfo
 }
 
 func handleSlidingValueAlert(newRecord *models.Record, alertRecord *models.Record, name string, curValue float64) {
-	triggered := alertRecord.Get("triggered").(bool)
-	threshold := alertRecord.Get("value").(float64)
+	triggered := alertRecord.GetBool("triggered")
+	threshold := alertRecord.GetFloat("value")
 	// fmt.Println(name, curValue, "threshold", threshold, "triggered", triggered)
 	var subject string
 	var body string
 	if !triggered && curValue > threshold {
 		alertRecord.Set("triggered", true)
-		systemName := newRecord.Get("name").(string)
+		systemName := newRecord.GetString("name")
 		subject = fmt.Sprintf("%s usage threshold exceeded on %s", name, systemName)
-		body = fmt.Sprintf("%s usage on %s is %.1f%%.\n\n- Beszel", name, systemName, curValue)
+		body = fmt.Sprintf("%s usage on %s is %.1f%%.\n\n%s\n\n- Beszel", name, systemName, curValue, app.Settings().Meta.AppUrl+"/system/"+systemName)
 	} else if triggered && curValue <= threshold {
 		alertRecord.Set("triggered", false)
-		systemName := newRecord.Get("name").(string)
+		systemName := newRecord.GetString("name")
 		subject = fmt.Sprintf("%s usage returned below threshold on %s", name, systemName)
 		body = fmt.Sprintf("%s usage on %s is below threshold at %.1f%%.\n\n%s\n\n- Beszel", name, systemName, curValue, app.Settings().Meta.AppUrl+"/system/"+systemName)
 	} else {
@@ -81,7 +79,7 @@ func handleSlidingValueAlert(newRecord *models.Record, alertRecord *models.Recor
 	}
 	if user := alertRecord.ExpandedOne("user"); user != nil {
 		sendAlert(EmailData{
-			to:   user.Get("email").(string),
+			to:   user.GetString("email"),
 			subj: subject,
 			body: body,
 		})
@@ -92,11 +90,11 @@ func handleStatusAlerts(newStatus string, oldRecord *models.Record, alertRecord
 	var alertStatus string
 	switch newStatus {
 	case "up":
-		if oldRecord.Get("status") == "down" {
+		if oldRecord.GetString("status") == "down" {
 			alertStatus = "up"
 		}
 	case "down":
-		if oldRecord.Get("status") == "up" {
+		if oldRecord.GetString("status") == "up" {
 			alertStatus = "down"
 		}
 	}
@@ -116,9 +114,9 @@ func handleStatusAlerts(newStatus string, oldRecord *models.Record, alertRecord
 		emoji = "\u2705"
 	}
 	// send alert
-	systemName := oldRecord.Get("name").(string)
+	systemName := oldRecord.GetString("name")
 	sendAlert(EmailData{
-		to:   user.Get("email").(string),
+		to:   user.GetString("email"),
 		subj: fmt.Sprintf("Connection to %s is %s %v", systemName, alertStatus, emoji),
 		body: fmt.Sprintf("Connection to %s is %s\n\n- Beszel", systemName, alertStatus),
 	})

hub/docker-compose.yml

@@ -4,6 +4,6 @@ services:
     container_name: 'beszel'
     restart: unless-stopped
     ports:
-      - '127.0.0.1:8090:8090'
+      - '8090:8090'
     volumes:
       - ./beszel_data:/beszel_data

hub/dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:alpine as builder
+FROM --platform=$BUILDPLATFORM golang:alpine AS builder
 
 WORKDIR /app
 

hub/go.mod

@@ -6,52 +6,51 @@ require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61
 	github.com/pocketbase/dbx v1.10.1
-	github.com/pocketbase/pocketbase v0.22.16
+	github.com/pocketbase/pocketbase v0.22.18
 	github.com/rhysd/go-github-selfupdate v1.2.3
 	github.com/spf13/cobra v1.8.1
-	golang.org/x/crypto v0.24.0
+	golang.org/x/crypto v0.25.0
 )
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.27.23 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.23 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
 	github.com/aws/smithy-go v1.20.3 // 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/fatih/color v1.17.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.4 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
 	github.com/ganigeorgiev/fexpr v0.4.1 // indirect
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
 	github.com/goccy/go-json v0.10.3 // 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.0.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.12.5 // 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/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -62,29 +61,30 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tcnksm/go-gitconfig v0.1.2 // indirect
-	github.com/ulikunitz/xz v0.5.9 // 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
 	go.opencensus.io v0.24.0 // indirect
-	gocloud.dev v0.37.0 // indirect
+	gocloud.dev v0.38.0 // indirect
 	golang.org/x/image v0.18.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/term v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/api v0.187.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
+	google.golang.org/api v0.189.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect
 	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
-	modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
-	modernc.org/libc v1.52.1 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
+	modernc.org/gc/v3 v3.0.0-20240722195230-4a140ff9c08e // indirect
+	modernc.org/libc v1.55.5 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.8.0 // indirect
-	modernc.org/sqlite v1.30.1 // indirect
+	modernc.org/sqlite v1.31.1 // indirect
 	modernc.org/strutil v1.2.0 // indirect
 	modernc.org/token v1.1.0 // indirect
 )

hub/go.sum

@@ -1,17 +1,16 @@
 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.6.1 h1:T0Zw1XM5c1GlpN2HYr2s+m3vr1p2wy+8VN+Z1FKxW38=
-cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQSlO4x4=
-cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4=
-cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q=
-cloud.google.com/go/compute v1.25.0 h1:H1/4SqSUhjPFE7L5ddzHOfY2bCAvjwNRZPNl6Ni5oYU=
-cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
-cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc=
-cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI=
-cloud.google.com/go/storage v1.39.1 h1:MvraqHKhogCOTXTlct/9C3K3+Uy2jBmFYb3/Sp6dVtY=
-cloud.google.com/go/storage v1.39.1/go.mod h1:xK6xZmxZmo+fyP7+DEF6FhNc24/JAe95OLyOHCXFH1o=
+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=
 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=
@@ -22,44 +21,44 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDe
 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.11 h1:El5VypsMIz7sFwAAj/j06JX9UGs4KAbAIEaZ57bNY4s=
-github.com/aws/aws-sdk-go v1.51.11/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
-github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o=
-github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
+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.23 h1:Cr/gJEa9NAS7CDAjbnB7tHYb3aLZI2gVggfmSAasDac=
-github.com/aws/aws-sdk-go-v2/config v1.27.23/go.mod h1:WMMYHqLCFu5LH05mFOF5tsq1PGEMfKbu083VKqLCd0o=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.23 h1:G1CfmLVoO2TdQ8z9dW+JBc/r8+MqyPQhXCafNZcXVZo=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.23/go.mod h1:V/DvSURn6kKgcuKEk4qwSwb/fZ2d++FFARtWSbXnLqY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 h1:Aznqksmd6Rfv2HQN9cpqIV/lQRMaIpJkLLaJ1ZI76no=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9/go.mod h1:WQr3MY7AxGNxaqAtsDWn+fBxmd4XvLkzeqQ8P1VM0/w=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4 h1:6eKRM6fgeXG4krRO9XKz755vuRhT5UyB9M1W6vjA3JU=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4/go.mod h1:h0TjcRi+nTob6fksqubKOe+Hra8uqfgmN+vuw4xRwWE=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 h1:5SAoZ4jYpGH4721ZNoS1znQrhOfZinOhc4XuTXx/nVc=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13/go.mod h1:+rdA6ZLpaSeM7tSg/B0IEDinCIBJGmW8rKDFkYpP04g=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 h1:WIijqeaAO7TYFLbhsZmi2rgLEAtWOC1LhxCAVTJlSKw=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13/go.mod h1:i+kbfa76PQbWw/ULoWnp51EYVWH4ENln76fLQE3lXT8=
+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.13 h1:THZJJ6TU/FOiM7DZFnisYV9d49oxXWUzsVIMTuf3VNU=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.13/go.mod h1:VISUTg6n+uBaYIWPBaIG0jk7mbBxm7DUqBtU2cUDDWI=
+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.15 h1:2jyRZ9rVIMisyQRnhSS/SqlckveoxXneIumECVFP91Y=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.15/go.mod h1:bDRG3m382v1KJBk1cKz7wIajg87/61EiiymEyfLvAe0=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.15 h1:I9zMeF107l0rJrpnHpjEiiTSCKYAIw8mALiXcPsGBiA=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.15/go.mod h1:9xWJ3Q/S6Ojusz1UIkfycgD1mGirJfLLKqq3LPT7WN8=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.13 h1:Eq2THzHt6P41mpjS2sUzz/3dJYFRqdWZ+vQaEMm98EM=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.13/go.mod h1:FgwTca6puegxgCInYwGjmd4tB9195Dd6LCuA+8MjpWw=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0 h1:4rhV0Hn+bf8IAIUphRX1moBcEvKJipCPmswMCl6Q5mw=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0/go.mod h1:hdV0NTYd0RwV4FvNKhKUNbPLZoq9CTr/lke+3I7aCAI=
-github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 h1:p1GahKIjyMDZtiKoIn0/jAj/TkMzfzndDv5+zi2Mhgc=
-github.com/aws/aws-sdk-go-v2/service/sso v1.22.1/go.mod h1:/vWdhoIoYA5hYoPZ6fm7Sv4d8701PiG5VKe8/pPJL60=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 h1:lCEv9f8f+zJ8kcFeAjRZsekLd/x5SAm96Cva+VbUdo8=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4=
-github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 h1:+woJ607dllHJQtsnJLi52ycuqHMwlW+Wqm2Ppsfp4nQ=
-github.com/aws/aws-sdk-go-v2/service/sts v1.30.1/go.mod h1:jiNR3JqT15Dm+QWq2SRgh0x0bCNSRP2L25+CqPNpJlQ=
+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/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
@@ -90,19 +89,19 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
-github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
+github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
+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/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+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-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.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4=
-github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+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/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=
@@ -129,13 +128,15 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo=
 github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8=
-github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 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=
@@ -147,8 +148,8 @@ 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/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA=
-github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E=
+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=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
@@ -160,8 +161,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 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/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -194,8 +193,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/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.16 h1:NMpz8s4ASqWGuxzfcpIax1z0WwRzGTSkNjTaisBG5Eo=
-github.com/pocketbase/pocketbase v0.22.16/go.mod h1:tsEEQ2xXydNUeDUDkgSQDBlIuF0gkhE2tcYZThLCSHg=
+github.com/pocketbase/pocketbase v0.22.18 h1:yVckUhi5GDORqCb0BbtlvRB1CVxHY9HO9btEaeZHVJU=
+github.com/pocketbase/pocketbase v0.22.18/go.mod h1:0QFvDOOW7ANId78ChZSagyHbmP6CgMxDQrQFXzeaDpA=
 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=
@@ -222,8 +221,9 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 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/ulikunitz/xz v0.5.9 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I=
 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/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
@@ -231,24 +231,24 @@ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
-go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
-go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
-go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
-go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
-go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
-go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
-gocloud.dev v0.37.0 h1:XF1rN6R0qZI/9DYjN16Uy0durAmSlf58DHOcb28GPro=
-gocloud.dev v0.37.0/go.mod h1:7/O4kqdInCNsc6LqgmuFnS0GRew4XNNYWpA44yQnwco=
+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=
 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.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
-golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 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=
@@ -257,8 +257,8 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk
 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.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+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/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,8 +270,8 @@ 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.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+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.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
@@ -295,13 +295,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 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.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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/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.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+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/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=
@@ -319,14 +319,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.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+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/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-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
-golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
-google.golang.org/api v0.187.0 h1:Mxs7VATVC2v7CY+7Xwm4ndkX71hpElcvx0D1Ji/p1eo=
-google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SBp2gk=
+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=
 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,12 +334,12 @@ 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-20240624140628-dc46fd24d27d h1:PksQg4dV6Sem3/HkBX+Ltq8T0ke0PKIRBNBatoDTVls=
-google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M=
-google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3 h1:QW9+G6Fir4VcRXVH8x3LilNAb6cxBGLa6+GM4hRwexE=
-google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3/go.mod h1:kdrSS/OiLkPrNUpzD4aHgCq2rVuC/YRxok32HXZ4vRE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
+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/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=
@@ -371,18 +371,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-modernc.org/cc/v4 v4.21.2 h1:dycHFB/jDc3IyacKipCNSDrjIC0Lm1hyoWOZTRR20Lk=
-modernc.org/cc/v4 v4.21.2/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
-modernc.org/ccgo/v4 v4.17.10 h1:6wrtRozgrhCxieCeJh85QsxkX/2FFrT9hdaWPlbn4Zo=
-modernc.org/ccgo/v4 v4.17.10/go.mod h1:0NBHgsqTTpm9cA5z2ccErvGZmtntSM9qD2kFAs6pjXM=
+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/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
-modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
-modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b h1:BnN1t+pb1cy61zbvSUV7SeI0PwosMhlAEi/vBY4qxp8=
-modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.52.1 h1:uau0VoiT5hnR+SpoWekCKbLqm7v6dhRL3hI+NQhgN3M=
-modernc.org/libc v1.52.1/go.mod h1:HR4nVzFDSDizP620zcMCgjb1/8xk2lg5p/8yjfGv1IQ=
+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/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 +391,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.30.1 h1:YFhPVfu2iIgUf9kuA1CR7iiHdcEEsI2i+yjRYHscyxk=
-modernc.org/sqlite v1.30.1/go.mod h1:DUmsiWQDaAvU4abhc/N+djlom/L2o8f7gZ95RCvyoLU=
+modernc.org/sqlite v1.31.1 h1:XVU0VyzxrYHlBhIs1DiEgSl0ZtdnPtbLVy8hSkzxGrs=
+modernc.org/sqlite v1.31.1/go.mod h1:UqoylwmTb9F+IqXERT8bW9zzOWN8qwAIcLdzeBZs4hA=
 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=

hub/main.go

@@ -15,10 +15,10 @@ import (
 	"net/url"
 	"os"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/labstack/echo/v5"
-	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
@@ -29,10 +29,11 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
-var Version = "0.0.1-alpha.6"
+var Version = "0.1.2"
 
 var app *pocketbase.PocketBase
-var serverConnections = make(map[string]Server)
+var serverConnections = make(map[string]*Server)
+var serverConnectionsLock = sync.Mutex{}
 
 func main() {
 	app = pocketbase.NewWithConfig(pocketbase.Config{
@@ -103,16 +104,12 @@ func main() {
 		// cron job to delete old records
 		scheduler := cron.New()
 		scheduler.MustAdd("delete old records", "8 * * * *", func() {
-			deleteOldRecords("system_stats", "1m", time.Hour)
-			deleteOldRecords("container_stats", "1m", time.Hour)
-			deleteOldRecords("system_stats", "10m", 12*time.Hour)
-			deleteOldRecords("container_stats", "10m", 12*time.Hour)
-			deleteOldRecords("system_stats", "20m", 24*time.Hour)
-			deleteOldRecords("container_stats", "20m", 24*time.Hour)
-			deleteOldRecords("system_stats", "120m", 7*24*time.Hour)
-			deleteOldRecords("container_stats", "120m", 7*24*time.Hour)
-			deleteOldRecords("system_stats", "480m", 30*24*time.Hour)
-			deleteOldRecords("container_stats", "480m", 30*24*time.Hour)
+			collections := []string{"system_stats", "container_stats"}
+			deleteOldRecords(collections, "1m", time.Hour)
+			deleteOldRecords(collections, "10m", 12*time.Hour)
+			deleteOldRecords(collections, "20m", 24*time.Hour)
+			deleteOldRecords(collections, "120m", 7*24*time.Hour)
+			deleteOldRecords(collections, "480m", 30*24*time.Hour)
 		})
 		scheduler.Start()
 		return nil
@@ -150,6 +147,23 @@ func main() {
 		return nil
 	})
 
+	// user creation - set default role to user if unset
+	app.OnModelBeforeCreate("users").Add(func(e *core.ModelEvent) error {
+		user := e.Model.(*models.Record)
+		if user.GetString("role") == "" {
+			user.Set("role", "user")
+		}
+		return nil
+	})
+
+	// system creation defaults
+	app.OnModelBeforeCreate("systems").Add(func(e *core.ModelEvent) error {
+		record := e.Model.(*models.Record)
+		record.Set("info", SystemInfo{})
+		record.Set("status", "pending")
+		return nil
+	})
+
 	// immediately create connection for new servers
 	app.OnModelAfterCreate("systems").Add(func(e *core.ModelEvent) error {
 		go updateSystem(e.Model.(*models.Record))
@@ -160,7 +174,7 @@ func main() {
 	app.OnModelAfterUpdate("systems").Add(func(e *core.ModelEvent) error {
 		newRecord := e.Model.(*models.Record)
 		oldRecord := newRecord.OriginalCopy()
-		newStatus := newRecord.Get("status").(string)
+		newStatus := newRecord.GetString("status")
 
 		// if server is disconnected and connection exists, remove it
 		if newStatus == "down" || newStatus == "paused" {
@@ -207,49 +221,59 @@ func startSystemUpdateTicker() {
 }
 
 func updateSystems() {
-	// handle max of 1/3 + 1 servers at a time
-	numServers := len(serverConnections)/3 + 1
-	// find systems that are not paused and updated more than 58 seconds ago
-	fiftyEightSecondsAgo := time.Now().UTC().Add(-58 * time.Second).Format("2006-01-02 15:04:05")
 	records, err := app.Dao().FindRecordsByFilter(
-		"2hz5ncl8tizk5nx", // collection
-		"status != 'paused' && updated < {:updated}", // filter
-		"updated",  // sort
-		numServers, // limit
-		0,          // offset
-		dbx.Params{"updated": fiftyEightSecondsAgo},
+		"2hz5ncl8tizk5nx",    // collection
+		"status != 'paused'", // filter
+		"updated",            // sort
+		-1,                   // limit
+		0,                    // offset
 	)
-	if err != nil {
-		app.Logger().Error("Failed to query systems: ", "err", err.Error())
+	// log.Println("records", len(records))
+	if err != nil || len(records) == 0 {
+		// 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 {
-		updateSystem(record)
+		// 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 updateSystem(record)
 	}
 }
 
 func updateSystem(record *models.Record) {
-	var server Server
+	var server *Server
 	// check if server connection data exists
 	if _, ok := serverConnections[record.Id]; ok {
 		server = serverConnections[record.Id]
 	} else {
 		// create server connection struct
-		server = Server{
-			Host: record.Get("host").(string),
-			Port: record.Get("port").(string),
+		server = &Server{
+			Host: record.GetString("host"),
+			Port: record.GetString("port"),
 		}
-		client, err := getServerConnection(&server)
+		client, err := getServerConnection(server)
 		if err != nil {
 			app.Logger().Error("Failed to connect:", "err", err.Error(), "server", server.Host, "port", server.Port)
 			updateServerStatus(record, "down")
 			return
 		}
 		server.Client = client
+		serverConnectionsLock.Lock()
 		serverConnections[record.Id] = server
+		serverConnectionsLock.Unlock()
 	}
 	// get server stats from agent
-	systemData, err := requestJson(&server)
+	systemData, err := requestJson(server)
 	if err != nil {
 		if err.Error() == "retry" {
 			// if previous connection was closed, try again
@@ -297,7 +321,7 @@ func updateServerStatus(record *models.Record, status string) {
 	// if status == "down" || status == "paused" {
 	// 	deleteServerConnection(record)
 	// }
-	if record.Get("status") != status {
+	if record.GetString("status") != status {
 		record.Set("status", status)
 		if err := app.Dao().SaveRecord(record); err != nil {
 			app.Logger().Error("Failed to update record: ", "err", err.Error())
@@ -310,6 +334,8 @@ func deleteServerConnection(record *models.Record) {
 		if serverConnections[record.Id].Client != nil {
 			serverConnections[record.Id].Client.Close()
 		}
+		serverConnectionsLock.Lock()
+		defer serverConnectionsLock.Unlock()
 		delete(serverConnections, record.Id)
 	}
 }
@@ -321,7 +347,6 @@ func getServerConnection(server *Server) (*ssh.Client, error) {
 		app.Logger().Error("Failed to get SSH key: ", "err", err.Error())
 		return nil, err
 	}
-	time.Sleep(time.Second)
 
 	// Create the Signer for this private key.
 	signer, err := ssh.ParsePrivateKey(key)

hub/migrations/1722186612_collections_snapshot.go

@@ -15,7 +15,7 @@ func init() {
 			{
 				"id": "2hz5ncl8tizk5nx",
 				"created": "2024-07-07 16:08:20.979Z",
-				"updated": "2024-07-22 19:39:17.434Z",
+				"updated": "2024-07-28 17:00:47.996Z",
 				"name": "systems",
 				"type": "base",
 				"system": false,
@@ -39,7 +39,7 @@ func init() {
 						"id": "waj7seaf",
 						"name": "status",
 						"type": "select",
-						"required": true,
+						"required": false,
 						"presentable": false,
 						"unique": false,
 						"options": {
@@ -85,7 +85,7 @@ func init() {
 						"id": "qoq64ntl",
 						"name": "info",
 						"type": "json",
-						"required": true,
+						"required": false,
 						"presentable": false,
 						"unique": false,
 						"options": {
@@ -120,7 +120,7 @@ func init() {
 			{
 				"id": "ej9oowivz8b2mht",
 				"created": "2024-07-07 16:09:09.179Z",
-				"updated": "2024-07-18 15:56:45.302Z",
+				"updated": "2024-07-22 20:13:31.324Z",
 				"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-18 15:57:50.933Z",
+				"updated": "2024-07-22 20:13:31.324Z",
 				"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-22 20:10:20.670Z",
+				"updated": "2024-07-28 17:02:08.311Z",
 				"name": "users",
 				"type": "auth",
 				"system": false,
@@ -260,7 +260,7 @@ func init() {
 						"id": "qkbp58ae",
 						"name": "role",
 						"type": "select",
-						"required": true,
+						"required": false,
 						"presentable": false,
 						"unique": false,
 						"options": {
@@ -316,7 +316,7 @@ func init() {
 			{
 				"id": "elngm8x1l60zi2v",
 				"created": "2024-07-15 01:16:04.044Z",
-				"updated": "2024-07-22 19:13:16.498Z",
+				"updated": "2024-07-22 20:13:31.324Z",
 				"name": "alerts",
 				"type": "base",
 				"system": false,

hub/records.go

@@ -1,21 +1,19 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
-	"log"
 	"math"
 	"reflect"
 	"time"
 
 	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/daos"
 	"github.com/pocketbase/pocketbase/models"
-	"github.com/pocketbase/pocketbase/tools/types"
 )
 
 func createLongerRecords(collectionName string, shorterRecord *models.Record) {
-	shorterRecordType := shorterRecord.Get("type").(string)
-	systemId := shorterRecord.Get("system").(string)
+	shorterRecordType := shorterRecord.GetString("type")
+	systemId := shorterRecord.GetString("system")
 	// fmt.Println("create longer records", "recordType", shorterRecordType, "systemId", systemId)
 	var longerRecordType string
 	var timeAgo time.Duration
@@ -75,11 +73,11 @@ func createLongerRecords(collectionName string, shorterRecord *models.Record) {
 		stats = averageContainerStats(allShorterRecords)
 	}
 	collection, _ := app.Dao().FindCollectionByNameOrId(collectionName)
-	tenMinRecord := models.NewRecord(collection)
-	tenMinRecord.Set("system", systemId)
-	tenMinRecord.Set("stats", stats)
-	tenMinRecord.Set("type", longerRecordType)
-	if err := app.Dao().SaveRecord(tenMinRecord); err != nil {
+	longerRecord := models.NewRecord(collection)
+	longerRecord.Set("system", systemId)
+	longerRecord.Set("stats", stats)
+	longerRecord.Set("type", longerRecordType)
+	if err := app.Dao().SaveRecord(longerRecord); err != nil {
 		fmt.Println("failed to save longer record", "err", err.Error())
 	}
 
@@ -92,7 +90,7 @@ func averageSystemStats(records []*models.Record) SystemStats {
 
 	for _, record := range records {
 		var stats SystemStats
-		json.Unmarshal([]byte(record.Get("stats").(types.JsonRaw)), &stats)
+		record.UnmarshalJSONField("stats", &stats)
 		statValue := reflect.ValueOf(stats)
 		for i := 0; i < statValue.NumField(); i++ {
 			field := sum.Field(i)
@@ -114,20 +112,24 @@ func averageContainerStats(records []*models.Record) (stats []ContainerStats) {
 	count := float64(len(records))
 	for _, record := range records {
 		var stats []ContainerStats
-		json.Unmarshal([]byte(record.Get("stats").(types.JsonRaw)), &stats)
+		record.UnmarshalJSONField("stats", &stats)
 		for _, stat := range stats {
 			if _, ok := sums[stat.Name]; !ok {
 				sums[stat.Name] = &ContainerStats{Name: stat.Name, Cpu: 0, Mem: 0}
 			}
 			sums[stat.Name].Cpu += stat.Cpu
 			sums[stat.Name].Mem += stat.Mem
+			sums[stat.Name].NetworkSent += stat.NetworkSent
+			sums[stat.Name].NetworkRecv += stat.NetworkRecv
 		}
 	}
 	for _, value := range sums {
 		stats = append(stats, ContainerStats{
-			Name: value.Name,
-			Cpu:  twoDecimals(value.Cpu / count),
-			Mem:  twoDecimals(value.Mem / count),
+			Name:        value.Name,
+			Cpu:         twoDecimals(value.Cpu / count),
+			Mem:         twoDecimals(value.Mem / count),
+			NetworkSent: twoDecimals(value.NetworkSent / count),
+			NetworkRecv: twoDecimals(value.NetworkRecv / count),
 		})
 	}
 	return stats
@@ -138,16 +140,28 @@ func twoDecimals(value float64) float64 {
 	return math.Round(value*100) / 100
 }
 
-/* Delete records of specified collection and type that are older than timeLimit */
-func deleteOldRecords(collection string, recordType string, timeLimit time.Duration) {
+/* Delete records of specified collections and type that are older than timeLimit */
+func deleteOldRecords(collections []string, recordType string, timeLimit time.Duration) {
 	timeLimitStamp := time.Now().UTC().Add(-timeLimit).Format("2006-01-02 15:04:05")
-	records, _ := app.Dao().FindRecordsByExpr(collection,
-		dbx.NewExp("type = {:type}", dbx.Params{"type": recordType}),
-		dbx.NewExp("created < {:created}", dbx.Params{"created": timeLimitStamp}),
-	)
-	for _, record := range records {
-		if err := app.Dao().DeleteRecord(record); err != nil {
-			log.Fatal(err)
+
+	// db query
+	expType := dbx.NewExp("type = {:type}", dbx.Params{"type": recordType})
+	expCreated := dbx.NewExp("created < {:created}", dbx.Params{"created": timeLimitStamp})
+
+	var records []*models.Record
+	for _, collection := range collections {
+		if collectionRecords, err := app.Dao().FindRecordsByExpr(collection, expType, expCreated); err == nil {
+			records = append(records, collectionRecords...)
 		}
 	}
+
+	app.Dao().RunInTransaction(func(txDao *daos.Dao) error {
+		for _, record := range records {
+			err := txDao.DeleteRecord(record)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	})
 }

hub/site/package.json

@@ -1,52 +1,53 @@
 {
-  "name": "site",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@nanostores/react": "^0.7.2",
-    "@nanostores/router": "^0.15.0",
-    "@radix-ui/react-alert-dialog": "^1.1.1",
-    "@radix-ui/react-dialog": "^1.1.1",
-    "@radix-ui/react-dropdown-menu": "^2.1.1",
-    "@radix-ui/react-label": "^2.1.0",
-    "@radix-ui/react-select": "^2.1.1",
-    "@radix-ui/react-separator": "^1.1.0",
-    "@radix-ui/react-slider": "^1.2.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@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.19.2",
-    "@vitejs/plugin-react": "^4.3.1",
-    "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.1",
-    "cmdk": "^1.0.0",
-    "d3-scale": "^4.0.2",
-    "d3-time": "^3.1.0",
-    "lucide-react": "^0.407.0",
-    "nanostores": "^0.10.3",
-    "pocketbase": "^0.21.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "recharts": "^2.13.0-alpha.1",
-    "tailwind-merge": "^2.4.0",
-    "tailwindcss-animate": "^1.0.7",
-    "valibot": "^0.36.0"
-  },
-  "devDependencies": {
-    "@types/bun": "^1.1.6",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
-    "autoprefixer": "^10.4.19",
-    "postcss": "^8.4.39",
-    "tailwindcss": "^3.4.4",
-    "typescript": "^5.5.3",
-    "vite": "^5.3.3"
-  }
+	"name": "site",
+	"private": true,
+	"version": "0.0.0",
+	"type": "module",
+	"scripts": {
+		"dev": "vite",
+		"build": "vite build",
+		"preview": "vite preview"
+	},
+	"dependencies": {
+		"@nanostores/react": "^0.7.3",
+		"@nanostores/router": "^0.15.1",
+		"@radix-ui/react-alert-dialog": "^1.1.1",
+		"@radix-ui/react-dialog": "^1.1.1",
+		"@radix-ui/react-dropdown-menu": "^2.1.1",
+		"@radix-ui/react-label": "^2.1.0",
+		"@radix-ui/react-select": "^2.1.1",
+		"@radix-ui/react-separator": "^1.1.0",
+		"@radix-ui/react-slider": "^1.2.0",
+		"@radix-ui/react-slot": "^1.1.0",
+		"@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",
+		"class-variance-authority": "^0.7.0",
+		"clsx": "^2.1.1",
+		"cmdk": "^1.0.0",
+		"d3-scale": "^4.0.2",
+		"d3-time": "^3.1.0",
+		"lucide-react": "^0.407.0",
+		"nanostores": "^0.10.3",
+		"pocketbase": "^0.21.4",
+		"react": "^18.3.1",
+		"react-dom": "^18.3.1",
+		"recharts": "^2.13.0-alpha.4",
+		"tailwind-merge": "^2.4.0",
+		"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/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"
+	}
 }

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

@@ -17,7 +17,6 @@ import { Copy, Plus } from 'lucide-react'
 import { useState, useRef, MutableRefObject, useEffect } from 'react'
 import { useStore } from '@nanostores/react'
 import { copyToClipboard } from '@/lib/utils'
-import { SystemStats } from '@/types'
 
 export function AddSystemButton() {
 	const [open, setOpen] = useState(false)
@@ -32,7 +31,7 @@ export function AddSystemButton() {
     restart: unless-stopped
     network_mode: host
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       PORT: ${port}
       KEY: "${publicKey}"
@@ -53,20 +52,7 @@ export function AddSystemButton() {
 		e.preventDefault()
 		const formData = new FormData(e.target as HTMLFormElement)
 		const data = Object.fromEntries(formData) as Record<string, any>
-		data.status = 'pending'
 		data.users = pb.authStore.model!.id
-		data.info = {
-			cpu: 0,
-			m: 0,
-			mu: 0,
-			mp: 0,
-			mb: 0,
-			d: 0,
-			du: 0,
-			dp: 0,
-			dr: 0,
-			dw: 0,
-		} as SystemStats
 		try {
 			setOpen(false)
 			await pb.collection('systems').create(data)
@@ -88,7 +74,7 @@ export function AddSystemButton() {
 				<DialogHeader>
 					<DialogTitle className="mb-2">Add New System</DialogTitle>
 					<DialogDescription>
-						The agent must be running on the server to connect. Copy the{' '}
+						The agent must be running on the system to connect. Copy the{' '}
 						<code className="bg-muted px-1 rounded-sm">docker-compose.yml</code> for the agent
 						below.
 					</DialogDescription>

hub/site/src/components/charts/bandwidth-chart.tsx

@@ -1,97 +1,105 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
 
+import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
 import {
-	ChartConfig,
-	ChartContainer,
-	ChartTooltip,
-	ChartTooltipContent,
-} from '@/components/ui/chart'
-import { formatShortDate, hourWithMinutes } from '@/lib/utils'
-import Spinner from '../spinner'
-
-const chartConfig = {
-	recv: {
-		label: 'Received',
-		color: 'hsl(var(--chart-2))',
-	},
-	sent: {
-		label: 'Sent',
-		color: 'hsl(var(--chart-5))',
-	},
-} satisfies ChartConfig
+	chartTimeData,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	useYaxisWidth,
+} 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({
-	chartData,
 	ticks,
+	systemData,
 }: {
-	chartData: { time: number; sent: number; recv: number }[]
 	ticks: number[]
+	systemData: SystemStatsRecord[]
 }) {
-	if (!chartData.length || !ticks.length) {
-		return <Spinner />
-	}
+	const chartRef = useRef<HTMLDivElement>(null)
+	const yAxisWidth = useYaxisWidth(chartRef)
+	const chartTime = useStore($chartTime)
+
+	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
 
 	return (
-		<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
-			<AreaChart
-				accessibilityLayer
-				data={chartData}
-				margin={{
-					left: 0,
-					right: 0,
-					top: 10,
-					bottom: 0,
-				}}
+		<div ref={chartRef}>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
 			>
-				<CartesianGrid vertical={false} />
-				<YAxis
-					className="tracking-tighter"
-					width={75}
-					domain={[0, (max: number) => (max < 0.4 ? 0.4 : Math.ceil(max))]}
-					tickLine={false}
-					axisLine={false}
-					unit={' MB/s'}
-				/>
-				{/* todo: short time if first date is same day, otherwise short date */}
-				<XAxis
-					dataKey="time"
-					domain={[ticks[0], ticks.at(-1)!]}
-					ticks={ticks}
-					type="number"
-					scale={'time'}
-					tickLine={true}
-					axisLine={false}
-					tickMargin={8}
-					minTickGap={30}
-					tickFormatter={hourWithMinutes}
-				/>
-				<ChartTooltip
-					// cursor={false}
-					content={
-						<ChartTooltipContent
-							unit=" MB/s"
-							labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
-							indicator="line"
-						/>
-					}
-				/>
-				<Area
-					dataKey="sent"
-					type="monotoneX"
-					fill="var(--color-sent)"
-					fillOpacity={0.4}
-					stroke="var(--color-sent)"
-					animationDuration={1200}
-				/>
-				<Area
-					dataKey="recv"
-					type="monotoneX"
-					fill="var(--color-recv)"
-					fillOpacity={0.4}
-					stroke="var(--color-recv)"
-					animationDuration={1200}
-				/>
-			</AreaChart>
-		</ChartContainer>
+				<AreaChart
+					accessibilityLayer
+					data={systemData}
+					margin={{
+						left: 0,
+						right: 0,
+						top: 10,
+						bottom: 0,
+					}}
+				>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						width={yAxisWidth}
+						// domain={[0, (max: number) => (max <= 0.4 ? 0.4 : Math.ceil(max))]}
+						tickFormatter={(value) => toFixedWithoutTrailingZeros(value, 2)}
+						tickLine={false}
+						axisLine={false}
+						unit={' MB/s'}
+					/>
+					<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}
+						content={
+							<ChartTooltipContent
+								unit=" MB/s"
+								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								indicator="line"
+							/>
+						}
+					/>
+					<Area
+						dataKey="stats.ns"
+						name="Sent"
+						type="monotoneX"
+						fill="hsl(var(--chart-5))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-5))"
+						// animationDuration={1200}
+						isAnimationActive={false}
+					/>
+					<Area
+						dataKey="stats.nr"
+						name="Received"
+						type="monotoneX"
+						fill="hsl(var(--chart-2))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-2))"
+						// animationDuration={1200}
+						isAnimationActive={false}
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</div>
 	)
 }

hub/site/src/components/charts/container-cpu-chart.tsx

@@ -1,5 +1,3 @@
-'use client'
-
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
 import {
 	ChartConfig,
@@ -7,9 +5,11 @@ import {
 	ChartTooltip,
 	ChartTooltipContent,
 } from '@/components/ui/chart'
-import { useMemo } from 'react'
-import { formatShortDate, hourWithMinutes } from '@/lib/utils'
-import Spinner from '../spinner'
+import { useMemo, useRef } from 'react'
+import { chartTimeData, cn, formatShortDate, useYaxisWidth } from '@/lib/utils'
+// import Spinner from '../spinner'
+import { useStore } from '@nanostores/react'
+import { $chartTime } from '@/lib/stores'
 
 export default function ContainerCpuChart({
 	chartData,
@@ -18,6 +18,12 @@ 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 chartConfig = useMemo(() => {
 		let config = {} as Record<
 			string,
@@ -53,65 +59,74 @@ export default function ContainerCpuChart({
 		return config satisfies ChartConfig
 	}, [chartData])
 
-	if (!chartData.length || !ticks.length) {
-		return <Spinner />
-	}
+	// if (!chartData.length || !ticks.length) {
+	// 	return <Spinner />
+	// }
 
 	return (
-		<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
-			<AreaChart
-				accessibilityLayer
-				data={chartData}
-				margin={{
-					top: 10,
-				}}
-				reverseStackOrder={true}
+		<div ref={chartRef}>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
 			>
-				<CartesianGrid vertical={false} />
-				<YAxis
-					domain={[0, (max: number) => Math.max(Math.ceil(max), 0.4)]}
-					width={47}
-					tickLine={false}
-					axisLine={false}
-					unit={'%'}
-					tickFormatter={(x) => (x % 1 === 0 ? x : x.toFixed(1))}
-				/>
-				<XAxis
-					dataKey="time"
-					domain={[ticks[0], ticks.at(-1)!]}
-					ticks={ticks}
-					type="number"
-					scale={'time'}
-					tickLine={true}
-					axisLine={false}
-					tickMargin={8}
-					minTickGap={30}
-					tickFormatter={hourWithMinutes}
-				/>
-				<ChartTooltip
-					// cursor={false}
-					animationEasing="ease-out"
-					animationDuration={150}
-					labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
-					// @ts-ignore
-					itemSorter={(a, b) => b.value - a.value}
-					content={<ChartTooltipContent unit="%" indicator="line" />}
-				/>
-				{Object.keys(chartConfig).map((key) => (
-					<Area
-						key={key}
-						// isAnimationActive={chartData.length < 20}
-						animateNewValues={false}
-						animationDuration={1200}
-						dataKey={key}
-						type="monotoneX"
-						fill={chartConfig[key].color}
-						fillOpacity={0.4}
-						stroke={chartConfig[key].color}
-						stackId="a"
+				<AreaChart
+					accessibilityLayer
+					data={chartData}
+					margin={{
+						top: 10,
+					}}
+					reverseStackOrder={true}
+				>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						// domain={[0, (max: number) => Math.max(Math.ceil(max), 0.4)]}
+						width={yAxisWidth}
+						tickLine={false}
+						axisLine={false}
+						unit={'%'}
+						tickFormatter={(x) => (x % 1 === 0 ? x : x.toFixed(1))}
 					/>
-				))}
-			</AreaChart>
-		</ChartContainer>
+					<XAxis
+						dataKey="time"
+						domain={[ticks[0], ticks.at(-1)!]}
+						ticks={ticks}
+						type="number"
+						scale={'time'}
+						minTickGap={35}
+						tickMargin={8}
+						axisLine={false}
+						tickFormatter={chartTimeData[chartTime].format}
+					/>
+					<ChartTooltip
+						// cursor={false}
+						animationEasing="ease-out"
+						animationDuration={150}
+						labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
+						// @ts-ignore
+						itemSorter={(a, b) => b.value - a.value}
+						content={<ChartTooltipContent unit="%" 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"
+						/>
+					))}
+				</AreaChart>
+			</ChartContainer>
+		</div>
 	)
 }

hub/site/src/components/charts/container-mem-chart.tsx

@@ -1,5 +1,3 @@
-'use client'
-
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
 import {
 	ChartConfig,
@@ -7,9 +5,17 @@ import {
 	ChartTooltip,
 	ChartTooltipContent,
 } from '@/components/ui/chart'
-import { useMemo } from 'react'
-import { formatShortDate, hourWithMinutes } from '@/lib/utils'
-import Spinner from '../spinner'
+import { useMemo, useRef } from 'react'
+import {
+	chartTimeData,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	useYaxisWidth,
+} from '@/lib/utils'
+// import Spinner from '../spinner'
+import { useStore } from '@nanostores/react'
+import { $chartTime } from '@/lib/stores'
 
 export default function ContainerMemChart({
 	chartData,
@@ -18,6 +24,12 @@ export default function ContainerMemChart({
 	chartData: Record<string, number | string>[]
 	ticks: number[]
 }) {
+	const chartTime = useStore($chartTime)
+	const chartRef = useRef<HTMLDivElement>(null)
+	const yAxisWidth = useYaxisWidth(chartRef)
+
+	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+
 	const chartConfig = useMemo(() => {
 		let config = {} as Record<
 			string,
@@ -53,70 +65,72 @@ export default function ContainerMemChart({
 		return config satisfies ChartConfig
 	}, [chartData])
 
-	if (!chartData.length || !ticks.length) {
-		return <Spinner />
-	}
+	// if (!chartData.length || !ticks.length) {
+	// 	return <Spinner />
+	// }
 
 	return (
-		<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
-			<AreaChart
-				accessibilityLayer
-				data={chartData}
-				reverseStackOrder={true}
-				margin={{
-					top: 10,
-				}}
-
-				// reverseStackOrder={true}
+		<div ref={chartRef}>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
 			>
-				<CartesianGrid vertical={false} />
-				<YAxis
-					// domain={[0, (max: number) => Math.ceil(max)]}
-					tickLine={false}
-					axisLine={false}
-					unit={' GB'}
-					width={70}
-					tickFormatter={(value) => {
-						value = value / 1024
-						return value.toFixed((value * 100) % 1 === 0 ? 1 : 2)
+				<AreaChart
+					accessibilityLayer
+					data={chartData}
+					reverseStackOrder={true}
+					margin={{
+						top: 10,
 					}}
-				/>
-				<XAxis
-					dataKey="time"
-					domain={[ticks[0], ticks.at(-1)!]}
-					ticks={ticks}
-					type="number"
-					scale={'time'}
-					tickLine={true}
-					axisLine={false}
-					tickMargin={8}
-					minTickGap={30}
-					tickFormatter={hourWithMinutes}
-				/>
-				<ChartTooltip
-					// cursor={false}
-					animationEasing="ease-out"
-					animationDuration={150}
-					labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
-					// @ts-ignore
-					itemSorter={(a, b) => b.value - a.value}
-					content={<ChartTooltipContent unit=" MiB" indicator="line" />}
-				/>
-				{Object.keys(chartConfig).map((key) => (
-					<Area
-						key={key}
-						isAnimationActive={chartData.length < 20}
-						animateNewValues={false}
-						animationDuration={1200}
-						dataKey={key}
-						type="monotoneX"
-						fill={chartConfig[key].color}
-						fillOpacity={0.4}
-						stroke={chartConfig[key].color}
-						stackId="a"
+				>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						// domain={[0, (max: number) => Math.ceil(max)]}
+						tickLine={false}
+						axisLine={false}
+						unit={' GB'}
+						width={yAxisWidth}
+						tickFormatter={(value) => toFixedWithoutTrailingZeros(value / 1024, 2)}
 					/>
-				))}
-			</AreaChart>
-		</ChartContainer>
+					<XAxis
+						dataKey="time"
+						domain={[ticks[0], ticks.at(-1)!]}
+						ticks={ticks}
+						type="number"
+						scale={'time'}
+						minTickGap={35}
+						tickMargin={8}
+						axisLine={false}
+						tickFormatter={chartTimeData[chartTime].format}
+					/>
+					<ChartTooltip
+						// cursor={false}
+						animationEasing="ease-out"
+						animationDuration={150}
+						labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
+						// @ts-ignore
+						itemSorter={(a, b) => b.value - a.value}
+						content={<ChartTooltipContent unit=" 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"
+						/>
+					))}
+				</AreaChart>
+			</ChartContainer>
+		</div>
 	)
 }

hub/site/src/components/charts/container-net-chart.tsx

@@ -0,0 +1,157 @@
+import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
+import {
+	ChartConfig,
+	ChartContainer,
+	ChartTooltip,
+	ChartTooltipContent,
+} from '@/components/ui/chart'
+import { useMemo, useRef } from 'react'
+import {
+	chartTimeData,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	useYaxisWidth,
+} from '@/lib/utils'
+// import Spinner from '../spinner'
+import { useStore } from '@nanostores/react'
+import { $chartTime } from '@/lib/stores'
+import { Separator } from '@/components/ui/separator'
+
+export default function ContainerCpuChart({
+	chartData,
+	ticks,
+}: {
+	chartData: Record<string, number | number[]>[]
+	ticks: number[]
+}) {
+	const chartTime = useStore($chartTime)
+	const chartRef = useRef<HTMLDivElement>(null)
+	const yAxisWidth = useYaxisWidth(chartRef)
+
+	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+
+	const chartConfig = useMemo(() => {
+		let config = {} as Record<
+			string,
+			{
+				label: string
+				color: string
+			}
+		>
+		const totalUsage = {} as Record<string, number>
+		for (let stats of chartData) {
+			for (let key in stats) {
+				if (!Array.isArray(stats[key])) {
+					continue
+				}
+				if (!(key in totalUsage)) {
+					totalUsage[key] = 0
+				}
+				totalUsage[key] += stats[key][2] ?? 0
+			}
+		}
+		let keys = Object.keys(totalUsage)
+		keys.sort((a, b) => (totalUsage[a] > totalUsage[b] ? -1 : 1))
+		const length = keys.length
+		for (let i = 0; i < length; i++) {
+			const key = keys[i]
+			const hue = ((i * 360) / length) % 360
+			config[key] = {
+				label: key,
+				color: `hsl(${hue}, 60%, 55%)`,
+			}
+		}
+		return config satisfies ChartConfig
+	}, [chartData])
+
+	// if (!chartData.length || !ticks.length) {
+	// 	return <Spinner />
+	// }
+
+	return (
+		<div ref={chartRef}>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
+			>
+				<AreaChart
+					accessibilityLayer
+					data={chartData}
+					margin={{
+						top: 10,
+					}}
+					reverseStackOrder={true}
+				>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						// domain={[0, (max: number) => Math.max(Math.ceil(max), 0.4)]}
+						width={yAxisWidth}
+						tickLine={false}
+						axisLine={false}
+						unit={' MB/s'}
+						tickFormatter={(value) => toFixedWithoutTrailingZeros(value, 2)}
+					/>
+					<XAxis
+						dataKey="time"
+						domain={[ticks[0], ticks.at(-1)!]}
+						ticks={ticks}
+						type="number"
+						scale={'time'}
+						minTickGap={35}
+						tickMargin={8}
+						axisLine={false}
+						tickFormatter={chartTimeData[chartTime].format}
+					/>
+					<ChartTooltip
+						// cursor={false}
+						animationEasing="ease-out"
+						animationDuration={150}
+						labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
+						// @ts-ignore
+						itemSorter={(a, b) => b.value - a.value}
+						content={
+							<ChartTooltipContent
+								indicator="line"
+								contentFormatter={(item, key) => {
+									try {
+										const sent = item?.payload?.[key][0] ?? 0
+										const received = item?.payload?.[key][1] ?? 0
+										return (
+											<span className="flex">
+												{received.toLocaleString()} 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>
+											</span>
+										)
+									} catch (e) {
+										return null
+									}
+								}}
+							/>
+						}
+					/>
+					{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"
+						/>
+					))}
+				</AreaChart>
+			</ChartContainer>
+		</div>
+	)
+}

hub/site/src/components/charts/cpu-chart.tsx

@@ -1,81 +1,80 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
 
-import {
-	ChartConfig,
-	ChartContainer,
-	ChartTooltip,
-	ChartTooltipContent,
-} from '@/components/ui/chart'
-import { chartTimeData, formatShortDate } from '@/lib/utils'
-import Spinner from '../spinner'
+import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
+import { chartTimeData, cn, formatShortDate, useYaxisWidth } from '@/lib/utils'
+// import Spinner from '../spinner'
 import { useStore } from '@nanostores/react'
 import { $chartTime } from '@/lib/stores'
-
-const chartConfig = {
-	cpu: {
-		label: 'CPU Usage',
-		color: 'hsl(var(--chart-1))',
-	},
-} satisfies ChartConfig
+import { SystemStatsRecord } from '@/types'
+import { useMemo, useRef } from 'react'
 
 export default function CpuChart({
-	chartData,
 	ticks,
+	systemData,
 }: {
-	chartData: { time: number; cpu: number }[]
 	ticks: number[]
+	systemData: SystemStatsRecord[]
 }) {
 	const chartTime = useStore($chartTime)
+	const chartRef = useRef<HTMLDivElement>(null)
+	const yAxisWidth = useYaxisWidth(chartRef)
 
-	if (!chartData.length || !ticks.length) {
-		return <Spinner />
-	}
+	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
 
 	return (
-		<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
-			<AreaChart accessibilityLayer data={chartData} margin={{ top: 10 }}>
-				<CartesianGrid vertical={false} />
-				<YAxis
-					// domain={[0, (max: number) => Math.ceil(max)]}
-					width={48}
-					tickLine={false}
-					axisLine={false}
-					unit={'%'}
-				/>
-				{/* todo: short time if first date is same day, otherwise short date */}
-				<XAxis
-					dataKey="time"
-					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}
-					content={
-						<ChartTooltipContent
-							unit="%"
-							labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
-							indicator="line"
-						/>
-					}
-				/>
-				<Area
-					dataKey="cpu"
-					type="monotoneX"
-					fill="var(--color-cpu)"
-					fillOpacity={0.4}
-					stroke="var(--color-cpu)"
-					animationDuration={1200}
-					// animationEasing="ease-out"
-					// animateNewValues={false}
-				/>
-			</AreaChart>
-		</ChartContainer>
+		<div ref={chartRef}>
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
+			>
+				<AreaChart accessibilityLayer data={systemData} margin={{ top: 10 }}>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						// domain={[0, (max: number) => Math.ceil(max)]}
+						width={yAxisWidth}
+						tickLine={false}
+						axisLine={false}
+						unit={'%'}
+					/>
+					<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}
+						content={
+							<ChartTooltipContent
+								unit="%"
+								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								indicator="line"
+							/>
+						}
+					/>
+					<Area
+						dataKey="stats.cpu"
+						name="CPU Usage"
+						type="monotoneX"
+						fill="hsl(var(--chart-1))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-1))"
+						isAnimationActive={false}
+						// animationEasing="ease-out"
+						// animationDuration={1200}
+						// animateNewValues={true}
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</div>
 	)
 }

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

@@ -1,32 +1,29 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
 
-import {
-	ChartConfig,
-	ChartContainer,
-	ChartTooltip,
-	ChartTooltipContent,
-} from '@/components/ui/chart'
-import { formatShortDate, hourWithMinutes } from '@/lib/utils'
-import { useMemo } from 'react'
-import Spinner from '../spinner'
-
-const chartConfig = {
-	diskUsed: {
-		label: 'Disk Usage',
-		color: 'hsl(var(--chart-4))',
-	},
-} satisfies ChartConfig
+import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
+import { chartTimeData, cn, formatShortDate, useYaxisWidth } from '@/lib/utils'
+import { useMemo, useRef } from 'react'
+// import Spinner from '../spinner'
+import { useStore } from '@nanostores/react'
+import { $chartTime } from '@/lib/stores'
+import { SystemStatsRecord } from '@/types'
 
 export default function DiskChart({
-	chartData,
 	ticks,
+	systemData,
 }: {
-	chartData: { time: number; disk: number; diskUsed: number }[]
 	ticks: number[]
+	systemData: SystemStatsRecord[]
 }) {
+	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(chartData[0]?.disk)
-	}, [chartData])
+		return Math.round(systemData[0]?.stats.d)
+	}, [systemData])
 
 	// const ticks = useMemo(() => {
 	// 	let ticks = [0]
@@ -37,64 +34,73 @@ export default function DiskChart({
 	// 	return ticks
 	// }, [diskSize])
 
-	if (!chartData.length || !ticks.length) {
-		return <Spinner />
-	}
+	// if (!systemData.length || !ticks.length) {
+	// 	return <Spinner />
+	// }
 
 	return (
-		<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
-			<AreaChart
-				accessibilityLayer
-				data={chartData}
-				margin={{
-					left: 0,
-					right: 0,
-					top: 10,
-					bottom: 0,
-				}}
+		<div ref={chartRef}>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
 			>
-				<CartesianGrid vertical={false} />
-				<YAxis
-					className="tracking-tighter"
-					width={diskSize >= 1000 ? 75 : 65}
-					domain={[0, diskSize]}
-					tickCount={9}
-					tickLine={false}
-					axisLine={false}
-					unit={' GB'}
-				/>
-				{/* todo: short time if first date is same day, otherwise short date */}
-				<XAxis
-					dataKey="time"
-					domain={[ticks[0], ticks.at(-1)!]}
-					ticks={ticks}
-					type="number"
-					scale={'time'}
-					tickLine={true}
-					axisLine={false}
-					tickMargin={8}
-					minTickGap={30}
-					tickFormatter={hourWithMinutes}
-				/>
-				<ChartTooltip
-					// cursor={false}
-					content={
-						<ChartTooltipContent
-							unit=" GB"
-							labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
-							indicator="line"
-						/>
-					}
-				/>
-				<Area
-					dataKey="diskUsed"
-					type="monotoneX"
-					fill="var(--color-diskUsed)"
-					fillOpacity={0.4}
-					stroke="var(--color-diskUsed)"
-					animationDuration={1200}
-				/>
-			</AreaChart>
-		</ChartContainer>
+				<AreaChart
+					accessibilityLayer
+					data={systemData}
+					margin={{
+						left: 0,
+						right: 0,
+						top: 10,
+						bottom: 0,
+					}}
+				>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						width={yAxisWidth}
+						domain={[0, diskSize]}
+						tickCount={9}
+						tickLine={false}
+						axisLine={false}
+						unit={' GB'}
+					/>
+					<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}
+						content={
+							<ChartTooltipContent
+								unit=" GB"
+								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								indicator="line"
+							/>
+						}
+					/>
+					<Area
+						dataKey="stats.du"
+						name="Disk Usage"
+						type="monotoneX"
+						fill="hsl(var(--chart-4))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-4))"
+						// animationDuration={1200}
+						isAnimationActive={false}
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</div>
 	)
 }

hub/site/src/components/charts/disk-io-chart.tsx

@@ -1,103 +1,109 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
 
+import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
 import {
-	ChartConfig,
-	ChartContainer,
-	ChartTooltip,
-	ChartTooltipContent,
-} from '@/components/ui/chart'
-import { formatShortDate, hourWithMinutes } from '@/lib/utils'
-import Spinner from '../spinner'
-
-const chartConfig = {
-	read: {
-		label: 'Read',
-		color: 'hsl(var(--chart-1))',
-	},
-	write: {
-		label: 'Write',
-		color: 'hsl(var(--chart-3))',
-	},
-} satisfies ChartConfig
+	chartTimeData,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	useYaxisWidth,
+} 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({
-	chartData,
 	ticks,
+	systemData,
 }: {
-	chartData: { time: number; read: number; write: number }[]
 	ticks: number[]
+	systemData: SystemStatsRecord[]
 }) {
-	if (!chartData.length || !ticks.length) {
-		return <Spinner />
-	}
+	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 />
+	// }
 
 	return (
-		<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
-			<AreaChart
-				accessibilityLayer
-				data={chartData}
-				margin={{
-					left: 0,
-					right: 0,
-					top: 10,
-					bottom: 0,
-				}}
+		<div ref={chartRef}>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
 			>
-				<CartesianGrid vertical={false} />
-				<YAxis
-					className="tracking-tighter"
-					width={75}
-					domain={[0, (max: number) => (max < 0.4 ? 0.4 : Math.ceil(max))]}
-					tickFormatter={(value) => {
-						if (value >= 100) {
-							return value.toFixed(0)
-						}
-						return value.toFixed((value * 100) % 1 === 0 ? 1 : 2)
+				<AreaChart
+					accessibilityLayer
+					data={systemData}
+					margin={{
+						left: 0,
+						right: 0,
+						top: 10,
+						bottom: 0,
 					}}
-					tickLine={false}
-					axisLine={false}
-					unit={' MB/s'}
-				/>
-				{/* todo: short time if first date is same day, otherwise short date */}
-				<XAxis
-					dataKey="time"
-					domain={[ticks[0], ticks.at(-1)!]}
-					ticks={ticks}
-					type="number"
-					scale={'time'}
-					tickLine={true}
-					axisLine={false}
-					tickMargin={8}
-					minTickGap={30}
-					tickFormatter={hourWithMinutes}
-				/>
-				<ChartTooltip
-					// cursor={false}
-					content={
-						<ChartTooltipContent
-							unit=" MB/s"
-							labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
-							indicator="line"
-						/>
-					}
-				/>
-				<Area
-					dataKey="write"
-					type="monotoneX"
-					fill="var(--color-write)"
-					fillOpacity={0.4}
-					stroke="var(--color-write)"
-					animationDuration={1200}
-				/>
-				<Area
-					dataKey="read"
-					type="monotoneX"
-					fill="var(--color-read)"
-					fillOpacity={0.4}
-					stroke="var(--color-read)"
-					animationDuration={1200}
-				/>
-			</AreaChart>
-		</ChartContainer>
+				>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						width={yAxisWidth}
+						// domain={[0, (max: number) => (max <= 0.4 ? 0.4 : Math.ceil(max))]}
+						tickFormatter={(value) => toFixedWithoutTrailingZeros(value, 2)}
+						tickLine={false}
+						axisLine={false}
+						unit={' MB/s'}
+					/>
+					<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}
+						content={
+							<ChartTooltipContent
+								unit=" MB/s"
+								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								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}
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</div>
 	)
 }

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

@@ -1,111 +1,106 @@
 import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
 
-import {
-	ChartConfig,
-	ChartContainer,
-	ChartTooltip,
-	ChartTooltipContent,
-} from '@/components/ui/chart'
-import { formatShortDate, hourWithMinutes } from '@/lib/utils'
-import { useMemo } from 'react'
-import Spinner from '../spinner'
+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 { useStore } from '@nanostores/react'
+import { $chartTime } from '@/lib/stores'
+import { SystemStatsRecord } from '@/types'
 
 export default function MemChart({
-	chartData,
 	ticks,
+	systemData,
 }: {
-	chartData: { time: number; mem: number; memUsed: number; memCache: number }[]
 	ticks: number[]
+	systemData: SystemStatsRecord[]
 }) {
+	const chartRef = useRef<HTMLDivElement>(null)
+	const yAxisWidth = useYaxisWidth(chartRef)
+	const chartTime = useStore($chartTime)
+
+	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+
 	const totalMem = useMemo(() => {
-		const maxMem = Math.ceil(chartData[0]?.mem)
-		return maxMem > 2 && maxMem % 2 !== 0 ? maxMem + 1 : maxMem
-	}, [chartData])
-
-	const chartConfig = useMemo(
-		() => ({
-			memCache: {
-				label: 'Cache / Buffers',
-				color: 'hsl(var(--chart-2))',
-			},
-			memUsed: {
-				label: 'Used',
-				color: 'hsl(var(--chart-2))',
-			},
-		}),
-		[]
-	) satisfies ChartConfig
-
-	if (!chartData.length || !ticks.length) {
-		return <Spinner />
-	}
+		return toFixedFloat(systemData.at(-1)?.stats.m ?? 0, 1)
+	}, [systemData])
 
 	return (
-		<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
-			<AreaChart
-				accessibilityLayer
-				data={chartData}
-				margin={{
-					top: 10,
-				}}
+		<div ref={chartRef}>
+			{/* {!yAxisSet && <Spinner />} */}
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
 			>
-				<CartesianGrid vertical={false} />
-				<YAxis
-					// use "ticks" instead of domain / tickcount if need more control
-					domain={[0, totalMem]}
-					tickLine={false}
-					width={totalMem >= 100 ? 65 : 58}
-					// allowDecimals={false}
-					axisLine={false}
-					unit={' GB'}
-				/>
-				{/* todo: short time if first date is same day, otherwise short date */}
-				<XAxis
-					dataKey="time"
-					domain={[ticks[0], ticks.at(-1)!]}
-					ticks={ticks}
-					type="number"
-					scale={'time'}
-					tickLine={true}
-					axisLine={false}
-					tickMargin={8}
-					minTickGap={30}
-					tickFormatter={hourWithMinutes}
-				/>
-				<ChartTooltip
-					// cursor={false}
-					animationEasing="ease-out"
-					animationDuration={150}
-					content={
-						<ChartTooltipContent
-							unit=" GB"
-							// @ts-ignore
-							itemSorter={(a, b) => a.name.localeCompare(b.name)}
-							labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
-							indicator="line"
+				<AreaChart
+					accessibilityLayer
+					data={systemData}
+					margin={{
+						top: 10,
+					}}
+				>
+					<CartesianGrid vertical={false} />
+					{totalMem && (
+						<YAxis
+							// use "ticks" instead of domain / tickcount if need more control
+							domain={[0, totalMem]}
+							className="tracking-tighter"
+							width={yAxisWidth}
+							tickLine={false}
+							axisLine={false}
+							unit={' GB'}
 						/>
-					}
-				/>
-				<Area
-					dataKey="memUsed"
-					type="monotoneX"
-					fill="var(--color-memUsed)"
-					fillOpacity={0.4}
-					stroke="var(--color-memUsed)"
-					stackId="a"
-					animationDuration={1200}
-				/>
-				<Area
-					dataKey="memCache"
-					type="monotoneX"
-					fill="var(--color-memCache)"
-					fillOpacity={0.2}
-					strokeOpacity={0.3}
-					stroke="var(--color-memCache)"
-					stackId="a"
-					animationDuration={1200}
-				/>
-			</AreaChart>
-		</ChartContainer>
+					)}
+					<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
+						// cursor={false}
+						animationEasing="ease-out"
+						animationDuration={150}
+						content={
+							<ChartTooltipContent
+								unit=" GB"
+								// @ts-ignore
+								itemSorter={(a, b) => a.name.localeCompare(b.name)}
+								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								indicator="line"
+							/>
+						}
+					/>
+					<Area
+						dataKey="stats.mu"
+						name="Used"
+						type="monotoneX"
+						fill="hsl(var(--chart-2))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-2))"
+						stackId="1"
+						isAnimationActive={false}
+					/>
+					<Area
+						dataKey="stats.mb"
+						name="Cache / Buffers"
+						type="monotoneX"
+						fill="hsl(var(--chart-2))"
+						fillOpacity={0.2}
+						strokeOpacity={0.3}
+						stroke="hsl(var(--chart-2))"
+						stackId="1"
+						isAnimationActive={false}
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</div>
 	)
 }

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

@@ -0,0 +1,83 @@
+import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
+
+import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
+import {
+	chartTimeData,
+	cn,
+	formatShortDate,
+	toFixedWithoutTrailingZeros,
+	useYaxisWidth,
+} 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,
+	systemData,
+}: {
+	ticks: number[]
+	systemData: SystemStatsRecord[]
+}) {
+	const chartTime = useStore($chartTime)
+	const chartRef = useRef<HTMLDivElement>(null)
+	const yAxisWidth = useYaxisWidth(chartRef)
+
+	const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
+
+	return (
+		<div ref={chartRef}>
+			<ChartContainer
+				config={{}}
+				className={cn('h-full w-full absolute aspect-auto bg-card opacity-0 transition-opacity', {
+					'opacity-100': yAxisSet,
+				})}
+			>
+				<AreaChart accessibilityLayer data={systemData} margin={{ top: 10 }}>
+					<CartesianGrid vertical={false} />
+					<YAxis
+						className="tracking-tighter"
+						domain={[0, () => toFixedWithoutTrailingZeros(systemData.at(-1)?.stats.s ?? 0.04, 2)]}
+						width={yAxisWidth}
+						tickLine={false}
+						axisLine={false}
+						unit={' GB'}
+					/>
+					<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}
+						content={
+							<ChartTooltipContent
+								unit=" GB"
+								labelFormatter={(_, data) => formatShortDate(data[0].payload.created)}
+								indicator="line"
+							/>
+						}
+					/>
+					<Area
+						dataKey="stats.su"
+						name="Swap Usage"
+						type="monotoneX"
+						fill="hsl(var(--chart-2))"
+						fillOpacity={0.4}
+						stroke="hsl(var(--chart-2))"
+						isAnimationActive={false}
+					/>
+				</AreaChart>
+			</ChartContainer>
+		</div>
+	)
+}

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

@@ -13,8 +13,8 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from '@/components/ui/dialog'
-import { useState } from 'react'
-import { AuthMethodsList } from 'pocketbase'
+import { useCallback, useState } from 'react'
+import { AuthMethodsList, OAuth2AuthConfig } from 'pocketbase'
 import { Link } from '../router'
 
 const honeypot = v.literal('')
@@ -64,60 +64,63 @@ export function UserAuthForm({
 	authMethods: AuthMethodsList
 }) {
 	const [isLoading, setIsLoading] = useState<boolean>(false)
-	const [isGitHubLoading, setIsOauthLoading] = useState<boolean>(false)
+	const [isOauthLoading, setIsOauthLoading] = useState<boolean>(false)
 	const [errors, setErrors] = useState<Record<string, string | undefined>>({})
 
-	async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-		e.preventDefault()
-		setIsLoading(true)
-		try {
-			const formData = new FormData(e.target as HTMLFormElement)
-			const data = Object.fromEntries(formData) as Record<string, any>
-			const Schema = isFirstRun ? RegisterSchema : LoginSchema
-			const result = v.safeParse(Schema, data)
-			if (!result.success) {
-				console.log(result)
-				let errors = {}
-				for (const issue of result.issues) {
-					// @ts-ignore
-					errors[issue.path[0].key] = issue.message
-				}
-				setErrors(errors)
-				return
-			}
-			const { email, password, passwordConfirm, username } = result.output
-			if (isFirstRun) {
-				// check that passwords match
-				if (password !== passwordConfirm) {
-					let msg = 'Passwords do not match'
-					setErrors({ passwordConfirm: msg })
+	const handleSubmit = useCallback(
+		async (e: React.FormEvent<HTMLFormElement>) => {
+			e.preventDefault()
+			setIsLoading(true)
+			try {
+				const formData = new FormData(e.target as HTMLFormElement)
+				const data = Object.fromEntries(formData) as Record<string, any>
+				const Schema = isFirstRun ? RegisterSchema : LoginSchema
+				const result = v.safeParse(Schema, data)
+				if (!result.success) {
+					console.log(result)
+					let errors = {}
+					for (const issue of result.issues) {
+						// @ts-ignore
+						errors[issue.path[0].key] = issue.message
+					}
+					setErrors(errors)
 					return
 				}
-				await pb.admins.create({
-					email,
-					password,
-					passwordConfirm: password,
-				})
-				await pb.admins.authWithPassword(email, password)
-				await pb.collection('users').create({
-					username,
-					email,
-					password,
-					passwordConfirm: password,
-					role: 'admin',
-					verified: true,
-				})
-				await pb.collection('users').authWithPassword(email, password)
-			} else {
-				await pb.collection('users').authWithPassword(email, password)
+				const { email, password, passwordConfirm, username } = result.output
+				if (isFirstRun) {
+					// check that passwords match
+					if (password !== passwordConfirm) {
+						let msg = 'Passwords do not match'
+						setErrors({ passwordConfirm: msg })
+						return
+					}
+					await pb.admins.create({
+						email,
+						password,
+						passwordConfirm: password,
+					})
+					await pb.admins.authWithPassword(email, password)
+					await pb.collection('users').create({
+						username,
+						email,
+						password,
+						passwordConfirm: password,
+						role: 'admin',
+						verified: true,
+					})
+					await pb.collection('users').authWithPassword(email, password)
+				} else {
+					await pb.collection('users').authWithPassword(email, password)
+				}
+				$authenticated.set(true)
+			} catch (e) {
+				showLoginFaliedToast()
+			} finally {
+				setIsLoading(false)
 			}
-			$authenticated.set(true)
-		} catch (e) {
-			showLoginFaliedToast()
-		} finally {
-			setIsLoading(false)
-		}
-	}
+		},
+		[isFirstRun]
+	)
 
 	if (!authMethods) {
 		return null
@@ -145,7 +148,7 @@ export function UserAuthForm({
 										autoCapitalize="none"
 										autoComplete="username"
 										autoCorrect="off"
-										disabled={isLoading || isGitHubLoading}
+										disabled={isLoading || isOauthLoading}
 										className="pl-9"
 									/>
 									{errors?.username && (
@@ -167,7 +170,7 @@ export function UserAuthForm({
 									autoCapitalize="none"
 									autoComplete="email"
 									autoCorrect="off"
-									disabled={isLoading || isGitHubLoading}
+									disabled={isLoading || isOauthLoading}
 									className="pl-9"
 								/>
 								{errors?.email && <p className="px-1 text-xs text-red-600">{errors.email}</p>}
@@ -184,7 +187,7 @@ export function UserAuthForm({
 									required
 									type="password"
 									autoComplete="current-password"
-									disabled={isLoading || isGitHubLoading}
+									disabled={isLoading || isOauthLoading}
 									className="pl-9"
 								/>
 								{errors?.password && <p className="px-1 text-xs text-red-600">{errors.password}</p>}
@@ -202,7 +205,7 @@ export function UserAuthForm({
 										required
 										type="password"
 										autoComplete="current-password"
-										disabled={isLoading || isGitHubLoading}
+										disabled={isLoading || isOauthLoading}
 										className="pl-9"
 									/>
 									{errors?.passwordConfirm && (
@@ -225,14 +228,17 @@ export function UserAuthForm({
 							</button>
 						</div>
 					</form>
-					<div className="relative">
-						<div className="absolute inset-0 flex items-center">
-							<span className="w-full border-t" />
+					{(isFirstRun || authMethods.authProviders.length > 0) && (
+						// only show 'continue with' during onboarding or if we have auth providers
+						<div className="relative">
+							<div className="absolute inset-0 flex items-center">
+								<span className="w-full border-t" />
+							</div>
+							<div className="relative flex justify-center text-xs uppercase">
+								<span className="bg-background px-2 text-muted-foreground">Or continue with</span>
+							</div>
 						</div>
-						<div className="relative flex justify-center text-xs uppercase">
-							<span className="bg-background px-2 text-muted-foreground">Or continue with</span>
-						</div>
-					</div>
+					)}
 				</>
 			)}
 
@@ -246,20 +252,40 @@ export function UserAuthForm({
 								'justify-self-center': !authMethods.emailPassword,
 								'px-5': !authMethods.emailPassword,
 							})}
-							onClick={async () => {
+							onClick={() => {
 								setIsOauthLoading(true)
-								try {
-									await pb.collection('users').authWithOAuth2({ provider: provider.name })
-									$authenticated.set(pb.authStore.isValid)
-								} catch (e) {
-									showLoginFaliedToast()
-								} finally {
-									setIsOauthLoading(false)
+								const oAuthOpts: OAuth2AuthConfig = {
+									provider: provider.name,
 								}
+								// https://github.com/pocketbase/pocketbase/discussions/2429#discussioncomment-5943061
+								if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
+									const authWindow = window.open()
+									if (!authWindow) {
+										setIsOauthLoading(false)
+										toast({
+											title: 'Error',
+											description: 'Please enable pop-ups for this site',
+											variant: 'destructive',
+										})
+										return
+									}
+									oAuthOpts.urlCallback = (url) => {
+										authWindow.location.href = url
+									}
+								}
+								pb.collection('users')
+									.authWithOAuth2(oAuthOpts)
+									.then(() => {
+										$authenticated.set(pb.authStore.isValid)
+									})
+									.catch(showLoginFaliedToast)
+									.finally(() => {
+										setIsOauthLoading(false)
+									})
 							}}
-							disabled={isLoading || isGitHubLoading}
+							disabled={isLoading || isOauthLoading}
 						>
-							{isGitHubLoading ? (
+							{isOauthLoading ? (
 								<LoaderCircle className="mr-2 h-4 w-4 animate-spin" />
 							) : (
 								<img
@@ -277,7 +303,8 @@ export function UserAuthForm({
 				</div>
 			)}
 
-			{!authMethods.authProviders.length && (
+			{!authMethods.authProviders.length && isFirstRun && (
+				// only show GitHub button / dialog during onboarding
 				<Dialog>
 					<DialogTrigger asChild>
 						<button type="button" className={cn(buttonVariants({ variant: 'outline' }))}>

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

@@ -86,9 +86,12 @@ export default function ForgotPassword() {
 					<DialogHeader>
 						<DialogTitle>Command line instructions</DialogTitle>
 					</DialogHeader>
-					<p className="text-primary/70 text-[0.95em]">
-						Use the following command to reset
-						your password:
+					<p className="text-primary/70 text-[0.95em] leading-relaxed">
+						If you've lost the password to your admin account, you may reset it using the following
+						command.
+					</p>
+					<p className="text-primary/70 text-[0.95em] leading-relaxed">
+						Then log into the backend and reset your user account password in the users table.
 					</p>
 					<code className="bg-muted rounded-sm py-0.5 px-2.5 mr-auto text-sm">
 						beszel admin update youremail@example.com newpassword

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

@@ -9,24 +9,22 @@ export default function () {
 	}, [])
 
 	return (
-		<>
-			<Card>
-				<CardHeader className="pb-5">
-					<CardTitle className={'mb-1.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>
-				</CardHeader>
-				<CardContent>
-					<Suspense>
-						<SystemsTable />
-					</Suspense>
-				</CardContent>
-			</Card>
-		</>
+		<Card>
+			<CardHeader className="pb-2 md:pb-5 px-4 sm:px-7 max-sm:pt-5">
+				<CardTitle className="mb-1.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>
+			</CardHeader>
+			<CardContent className="max-sm:p-2">
+				<Suspense>
+					<SystemsTable />
+				</Suspense>
+			</CardContent>
+		</Card>
 	)
 }

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

@@ -1,12 +1,12 @@
 import { $updatedSystem, $systems, pb, $chartTime } from '@/lib/stores'
 import { ContainerStatsRecord, SystemRecord, SystemStatsRecord } from '@/types'
-import { Suspense, lazy, useCallback, useEffect, useMemo, useState } from 'react'
+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 } from 'lucide-react'
 import ChartTimeSelect from '../charts/chart-time-select'
-import { chartTimeData, cn, getPbTimestamp } from '@/lib/utils'
+import { chartTimeData, cn, getPbTimestamp, useClampedIsInViewport } from '@/lib/utils'
 import { Separator } from '../ui/separator'
 import { scaleTime } from 'd3-scale'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../ui/tooltip'
@@ -18,6 +18,8 @@ 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'))
 
 export default function ServerDetail({ name }: { name: string }) {
 	const systems = useStore($systems)
@@ -25,27 +27,16 @@ export default function ServerDetail({ name }: { name: string }) {
 	const chartTime = useStore($chartTime)
 	const [ticks, setTicks] = useState([] as number[])
 	const [server, setServer] = useState({} as SystemRecord)
-	const [containers, setContainers] = useState([] as ContainerStatsRecord[])
-
 	const [systemStats, setSystemStats] = useState([] as SystemStatsRecord[])
-	const [cpuChartData, setCpuChartData] = useState([] as { time: number; cpu: number }[])
-	const [memChartData, setMemChartData] = useState(
-		[] as { time: number; mem: number; memUsed: number; memCache: number }[]
+	const [hasDockerStats, setHasDocker] = useState(false)
+	const [dockerCpuChartData, setDockerCpuChartData] = useState<Record<string, number | string>[]>(
+		[]
 	)
-	const [diskChartData, setDiskChartData] = useState(
-		[] as { time: number; disk: number; diskUsed: number }[]
+	const [dockerMemChartData, setDockerMemChartData] = useState<Record<string, number | string>[]>(
+		[]
 	)
-	const [diskIoChartData, setDiskIoChartData] = useState(
-		[] as { time: number; read: number; write: number }[]
-	)
-	const [bandwidthChartData, setBandwidthChartData] = useState(
-		[] as { time: number; sent: number; recv: number }[]
-	)
-	const [dockerCpuChartData, setDockerCpuChartData] = useState(
-		[] as Record<string, number | string>[]
-	)
-	const [dockerMemChartData, setDockerMemChartData] = useState(
-		[] as Record<string, number | string>[]
+	const [dockerNetChartData, setDockerNetChartData] = useState<Record<string, number | number[]>[]>(
+		[]
 	)
 
 	useEffect(() => {
@@ -53,18 +44,16 @@ export default function ServerDetail({ name }: { name: string }) {
 		return () => {
 			resetCharts()
 			$chartTime.set('1h')
+			setHasDocker(false)
 		}
 	}, [name])
 
-	const resetCharts = useCallback(() => {
+	function resetCharts() {
 		setSystemStats([])
-		setCpuChartData([])
-		setMemChartData([])
-		setDiskChartData([])
-		setBandwidthChartData([])
 		setDockerCpuChartData([])
 		setDockerMemChartData([])
-	}, [])
+		setDockerNetChartData([])
+	}
 
 	useEffect(resetCharts, [chartTime])
 
@@ -78,62 +67,46 @@ export default function ServerDetail({ name }: { name: string }) {
 		}
 	}, [name, server, systems])
 
-	// get stats
-	useEffect(() => {
-		if (!server.id || !chartTime) {
-			return
-		}
-		pb.collection<SystemStatsRecord>('system_stats')
-			.getFullList({
-				filter: pb.filter('system={:id} && created > {:created} && type={:type}', {
-					id: server.id,
-					created: getPbTimestamp(chartTime),
-					type: chartTimeData[chartTime].type,
-				}),
-				fields: 'created,stats',
-				sort: 'created',
-			})
-			.then((records) => {
-				// console.log('sctats', records)
-				setSystemStats(records)
-			})
-	}, [server, chartTime])
-
+	// update server when new data is available
 	useEffect(() => {
 		if (updatedSystem.id === server.id) {
 			setServer(updatedSystem)
 		}
 	}, [updatedSystem])
 
-	// create cpu / mem / disk data for charts
+	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: server.id,
+				created: getPbTimestamp(chartTime),
+				type: chartTimeData[chartTime].type,
+			}),
+			fields: 'created,stats',
+			sort: 'created',
+		})
+	}
+
+	// get stats
 	useEffect(() => {
-		if (!systemStats.length) {
+		if (!server.id || !chartTime) {
 			return
 		}
-		const cpuData = [] as typeof cpuChartData
-		const memData = [] as typeof memChartData
-		const diskData = [] as typeof diskChartData
-		const diskIoData = [] as typeof diskIoChartData
-		const networkData = [] as typeof bandwidthChartData
-		for (let { created, stats } of systemStats) {
-			const time = new Date(created).getTime()
-			cpuData.push({ time, cpu: stats.cpu })
-			memData.push({
-				time,
-				mem: stats.m,
-				memUsed: stats.mu,
-				memCache: stats.mb,
-			})
-			diskData.push({ time, disk: stats.d, diskUsed: stats.du })
-			diskIoData.push({ time, read: stats.dr, write: stats.dw })
-			networkData.push({ time, sent: stats.ns, recv: stats.nr })
-		}
-		setCpuChartData(cpuData)
-		setMemChartData(memData)
-		setDiskChartData(diskData)
-		setDiskIoChartData(diskIoData)
-		setBandwidthChartData(networkData)
-	}, [systemStats])
+		Promise.allSettled([
+			getStats<SystemStatsRecord>('system_stats'),
+			getStats<ContainerStatsRecord>('container_stats'),
+		]).then(([systemStats, containerStats]) => {
+			if (containerStats.status === 'fulfilled' && containerStats.value.length) {
+				setHasDocker(true)
+				makeContainerData(containerStats.value)
+			}
+			if (systemStats.status === 'fulfilled') {
+				for (const record of systemStats.value) {
+					record.created = new Date(record.created).getTime()
+				}
+				setSystemStats(systemStats.value)
+			}
+		})
+	}, [server, chartTime])
 
 	useEffect(() => {
 		if (!systemStats.length) {
@@ -141,51 +114,36 @@ export default function ServerDetail({ name }: { name: string }) {
 		}
 		const now = new Date()
 		const startTime = chartTimeData[chartTime].getOffset(now)
-		const scale = scaleTime([startTime.getTime(), now], [0, cpuChartData.length])
-		setTicks(scale.ticks().map((d) => d.getTime()))
+		const scale = scaleTime([startTime.getTime(), now], [0, systemStats.length])
+		setTicks(scale.ticks(chartTimeData[chartTime].ticks).map((d) => d.getTime()))
 	}, [chartTime, systemStats])
 
-	// get container stats
-	useEffect(() => {
-		if (!server.id || !chartTime) {
-			return
-		}
-		pb.collection<ContainerStatsRecord>('container_stats')
-			.getFullList({
-				filter: pb.filter('system={:id} && created > {:created} && type={:type}', {
-					id: server.id,
-					created: getPbTimestamp(chartTime),
-					type: chartTimeData[chartTime].type,
-				}),
-				fields: 'created,stats',
-				sort: 'created',
-			})
-			.then((records) => {
-				setContainers(records)
-			})
-	}, [server, chartTime])
-
-	// container stats for charts
-	useEffect(() => {
+	// make container stats for charts
+	const makeContainerData = useCallback((containers: ContainerStatsRecord[]) => {
 		// console.log('containers', containers)
-		const dockerCpuData = [] as Record<string, number | string>[]
-		const dockerMemData = [] as Record<string, number | string>[]
-
+		const dockerCpuData = []
+		const dockerMemData = []
+		const dockerNetData = []
 		for (let { created, stats } of containers) {
 			const time = new Date(created).getTime()
-			let cpuData = { time } as (typeof dockerCpuChartData)[0]
-			let memData = { time } as (typeof dockerMemChartData)[0]
+			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)
 		}
-		// console.log('containerMemData', containerMemData)
+		// console.log('dockerMemData', dockerMemData)
 		setDockerCpuChartData(dockerCpuData)
 		setDockerMemChartData(dockerMemData)
-	}, [containers])
+		setDockerNetChartData(dockerNetData)
+	}, [])
+
 	const uptime = useMemo(() => {
 		let uptime = server.info?.u || 0
 		if (uptime < 172800) {
@@ -201,7 +159,7 @@ export default function ServerDetail({ name }: { name: string }) {
 	return (
 		<div className="grid gap-4 mb-10">
 			<Card>
-				<div className="grid gap-2 px-6 pt-4 pb-5">
+				<div className="grid gap-2 px-4 sm:px-6 pt-3 sm:pt-4 pb-5">
 					<h1 className="text-[1.6rem] font-semibold">{server.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">
@@ -250,43 +208,69 @@ export default function ServerDetail({ name }: { name: string }) {
 							</>
 						)}
 					</div>
+					<ChartTimeSelect className="mt-2 -ml-1 sm:hidden" />
 				</div>
 			</Card>
 
 			<ChartCard title="Total CPU Usage" description="Average system-wide CPU utilization">
-				<CpuChart chartData={cpuChartData} ticks={ticks} />
+				<CpuChart ticks={ticks} systemData={systemStats} />
 			</ChartCard>
 
-			{dockerCpuChartData.length > 0 && (
+			{hasDockerStats && (
 				<ChartCard title="Docker CPU Usage" description="CPU utilization of docker containers">
 					<ContainerCpuChart chartData={dockerCpuChartData} ticks={ticks} />
 				</ChartCard>
 			)}
 
 			<ChartCard title="Total Memory Usage" description="Precise utilization at the recorded time">
-				<MemChart chartData={memChartData} ticks={ticks} />
+				<MemChart ticks={ticks} systemData={systemStats} />
 			</ChartCard>
 
-			{dockerMemChartData.length > 0 && (
+			{hasDockerStats && (
 				<ChartCard title="Docker Memory Usage" description="Memory usage of docker containers">
 					<ContainerMemChart chartData={dockerMemChartData} ticks={ticks} />
 				</ChartCard>
 			)}
 
+			{(systemStats.at(-1)?.stats.s ?? 0) > 0 && (
+				<ChartCard title="Swap Usage" description="Swap space used by the system">
+					<SwapChart ticks={ticks} systemData={systemStats} />
+				</ChartCard>
+			)}
+
 			<ChartCard
 				title="Disk Usage"
 				description="Usage of partition where the root filesystem is mounted"
 			>
-				<DiskChart chartData={diskChartData} ticks={ticks} />
+				<DiskChart ticks={ticks} systemData={systemStats} />
 			</ChartCard>
 
 			<ChartCard title="Disk I/O" description="Throughput of root filesystem">
-				<DiskIoChart chartData={diskIoChartData} ticks={ticks} />
+				<DiskIoChart ticks={ticks} systemData={systemStats} />
 			</ChartCard>
 
 			<ChartCard title="Bandwidth" description="Network traffic of public interfaces">
-				<BandwidthChart chartData={bandwidthChartData} ticks={ticks} />
+				<BandwidthChart ticks={ticks} systemData={systemStats} />
 			</ChartCard>
+
+			{hasDockerStats && dockerNetChartData.length > 0 && (
+				<>
+					<ChartCard
+						title="Docker Network I/O"
+						description="Includes traffic between internal services"
+					>
+						<ContainerNetChart chartData={dockerNetChartData} ticks={ticks} />
+					</ChartCard>
+					{/* add space for tooltip if more than 12 containers */}
+					{Object.keys(dockerNetChartData[0]).length > 12 && (
+						<div
+							style={{
+								height: (Object.keys(dockerNetChartData[0]).length - 13) * 18,
+							}}
+						/>
+					)}
+				</>
+			)}
 		</div>
 	)
 }
@@ -300,17 +284,20 @@ function ChartCard({
 	description: string
 	children: React.ReactNode
 }) {
+	const target = useRef<HTMLDivElement>(null)
+	const [isInViewport, wrappedTargetRef] = useClampedIsInViewport({ target: target })
 	return (
-		<Card className="pb-4 col-span-full">
-			<CardHeader className="pb-5 pt-4 relative space-y-1">
+		<Card className="pb-2 sm:pb-4 col-span-full" ref={wrappedTargetRef}>
+			<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>
-				<div className="w-full pt-1 sm:w-40 sm:absolute top-1.5 right-3.5">
+				<div className="w-full pt-1 sm:w-40 hidden sm:block absolute top-1.5 right-3.5">
 					<ChartTimeSelect />
 				</div>
 			</CardHeader>
-			<CardContent className={'pl-1 w-[calc(100%-1.6em)] h-52 relative'}>
-				<Suspense fallback={<Spinner />}>{children}</Suspense>
+			<CardContent className="pl-1 w-[calc(100%-1.6em)] h-52 relative">
+				{<Spinner />}
+				{isInViewport && <Suspense>{children}</Suspense>}
 			</CardContent>
 		</Card>
 	)

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

@@ -304,7 +304,7 @@ export default function SystemsTable() {
 															? 'auto'
 															: cell.column.getSize(),
 												}}
-												className={'overflow-hidden relative py-3'}
+												className={'overflow-hidden relative py-2.5'}
 											>
 												{flexRender(cell.column.columnDef.cell, cell.getContext())}
 											</TableCell>

hub/site/src/components/table-alerts.tsx

@@ -71,21 +71,21 @@ export default function AlertsButton({ system }: { system: SystemRecord }) {
 						system={system}
 						alerts={systemAlerts}
 						name="CPU"
-						title="CPU usage"
+						title="CPU Usage"
 						description="Triggers when CPU usage exceeds a threshold."
 					/>
 					<AlertWithSlider
 						system={system}
 						alerts={systemAlerts}
 						name="Memory"
-						title="Memory usage"
+						title="Memory Usage"
 						description="Triggers when memory usage exceeds a threshold."
 					/>
 					<AlertWithSlider
 						system={system}
 						alerts={systemAlerts}
 						name="Disk"
-						title="Disk usage"
+						title="Disk Usage"
 						description="Triggers when disk usage exceeds a threshold."
 					/>
 				</div>
@@ -104,11 +104,11 @@ function AlertStatus({ system, alerts }: { system: SystemRecord; alerts: AlertRe
 	return (
 		<label
 			htmlFor="alert-status"
-			className="space-y-2 flex flex-row items-center justify-between rounded-lg border p-4 cursor-pointer"
+			className="flex flex-row items-center justify-between gap-4 rounded-lg border p-4 cursor-pointer"
 		>
-			<div className="grid gap-0.5 select-none">
-				<p className="font-medium text-[1.05em]">System status</p>
-				<span className="block text-[0.85em] text-foreground opacity-80">
+			<div className="grid gap-1 select-none">
+				<p className="font-semibold">System Status</p>
+				<span className="block text-sm text-foreground opacity-80">
 					Triggers when status switches between up and down.
 				</span>
 			</div>
@@ -171,13 +171,13 @@ function AlertWithSlider({
 		<div className="rounded-lg border">
 			<label
 				htmlFor={`alert-${name}`}
-				className={cn('space-y-2 flex flex-row items-center justify-between cursor-pointer p-4', {
+				className={cn('flex flex-row items-center justify-between gap-4 cursor-pointer p-4', {
 					'pb-0': !!alert,
 				})}
 			>
-				<div className="grid gap-0.5 select-none">
-					<p className="font-medium text-[1.05em]">{title}</p>
-					<span className="block text-[0.85em] text-foreground opacity-80">{description}</span>
+				<div className="grid gap-1 select-none">
+					<p className="font-semibold">{title}</p>
+					<span className="block text-sm text-foreground opacity-80">{description}</span>
 				</div>
 				<Switch
 					id={`alert-${name}`}

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

@@ -100,6 +100,7 @@ const ChartTooltipContent = React.forwardRef<
 			nameKey?: string
 			labelKey?: string
 			unit?: string
+			contentFormatter?: (item: any, key: string) => React.ReactNode | string
 		}
 >(
 	(
@@ -119,6 +120,7 @@ const ChartTooltipContent = React.forwardRef<
 			labelKey,
 			unit,
 			itemSorter,
+			contentFormatter: content = undefined,
 		},
 		ref
 	) => {
@@ -180,7 +182,7 @@ const ChartTooltipContent = React.forwardRef<
 
 						return (
 							<div
-								key={item.dataKey}
+								key={item?.name || item.dataKey}
 								className={cn(
 									'flex w-full items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5 [&>svg]:text-muted-foreground',
 									indicator === 'dot' && 'items-center'
@@ -228,7 +230,9 @@ const ChartTooltipContent = React.forwardRef<
 											</div>
 											{item.value !== undefined && (
 												<span className="font-mono font-medium tabular-nums text-foreground">
-													{item.value.toLocaleString() + (unit ? unit : '')}
+													{content && typeof content === 'function'
+														? content(item, key)
+														: item.value.toLocaleString() + (unit ? unit : '')}
 												</span>
 											)}
 										</div>

hub/site/src/lib/utils.ts

@@ -2,10 +2,12 @@ import { toast } from '@/components/ui/use-toast'
 import { type ClassValue, clsx } from 'clsx'
 import { twMerge } from 'tailwind-merge'
 import { $alerts, $systems, pb } from './stores'
-import { AlertRecord, ChartTimes, SystemRecord } from '@/types'
+import { AlertRecord, ChartTimeData, ChartTimes, SystemRecord } from '@/types'
 import { RecordModel, RecordSubscription } from 'pocketbase'
 import { WritableAtom } from 'nanostores'
 import { timeDay, timeHour } from 'd3-time'
+import { useEffect, useState } from 'react'
+import useIsInViewport, { CallbackRef, HookOptions } from 'use-is-in-viewport'
 
 export function cn(...inputs: ClassValue[]) {
 	return twMerge(clsx(inputs))
@@ -20,27 +22,39 @@ export async function copyToClipboard(content: string) {
 			description: 'Copied to clipboard',
 		})
 	} catch (e: any) {
-		toast({
-			duration,
-			description: 'Failed to copy',
-		})
+		prompt(
+			'Automatic copy requires a secure context (https, localhost, or *.localhost). Please copy manually:',
+			content
+		)
 	}
 }
+
 const verifyAuth = () => {
 	pb.collection('users')
 		.authRefresh()
 		.catch(() => {
 			pb.authStore.clear()
+			toast({
+				title: 'Failed to authenticate',
+				description: 'Please log in again',
+				variant: 'destructive',
+			})
 		})
 }
 
 export const updateSystemList = async () => {
-	try {
-		const records = await pb.collection<SystemRecord>('systems').getFullList({ sort: '+name' })
+	// try {
+	const records = await pb.collection<SystemRecord>('systems').getFullList({ sort: '+name' })
+	if (records.length) {
 		$systems.set(records)
-	} catch (e) {
+	} else {
 		verifyAuth()
 	}
+	// }
+	// catch (e) {
+	// 	console.log('verifying auth error', e)
+	// 	verifyAuth()
+	// }
 }
 
 export const updateAlerts = () => {
@@ -70,9 +84,22 @@ export const formatShortDate = (timestamp: string) => {
 	return shortDateFormatter.format(new Date(timestamp))
 }
 
+// const dayTimeFormatter = new Intl.DateTimeFormat(undefined, {
+// 	// day: 'numeric',
+// 	// month: 'short',
+// 	hour: 'numeric',
+// 	weekday: 'short',
+// 	minute: 'numeric',
+// 	// dateStyle: 'short',
+// })
+// export const formatDayTime = (timestamp: string) => {
+// 	// console.log('ts', timestamp)
+// 	return dayTimeFormatter.format(new Date(timestamp))
+// }
+
 const dayFormatter = new Intl.DateTimeFormat(undefined, {
 	day: 'numeric',
-	month: 'long',
+	month: 'short',
 	// dateStyle: 'medium',
 })
 export const formatDay = (timestamp: string) => {
@@ -129,16 +156,18 @@ export function getPbTimestamp(timeString: ChartTimes) {
 	return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 }
 
-export const chartTimeData = {
+export const chartTimeData: ChartTimeData = {
 	'1h': {
 		type: '1m',
 		label: '1 hour',
+		// ticks: 12,
 		format: (timestamp: string) => hourWithMinutes(timestamp),
 		getOffset: (endTime: Date) => timeHour.offset(endTime, -1),
 	},
 	'12h': {
 		type: '10m',
 		label: '12 hours',
+		ticks: 12,
 		format: (timestamp: string) => hourWithMinutes(timestamp),
 		getOffset: (endTime: Date) => timeHour.offset(endTime, -12),
 	},
@@ -151,13 +180,59 @@ export const chartTimeData = {
 	'1w': {
 		type: '120m',
 		label: '1 week',
-		format: (timestamp: string) => formatDay(timestamp),
+		ticks: 7,
+		format: (timestamp: string) => formatShortDate(timestamp),
 		getOffset: (endTime: Date) => timeDay.offset(endTime, -7),
 	},
 	'30d': {
 		type: '480m',
 		label: '30 days',
+		ticks: 30,
 		format: (timestamp: string) => formatDay(timestamp),
 		getOffset: (endTime: Date) => timeDay.offset(endTime, -30),
 	},
 }
+
+/** Hacky solution to set the correct width of the yAxis in recharts */
+export function useYaxisWidth(chartRef: React.RefObject<HTMLDivElement>) {
+	const [yAxisWidth, setYAxisWidth] = useState(180)
+	useEffect(() => {
+		let interval = setInterval(() => {
+			// console.log('chartRef', chartRef.current)
+			const yAxisElement = chartRef?.current?.querySelector('.yAxis')
+			if (yAxisElement) {
+				// console.log('yAxisElement', yAxisElement)
+				clearInterval(interval)
+				setYAxisWidth(yAxisElement.getBoundingClientRect().width + 22)
+			}
+		}, 16)
+		return () => clearInterval(interval)
+	}, [])
+	return yAxisWidth
+}
+
+export function useClampedIsInViewport(options: HookOptions): [boolean | null, CallbackRef] {
+	const [isInViewport, wrappedTargetRef] = useIsInViewport(options)
+	const [wasInViewportAtleastOnce, setWasInViewportAtleastOnce] = useState(isInViewport)
+
+	useEffect(() => {
+		setWasInViewportAtleastOnce((prev) => {
+			// this will clamp it to the first true
+			// received from useIsInViewport
+			if (!prev) {
+				return isInViewport
+			}
+			return prev
+		})
+	}, [isInViewport])
+
+	return [wasInViewportAtleastOnce, wrappedTargetRef]
+}
+
+export function toFixedWithoutTrailingZeros(num: number, digits: number) {
+	return parseFloat(num.toFixed(digits)).toString()
+}
+
+export function toFixedFloat(num: number, digits: number) {
+	return parseFloat(num.toFixed(digits))
+}

hub/site/src/main.tsx

@@ -122,7 +122,7 @@ const Layout = () => {
 	return (
 		<>
 			<div className="container">
-				<div className="flex items-center h-16 bg-card px-6 border bt-0 rounded-md my-4">
+				<div className="flex items-center h-14 md:h-16 bg-card px-6 border bt-0 rounded-md my-4">
 					<Link
 						href="/"
 						aria-label="Home"

hub/site/src/types.d.ts

@@ -38,6 +38,10 @@ export interface SystemStats {
 	mp: number
 	/** memory buffer + cache (gb) */
 	mb: number
+	/** swap space (gb) */
+	s: number
+	/** swap used (gb) */
+	su: number
 	/** disk size (gb) */
 	d: number
 	/** disk used (gb) */
@@ -57,6 +61,7 @@ export interface SystemStats {
 export interface ContainerStatsRecord extends RecordModel {
 	system: string
 	stats: ContainerStats[]
+	created: string | number
 }
 
 interface ContainerStats {
@@ -66,11 +71,16 @@ interface ContainerStats {
 	c: number
 	/** memory used (gb) */
 	m: number
+	// network sent (mb)
+	ns: number
+	// network received (mb)
+	nr: number
 }
 
 export interface SystemStatsRecord extends RecordModel {
 	system: string
 	stats: SystemStats
+	created: string | number
 }
 
 export interface AlertRecord extends RecordModel {
@@ -81,3 +91,13 @@ export interface AlertRecord extends RecordModel {
 }
 
 export type ChartTimes = '1h' | '12h' | '24h' | '1w' | '30d'
+
+export interface ChartTimeData {
+	[key: string]: {
+		type: '1m' | '10m' | '20m' | '120m' | '480m'
+		label: string
+		ticks?: number
+		format: (timestamp: string) => string
+		getOffset: (endTime: Date) => Date
+	}
+}

hub/types.go

@@ -34,6 +34,8 @@ type SystemStats struct {
 	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"`
@@ -44,9 +46,11 @@ type SystemStats struct {
 }
 
 type ContainerStats struct {
-	Name string  `json:"n"`
-	Cpu  float64 `json:"c"`
-	Mem  float64 `json:"m"`
+	Name        string  `json:"n"`
+	Cpu         float64 `json:"c"`
+	Mem         float64 `json:"m"`
+	NetworkSent float64 `json:"ns"`
+	NetworkRecv float64 `json:"nr"`
 }
 
 type EmailData struct {

readme.md

@@ -1,28 +1,22 @@
-# Beszel \*WIP\*
+# Beszel
 
 A lightweight server resource monitoring hub with historical data, docker stats, and alerts.
 
-<!-- <table width="100%">
-  <tbody>
-    <tr>
-      <td width="50%"><img src="https://henrygd-assets.b-cdn.net/social-image-server/before-capture.png" alt="example of turso.tech/pricing link which is missing an og:image as of may 11 2024"/></td>
-      <td width="50%"><img src="https://henrygd-assets.b-cdn.net/social-image-server/after-capture.webp" alt="example of turso.tech/pricing link using an image generated by the server as it's og:image"/></td>
-    </tr>
-  </tbody>
-</table> -->
+[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/henrygd/beszel-agent/0.0.1-alpha.9?logo=docker&label=agent%20image%20size)](https://hub.docker.com/r/henrygd/beszel-agent)
+[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/henrygd/beszel/0.0.1-alpha.9?logo=docker&label=hub%20image%20size)](https://hub.docker.com/r/henrygd/beszel)
 
-<!-- ## Features
+![Screenshot of the hub](https://henrygd-assets.b-cdn.net/beszel/screenshot.png)
+
+## Features
 
 - **Lightweight**: Much smaller and less demanding than leading solutions.
-- **Historical data**: Stats are available for up to 30 days.
 - **Docker stats**: CPU and memory usage history for each container.
-- **Alerts**: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-- **Simple**: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+- **Alerts**: Configurable alerts for CPU, memory, and disk usage, and system status.
 - **Multi-user**: Each user has their own systems. Admins can share systems across users.
-- **Secure**: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-- **Oauth / OIDC**: Supports many OAuth2 providers and password auth can be disabled.
-- **Automated backups**: Automatically back up your data to S3-compatible storage.
-- **Open source**: MIT license and no paywalled features. -->
+- **Simple**: Easy setup and doesn't require anything to be publicly available online.
+- **OAuth / OIDC**: Supports many OAuth2 providers. Password auth can be disabled.
+- **Automatic backups**: Save and restore your data to / from disk or S3-compatible storage.
+- **REST API**: Use your metrics in your own scripts and applications.
 
 ## Introduction
 
@@ -32,14 +26,11 @@ The hub is a web application that provides a dashboard to view and manage your c
 
 The agent runs on each system you want to monitor. It creates a minimal SSH server through which it communicates system metrics to the hub.
 
-[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/henrygd/beszel-agent/0.0.1-alpha.3?logo=docker&label=agent%20image%20size)](https://hub.docker.com/r/henrygd/beszel-agent)
-[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/henrygd/beszel/0.0.1-alpha.3?logo=docker&label=hub%20image%20size)](https://hub.docker.com/r/henrygd/beszel)
-
 ## Getting started
 
-If using the binary instead of docker, ignore 4-5 and run the agent using the binary instead.
+If not using docker, ignore 4-5 and run the agent using the binary instead.
 
-1. Start the hub (see [Installation](#installation)). The binary command is `beszel serve`.
+1. Start the hub (see [installation](#installation)).
 2. Open http://localhost:8090 and create an admin user.
 3. Click "Add system." Enter the name and host of the system you want to monitor.
 4. Click "Copy docker compose" to copy the agent's docker-compose.yml file to your clipboard.
@@ -48,9 +39,13 @@ If using the binary instead of docker, ignore 4-5 and run the agent using the bi
 
 If all goes well, you should see the system flip to green. If it goes red, check the Logs page, and see [troubleshooting tips](#faq--troubleshooting).
 
+### Tutoriel en français
+
+Pour le tutoriel en français, consultez https://belginux.com/installer-beszel-avec-docker/
+
 ## Installation
 
-You may choose to install the hub and agent as single binaries, or as docker images.
+You may install the hub and agent as single binaries, or by using Docker.
 
 ### Docker
 
@@ -66,23 +61,38 @@ If you don't need network stats, remove that line from the compose file and map
 
 ### Binary
 
+> [!TIP]
+> If using Linux, see [guides/systemd.md](/supplemental/guides/systemd.md) for a script to install the hub or agent as a system service. The agent installer will be built into the web UI in the future.
+
 Download and run the latest binaries from the [releases page](https://github.com/henrygd/beszel/releases) or use the commands below.
 
-#### Hub:
+#### Hub
 
 ```bash
-curl -sL "https://github.com/henrygd/beszel/releases/latest/download/beszel_$(uname -s)_$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/').tar.gz" | tar -xz -O beszel | tee ./beszel >/dev/null && chmod +x beszel && ls beszel
+curl -sL "https://github.com/henrygd/beszel/releases/latest/download/beszel_$(uname -s)_$(uname -m | sed 's/x86_64/amd64/' | sed 's/armv7l/arm/' | sed 's/aarch64/arm64/').tar.gz" | tar -xz -O beszel | tee ./beszel >/dev/null && chmod +x beszel && ls beszel
 ```
 
-#### Agent:
+Running the hub directly:
 
 ```bash
-curl -sL "https://github.com/henrygd/beszel/releases/latest/download/beszel-agent_$(uname -s)_$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/').tar.gz" | tar -xz -O beszel-agent | tee ./beszel-agent >/dev/null && chmod +x beszel-agent && ls beszel-agent
+./beszel serve
+```
+
+#### Agent
+
+```bash
+curl -sL "https://github.com/henrygd/beszel/releases/latest/download/beszel-agent_$(uname -s)_$(uname -m | sed 's/x86_64/amd64/' | sed 's/armv7l/arm/' | sed 's/aarch64/arm64/').tar.gz" | tar -xz -O beszel-agent | tee ./beszel-agent >/dev/null && chmod +x beszel-agent && ls beszel-agent
+```
+
+Running the agent directly:
+
+```bash
+PORT=45876 KEY="{PASTE_YOUR_KEY}" ./beszel-agent
 ```
 
 #### Updating
 
-Use `beszel update` and `beszel-agent update` to update to the latest version.
+Use `./beszel update` and `./beszel-agent update` to update to the latest version.
 
 ## Environment Variables
 
@@ -94,18 +104,20 @@ Use `beszel update` and `beszel-agent update` to update to the latest version.
 
 ### Agent
 
-| Name         | Default | Description                                                |
-| ------------ | ------- | ---------------------------------------------------------- |
-| `FILESYSTEM` | unset   | Filesystem / partition to use for disk I/O stats           |
-| `KEY`        | unset   | Public SSH key to use for authentication. Provided in hub. |
-| `PORT`       | 45876   | Port to listen on                                          |
+| Name          | Default | Description                                                        |
+| ------------- | ------- | ------------------------------------------------------------------ |
+| `DOCKER_HOST` | unset   | Overrides the docker host (docker.sock) if using a proxy.[^socket] |
+| `FILESYSTEM`  | unset   | Filesystem / partition to use for disk I/O stats.                  |
+| `KEY`         | unset   | Public SSH key to use for authentication. Provided in hub.         |
+| `PORT`        | 45876   | Port or address:port to listen on.                                 |
+
+[^socket]: Beszel only needs access to read container information. For [linuxserver/docker-socket-proxy](https://github.com/linuxserver/docker-socket-proxy) you would set `CONTAINERS=1`.
 
 ## OAuth / OIDC setup
 
-Beszel supports OpenID Connect and many OAuth2 authentication providers (see list below). To enable, do the following:
+Beszel supports OpenID Connect and many OAuth2 authentication providers (see list below).
 
-1. Create an OAuth2 application using your provider of choice. The redirect / callback URL should be `<your-beszel-url>/api/oauth2-redirect`.
-2. When you have the client ID and secret, go to the "Auth providers" page and enable your provider.
+Visit the "Auth providers" page to enable your provider. The redirect / callback URL should be `<your-beszel-url>/api/oauth2-redirect`.
 
 <details>
   <summary>Supported provider list</summary>
@@ -144,15 +156,44 @@ The hub and agent communicate over SSH, so they don't need to be exposed to the
 
 When the hub is started for the first time, it generates an ED25519 key pair.
 
-The agent's SSH server is configured to accept connections only using this key. It does not provide a pty or accept any input, so it is not possible to execute commands on the agent even if your private key is compromised.
+The agent's SSH server is configured to accept connections only using this key. It does not provide a pseudo-terminal or accept input, so it's not possible to execute commands on the agent even if your private key is compromised.
+
+## User roles
+
+### Admin
+
+Assumed to have an admin account in PocketBase, so links to backups, SMTP settings, etc., are shown in the hub.
+
+The first user created automatically becomes an admin and can log into PocketBase.
+
+Please note that changing a user's role will not create a PocketBase admin account for them. If you want to do that, go to Settings > Admins in PocketBase and add them there.
+
+### User
+
+Can create their own systems and alerts. Links to PocketBase settings are not shown in the hub.
+
+### Read only
+
+Cannot create systems, but can view any system that has been shared with them by an admin. Can create alerts.
 
 ## FAQ / Troubleshooting
 
 ### Agent is not connecting
 
-Assuming the agent is running, the connection is probably being blocked by a firewall. You need to add an inbound rule on the agent system to allow TCP connections to the port. Check any active firewalls, like iptables or ufw, and in your cloud provider account if applicable.
+Assuming the agent is running, the connection is probably being blocked by a firewall. You have two options:
 
-Connectivity can be tested by running `telnet <agent-ip> <port>` or `nc -zv <agent-ip> <port>` from a remote machine.
+1. Add an inbound rule to the agent system's firewall(s) to allow TCP connections to the port. Check any active firewalls, like iptables, and in your cloud provider account if applicable.
+2. Alternatively, software like [Cloudflare Tunnel](https://www.cloudflare.com/products/tunnel/), [WireGuard](https://www.wireguard.com/), or [Tailscale](https://tailscale.com/) can be used to securely bypass your firewall.
+
+Connectivity can be tested by running `telnet <agent-ip> <port>`.
+
+### Connecting the hub and agent on the same system using Docker
+
+If using host network mode for the agent but not the hub, you can add your system using the hostname `host.docker.internal`, which resolves to the internal IP address used by the host. See [example docker-compose.yml](/supplemental/docker/same-system/docker-compose.yml).
+
+If using host network for both, you can use `localhost` as the hostname.
+
+Otherwise you can use the agent's `container_name` as the hostname if both are in the same docker network.
 
 ### Finding the correct filesystem
 
@@ -164,8 +205,60 @@ If it's not set, the agent will try to find the filesystem mounted on `/` and us
 - Run `lsblk` and choose an option under "NAME"
 - Run `sudo fdisk -l` and choose an option under "Device"
 
+### Docker containers are not populating reliably
+
+Try upgrading your docker version on the agent system. I had this issue on a machine running version 24. It was fixed by upgrading to version 27.
+
 ### Month / week records are not populating reliably
 
 Records for longer time periods are made by averaging stats from the shorter time periods. They require the agent to be running uninterrupted for long enough to get a full set of data.
 
 If you pause / unpause the agent for longer than one minute, the data will be incomplete and the timing for the current interval will reset.
+
+## Compiling
+
+Both the hub and agent are written in Go, so you can easily build them yourself, or cross-compile for different platforms. Please [install Go](https://go.dev/doc/install) first if you haven't already.
+
+### Agent
+
+```bash
+cd agent
+# prepare / install dependencies
+go mod tidy
+# create a binary in the current directory
+CGO_ENABLED=0 go build -ldflags "-w -s" .
+```
+
+### Hub
+
+The hub embeds the web UI in the binary, so you must build the website first. I use [Bun](https://bun.sh/), but you may use Node.js if you prefer:
+
+```bash
+cd hub/site
+bun install
+bun run build
+```
+
+Then back in the hub directory:
+
+```bash
+go mod tidy
+CGO_ENABLED=0 go build -ldflags "-w -s" .
+```
+
+### Cross-compiling
+
+You can cross-compile for different platforms using the `GOOS` and `GOARCH` environment variables.
+
+For example, to build for Linux ARM64:
+
+```bash
+GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "-w -s" .
+```
+
+You can see a list of valid options by running `go tool dist list`.
+
+<!--
+## Support
+
+My country, the USA, and many others, are actively involved in the genocide of the Palestinian people. I would greatly appreciate any effort you could make to pressure your government to stop enabling this violence. -->

supplemental/docker/same-system/docker-compose.yml

@@ -0,0 +1,23 @@
+services:
+  beszel:
+    image: 'henrygd/beszel'
+    container_name: 'beszel'
+    restart: unless-stopped
+    ports:
+      - '8090:8090'
+    volumes:
+      - ./beszel_data:/beszel_data
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+
+  beszel-agent:
+    image: 'henrygd/beszel-agent'
+    container_name: 'beszel-agent'
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      PORT: 45876
+      KEY: '...'
+      # FILESYSTEM: /dev/sda1 # set to the correct filesystem for disk I/O stats

supplemental/guides/systemd.md

@@ -0,0 +1,127 @@
+# Installing as a Linux systemd service
+
+This is useful if you want to run the hub or agent in the background continuously, including after a reboot.
+
+## Install script (recommended)
+
+There are two scripts, one for the hub and one for the agent. You can run either one, or both.
+
+The install script creates a dedicated user for the service (`beszel`), downloads the latest release, and installs the service.
+
+> [!NOTE]
+> You need system administrator privileges to run the install script. If you encounter a problem, please [open an issue](https://github.com/henrygd/beszel/issues/new).
+
+### Hub
+
+Download the script:
+
+```bash
+curl -sL https://raw.githubusercontent.com/henrygd/beszel/main/supplemental/scripts/install-hub.sh -o install-hub.sh && chmod +x install-hub.sh
+```
+
+#### Install
+
+```bash
+./install-hub.sh
+```
+
+#### Uninstall
+
+```bash
+./install-hub.sh -u
+```
+
+#### Update
+
+```bash
+sudo /opt/beszel/beszel update && sudo systemctl restart beszel
+```
+
+### Agent
+
+Download the script:
+
+```bash
+curl -sL https://raw.githubusercontent.com/henrygd/beszel/main/supplemental/scripts/install-agent.sh -o install-agent.sh && chmod +x install-agent.sh
+```
+
+#### Install
+
+You may optionally include the SSH key and port as arguments. Run `./install-agent.sh -h` for more info.
+
+If specifying your key with `-k`, please make sure to enclose it in quotes.
+
+```bash
+./install-agent.sh
+```
+
+#### Uninstall
+
+```bash
+./install-agent.sh -u
+```
+
+#### Update
+
+```bash
+sudo /opt/beszel-agent/beszel-agent update && sudo systemctl restart beszel-agent
+```
+
+## Manual install
+
+1. Create the system service at `/etc/systemd/system/beszel.service`
+
+```bash
+[Unit]
+Description=Beszel Hub Service
+After=network.target
+
+[Service]
+# update the values in the curly braces below (remove the braces)
+ExecStart={/path/to/working/directory}/beszel serve
+WorkingDirectory={/path/to/working/directory}
+User={YOUR_USERNAME}
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+```
+
+2. Start and enable the service to let it run after system boot
+
+```bash
+sudo systemctl daemon-reload
+sudo systemctl enable beszel.service
+sudo systemctl start beszel.service
+```
+
+## Run the agent as a system service (Linux)
+
+This runs the agent in the background continuously using systemd.
+
+1. Create the system service at `/etc/systemd/system/beszel-agent.service`
+
+```bash
+[Unit]
+Description=Beszel Agent Service
+After=network.target
+
+[Service]
+# update the values in curly braces below (remove the braces)
+Environment="PORT={PASTE_YOUR_PORT_HERE}"
+Environment="KEY={PASTE_YOUR_KEY_HERE}"
+ExecStart={/path/to/directory}/beszel-agent
+User={YOUR_USERNAME}
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+```
+
+2. Start and enable the service to let it run after system boot
+
+```bash
+sudo systemctl daemon-reload
+sudo systemctl enable beszel-agent.service
+sudo systemctl start beszel-agent.service
+```

supplemental/scripts/install-agent.sh

@@ -0,0 +1,134 @@
+#!/bin/bash
+version=0.0.1
+# Define default values
+PORT=45876
+
+# Read command line options
+while getopts ":k:p:uh" opt; do
+  case $opt in
+    k) KEY="$OPTARG";;
+    p) PORT="$OPTARG";;
+    u) UNINSTALL="true";;
+    h) printf "Beszel Agent installation script\n\n"
+       printf "Usage: ./install-agent.sh [options]\n\n"
+       printf "Options: \n"
+       printf "  -k  : SSH key (required, or interactive if not provided)\n"
+       printf "  -p  : Port (default: $PORT)\n"
+       printf "  -u  : Uninstall the Beszel Agent\n"
+       printf "  -h  : Display this help message\n"
+       exit 0;;
+    \?) echo "Invalid option: -$OPTARG"; exit 1;;
+  esac
+done
+
+if [ "$UNINSTALL" = "true" ]; then
+  # Stop and disable the Beszel Agent service
+  echo "Stopping and disabling the Beszel Agent service..."
+  sudo systemctl stop beszel-agent.service
+  sudo systemctl disable beszel-agent.service
+
+  # Remove the systemd service file
+  echo "Removing the systemd service file..."
+  sudo rm /etc/systemd/system/beszel-agent.service
+
+  # Reload the systemd daemon
+  echo "Reloading the systemd daemon..."
+  sudo systemctl daemon-reload
+
+  # Remove the Beszel Agent directory
+  echo "Removing the Beszel Agent directory..."
+  sudo rm -rf /opt/beszel-agent
+
+  # Remove the dedicated user for the Beszel Agent service
+  echo "Removing the dedicated user for the Beszel Agent service..."
+  sudo userdel beszel
+
+  echo "The Beszel Agent has been uninstalled successfully!"
+else
+  # Function to check if a package is installed
+  package_installed() {
+    command -v "$1" >/dev/null 2>&1
+  }
+
+  # Check for package manager and install necessary packages if not installed
+  if package_installed apt-get; then
+    if ! package_installed tar || ! package_installed curl; then
+      sudo apt-get update
+      sudo apt-get install -y tar curl
+    fi
+  elif package_installed yum; then
+    if ! package_installed tar || ! package_installed curl; then
+      sudo yum install -y tar curl
+    fi
+  elif package_installed pacman; then
+    if ! package_installed tar || ! package_installed curl; then
+      sudo pacman -Sy --noconfirm tar curl
+    fi
+  else
+    echo "Warning: Please ensure 'tar' and 'curl' are installed."
+  fi
+
+  # If no SSH key is provided, ask for the SSH key interactively
+  if [ -z "$KEY" ]; then
+    read -p "Enter your SSH key: " KEY
+  fi
+
+  # Create a dedicated user for the service if it doesn't exist
+  if ! id -u beszel > /dev/null 2>&1; then
+    echo "Creating a dedicated user for the Beszel Agent service..."
+    sudo useradd -M -s /bin/false beszel
+  fi
+  # Add the user to the docker group to allow access to the Docker socket
+  sudo usermod -aG docker beszel
+
+  # Create the directory for the Beszel Agent
+  if [ ! -d "/opt/beszel-agent" ]; then
+    echo "Creating the directory for the Beszel Agent..."
+    sudo mkdir -p /opt/beszel-agent
+    sudo chown beszel:beszel /opt/beszel-agent
+    sudo chmod 755 /opt/beszel-agent
+  fi
+
+  # Download and install the Beszel Agent
+  echo "Downloading and installing the Beszel Agent..."
+  curl -sL "https://github.com/henrygd/beszel/releases/latest/download/beszel-agent_$(uname -s)_$(uname -m | sed 's/x86_64/amd64/' | sed 's/armv7l/arm/' | sed 's/aarch64/arm64/').tar.gz" | tar -xz -O beszel-agent | tee ./beszel-agent >/dev/null
+  sudo mv ./beszel-agent /opt/beszel-agent/beszel-agent
+  sudo chown beszel:beszel /opt/beszel-agent/beszel-agent
+  sudo chmod 755 /opt/beszel-agent/beszel-agent
+
+  # Create the systemd service
+  echo "Creating the systemd service for the Beszel Agent..."
+  sudo tee /etc/systemd/system/beszel-agent.service <<EOF
+[Unit]
+Description=Beszel Agent Service
+After=network.target
+
+[Service]
+Environment="PORT=$PORT"
+Environment="KEY=$KEY"
+ExecStart=/opt/beszel-agent/beszel-agent
+User=beszel
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+  # Load and start the service
+  printf "\nLoading and starting the Beszel Agent service...\n"
+  sudo systemctl daemon-reload
+  sudo systemctl enable beszel-agent.service
+  sudo systemctl start beszel-agent.service
+
+  # Wait for the service to start or fail
+  sleep 1
+
+  # Check if the service is running
+  if [ "$(systemctl is-active beszel-agent.service)" != "active" ]; then
+    echo "Error: The Beszel Agent service is not running."
+    echo "$(systemctl status beszel-agent.service)"
+    exit 1
+  fi
+
+  echo "The Beszel Agent has been installed and configured successfully! It is now running on port $PORT."
+fi

supplemental/scripts/install-hub.sh

@@ -0,0 +1,117 @@
+#!/bin/bash
+version=0.0.1
+# Define default values
+
+# Read command line options
+while getopts ":uh" opt; do
+  case $opt in
+    u) UNINSTALL="true";;
+    h) printf "Beszel Hub installation script\n\n";
+       printf "Usage: ./install-hub.sh [options]\n\n";
+       printf "Options: \n"
+       printf "  -u  : Uninstall the Beszel Hub\n";
+       echo "  -h  : Display this help message";
+       exit 0;;
+    \?) echo "Invalid option: -$OPTARG"; exit 1;;
+  esac
+done
+
+if [ "$UNINSTALL" = "true" ]; then
+  # Stop and disable the Beszel Hub service
+  echo "Stopping and disabling the Beszel Hub service..."
+  sudo systemctl stop beszel-hub.service
+  sudo systemctl disable beszel-hub.service
+
+  # Remove the systemd service file
+  echo "Removing the systemd service file..."
+  sudo rm /etc/systemd/system/beszel-hub.service
+
+  # Reload the systemd daemon
+  echo "Reloading the systemd daemon..."
+  sudo systemctl daemon-reload
+
+  # Remove the Beszel Hub binary
+  echo "Removing the Beszel Hub binary..."
+  sudo rm /opt/beszel/beszel
+
+  # Remove the Beszel Hub directory
+  echo "Removing the Beszel Hub directory..."
+  sudo rm -rf /opt/beszel
+
+  # Remove the dedicated user
+  echo "Removing the dedicated user..."
+  sudo userdel beszel
+
+  echo "The Beszel Hub has been uninstalled successfully!"
+else
+  # Function to check if a package is installed
+  package_installed() {
+    command -v "$1" >/dev/null 2>&1
+  }
+
+  # Check for package manager and install necessary packages if not installed
+  if package_installed apt-get; then
+    if ! package_installed tar || ! package_installed curl; then
+      sudo apt-get update
+      sudo apt-get install -y tar curl
+    fi
+  elif package_installed yum; then
+    if ! package_installed tar || ! package_installed curl; then
+      sudo yum install -y tar curl
+    fi
+  elif package_installed pacman; then
+    if ! package_installed tar || ! package_installed curl; then
+      sudo pacman -Sy --noconfirm tar curl
+    fi
+  else
+    echo "Warning: Please ensure 'tar' and 'curl' are installed."
+  fi
+
+  # Create a dedicated user for the service if it doesn't exist
+  if ! id -u beszel > /dev/null 2>&1; then
+    echo "Creating a dedicated user for the Beszel Hub service..."
+    sudo useradd -M -s /bin/false beszel
+  fi
+
+  # Download and install the Beszel Hub
+  echo "Downloading and installing the Beszel Hub..."
+  curl -sL "https://github.com/henrygd/beszel/releases/latest/download/beszel_$(uname -s)_$(uname -m | sed 's/x86_64/amd64/' | sed 's/armv7l/arm/' | sed 's/aarch64/arm64/').tar.gz" | tar -xz -O beszel | tee ./beszel >/dev/null && chmod +x beszel
+  sudo mkdir -p /opt/beszel/beszel_data
+  sudo mv ./beszel /opt/beszel/beszel
+  sudo chown -R beszel:beszel /opt/beszel
+
+  # Create the systemd service
+  printf "Creating the systemd service for the Beszel Hub...\n\n"
+  sudo tee /etc/systemd/system/beszel-hub.service <<EOF
+[Unit]
+Description=Beszel Hub Service
+After=network.target
+
+[Service]
+ExecStart=/opt/beszel/beszel serve
+WorkingDirectory=/opt/beszel
+User=beszel
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+  # Load and start the service
+  printf "\nLoading and starting the Beszel Hub service...\n"
+  sudo systemctl daemon-reload
+  sudo systemctl enable beszel-hub.service
+  sudo systemctl start beszel-hub.service
+
+  # Wait for the service to start or fail
+  sleep 2
+
+  # Check if the service is running
+  if [ "$(systemctl is-active beszel-hub.service)" != "active" ]; then
+    echo "Error: The Beszel Hub service is not running."
+    echo "$(systemctl status beszel-hub.service)"
+    exit 1
+  fi
+
+  echo "The Beszel Hub has been installed and configured successfully! It is now accessible on port 8090."
+fi