Lightweight server monitoring with historical data, docker stats, and alerts.
chore(deps): move PocketBase to ganigeorgiev.com module path (#2836)
Sven van Ginkeld21e60b6afb4
diff --git a/go.mod b/go.modindex b8f7ad498..8fb547f99 100644--- a/go.mod+++ b/go.mod@@ -3,6 +3,8 @@ module github.com/henrygd/beszelgo 1.27.3require (+ ganigeorgiev.com/pocketbase/dbx v1.13.0+ ganigeorgiev.com/pocketbase/pocketbase v0.42.2github.com/blang/semver v3.5.1+incompatiblegithub.com/coreos/go-systemd/v22 v22.7.0github.com/distribution/reference v0.6.0@@ -15,8 +17,6 @@ require (github.com/mdlayher/wifi v0.10.0github.com/nicholas-fedor/shoutrrr v0.23.0github.com/opencontainers/go-digest v1.0.0- github.com/pocketbase/dbx v1.12.0- github.com/pocketbase/pocketbase v0.40.6github.com/safchain/ethtool v0.7.0github.com/shirou/gopsutil/v4 v4.26.10github.com/spf13/cast v1.10.0@@ -33,6 +33,8 @@ require ()require (+ ganigeorgiev.com/fexpr v0.7.0 // indirect+ ganigeorgiev.com/pocketbase/ozzo-validation/v4 v4.4.1 // indirectgithub.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirectgithub.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirectgithub.com/disintegration/imaging v1.6.2 // indirect@@ -42,7 +44,6 @@ require (github.com/fatih/color v1.19.0 // indirectgithub.com/fsnotify/fsnotify v1.10.1 // indirectgithub.com/gabriel-vasile/mimetype v1.4.16 // indirect- github.com/ganigeorgiev/fexpr v0.6.0 // indirectgithub.com/go-ole/go-ole v1.3.0 // indirectgithub.com/go-sql-driver/mysql v1.9.1 // indirectgithub.com/godbus/dbus/v5 v5.2.4 // indirect@@ -57,7 +58,6 @@ require (github.com/mattn/go-isatty v0.0.24 // indirectgithub.com/mdlayher/socket v0.8.0 // indirectgithub.com/ncruces/go-strftime v1.1.0 // indirect- github.com/pocketbase/ozzo-validation/v4 v4.3.0 // indirectgithub.com/power-devops/perfstat v0.0.0-20260916203055-22a1a467d9f0 // indirectgithub.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirectgithub.com/tklauser/go-sysconf v0.4.0 // indirect@@ -75,8 +75,8 @@ require (mellium.im/sasl v0.3.2 // indirectmellium.im/xmlstream v0.15.4 // indirectmellium.im/xmpp v0.23.0 // indirect- modernc.org/libc v1.77.1 // indirect+ modernc.org/libc v1.80.1 // indirectmodernc.org/mathutil v1.7.1 // indirectmodernc.org/memory v1.12.1 // indirect- modernc.org/sqlite v1.60.1 // indirect+ modernc.org/sqlite v1.62.0 // indirect)diff --git a/go.sum b/go.sumindex 0e63e0993..12ca5a1c5 100644--- a/go.sum+++ b/go.sum@@ -1,5 +1,13 @@filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=+ganigeorgiev.com/fexpr v0.7.0 h1:Os5bP9dU13UNo5qDTsTPTTkodLM96kO52WIEmMmCt30=+ganigeorgiev.com/fexpr v0.7.0/go.mod h1:XrG5iYw+AGq55zq2+QY1zQvO+ovbEca08u7q0hucPdY=+ganigeorgiev.com/pocketbase/dbx v1.13.0 h1:t8S5CaMv93tEOqaOToFaVQ994zldshdhIrVHKmxRjwc=+ganigeorgiev.com/pocketbase/dbx v1.13.0/go.mod h1:QefEiWbbE/YoSipLGg33FbNc/GAX/2f3ymz02j2MGKo=+ganigeorgiev.com/pocketbase/ozzo-validation/v4 v4.4.1 h1:teL3Lw7HCGZRdIQdqE/gV5DueFaN5Wj+/r4Ewg3M2WA=+ganigeorgiev.com/pocketbase/ozzo-validation/v4 v4.4.1/go.mod h1:oV1SPPkS3PlKYYj+r9YDs48ooAWgC736cuFanXDXxbM=+ganigeorgiev.com/pocketbase/pocketbase v0.42.2 h1:OBrrcVlHD5ZC2ZTFbKr2YkS0mUROGf+TkLbverK7CxQ=+ganigeorgiev.com/pocketbase/pocketbase v0.42.2/go.mod h1:LMEzz1Xl6jsSmJCiWczZ3K7SI+O42MEcfYlxhPGHwTw=github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=@@ -33,8 +41,6 @@ github.com/fxamacker/cbor/v2 v2.10.0 h1:HVF3T5vYwLqO81ebPirWEPNv2SMrUMD3HLnKgEr6github.com/fxamacker/cbor/v2 v2.10.0/go.mod h1:uSwlToFuT9BZAKRxxVm3qQC8DR4tlWl7D6pf20iRYH4=github.com/gabriel-vasile/mimetype v1.4.16 h1:5izNFuvA37st1dDRAcA7TtmngBmRgiIPDmTtiEvjx1E=github.com/gabriel-vasile/mimetype v1.4.16/go.mod h1:3oFFwxX8kTklZwzIl2aQEDZT0lKY8xH92ST88bAwba4=-github.com/ganigeorgiev/fexpr v0.6.0 h1:Fza3O/QMBKEudUvxV862qe6GjxM60GJjjKytdp+VQus=-github.com/ganigeorgiev/fexpr v0.6.0/go.mod h1:RyGiGqmeXhEQ6+mlGdnUleLHgtzzu/VGO2WtJkF5drE=github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=@@ -92,12 +98,6 @@ github.com/nicholas-fedor/shoutrrr v0.23.0/go.mod h1:JB8tJB46KFrkUuF8s7FvY9HBg+Zgithub.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=-github.com/pocketbase/dbx v1.12.0 h1:/oLErM+A0b4xI0PWTGPqSDVjzix48PqI/bng2l0PzoA=-github.com/pocketbase/dbx v1.12.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs=-github.com/pocketbase/ozzo-validation/v4 v4.3.0 h1:uKBDVma7bZqgR2a6AwE+k9hkuDFfiZMpBHQdZ1z3iQs=-github.com/pocketbase/ozzo-validation/v4 v4.3.0/go.mod h1:6XNjSTw/Jb2F8LOkKO3oyzIWExbrGiYoS4uVxVwz90g=-github.com/pocketbase/pocketbase v0.40.6 h1:/Ol0iIZNdPzUdzMPDVCYuIgYYC9NhMpk/1T2KYRGM8A=-github.com/pocketbase/pocketbase v0.40.6/go.mod h1:xfE8K+hqzlUxjbtC/VxqHrFxWWO+6wu4sk+L8Wc6Amg=github.com/power-devops/perfstat v0.0.0-20260916203055-22a1a467d9f0 h1:XA01Vk/wv9YikCi1V51yRzIHPMT5of9+cMpZoZvDn/M=github.com/power-devops/perfstat v0.0.0-20260916203055-22a1a467d9f0/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=@@ -184,20 +184,20 @@ mellium.im/xmlstream v0.15.4 h1:gLKxcWl4rLMUpKgtzrTBvr4OexPeO/edYus+uK3F6ZI=mellium.im/xmlstream v0.15.4/go.mod h1:yXaCW2++fmVO4L9piKVkyLDqnCmictVYF7FDQW8prb4=mellium.im/xmpp v0.23.0 h1:rvKvOvMdIURCLaAWEJN8J0QpO3AJYCDKjxLsqtTPSjY=mellium.im/xmpp v0.23.0/go.mod h1:GHDKlKKQe0LNmD9YqExyxnFEEBiz84KGqnfiA2VNzb8=-modernc.org/cc/v4 v4.29.7 h1:q+NXGJ0bK3b4TXFYQQVr9pYETGnmwFWkrUzJnMya/Tg=-modernc.org/cc/v4 v4.29.7/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=-modernc.org/ccgo/v4 v4.36.1 h1:ZNIUZAryN0UgnJwtyxrdEzcFc3yD4Cu4AzjfPXsLsIE=-modernc.org/ccgo/v4 v4.36.1/go.mod h1:rrtGc2QkS239nYb/mQNuBMyjq3/y3ZXWbBjPoV3wqzA=+modernc.org/cc/v4 v4.30.6-0.20261101114202-1b9d1a076f6b h1:WE5SLOURcNd8s6uPR/n4WV4weQxxYKi5OpEZkfNVvdE=+modernc.org/cc/v4 v4.30.6-0.20261101114202-1b9d1a076f6b/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=+modernc.org/ccgo/v4 v4.38.1 h1:wdxJVBuFT8JufZnnQyS6Bbz3NOWhViD0xJOGR96Bpd4=+modernc.org/ccgo/v4 v4.38.1/go.mod h1:kOpEkJRbFwBvjUWwn4j1j9B7iFHbl1+orhgTMCDkDBk=modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM=modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU=modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=-modernc.org/gc/v3 v3.1.5 h1:21ldfPfRYE31Tb7B3mwAK8gy1AxP4+dKjrOQPfqakoc=-modernc.org/gc/v3 v3.1.5/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=+modernc.org/gc/v3 v3.2.0 h1:/Y3LGDMQaoYf55PebP1qsZ5FDGgAZyG1RYKEHeQzh1o=+modernc.org/gc/v3 v3.2.0/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=-modernc.org/libc v1.77.1 h1:Ct8j47QtiZ1Enj2DtFXQtUqrPCAjdCmPjtCuvrYQ0Hs=-modernc.org/libc v1.77.1/go.mod h1:87/pZ4L6nD1zqW4nItuS12YO7hN1igAah34xjnQo/W0=+modernc.org/libc v1.80.1 h1:ejn7HtTV3GknNKbklqWQ1nvUrfX8mTxs1D+xp/JQwy4=+modernc.org/libc v1.80.1/go.mod h1:pvo25Rs3OJEbDqhUV9jdEGevxeLJrJeDmNid/AcQV1g=modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=modernc.org/memory v1.12.1 h1:nFMiWrpStgZczNl6XI9GnIk/rWhYIyHGUaR04pGbp9g=@@ -206,8 +206,8 @@ modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=-modernc.org/sqlite v1.60.1 h1:/blz53O951KWFOso4QQvEs/Fq6cDBKLtMVrYNSeJVKw=-modernc.org/sqlite v1.60.1/go.mod h1:1dIoEagfDE72QytD5scH1lxARtaUgKgHC/NuApA27r0=+modernc.org/sqlite v1.62.0 h1:gMaCjSM1qpl+iOjiWhR1LYP3zqrYDI+5GYLGt6veP2g=+modernc.org/sqlite v1.62.0/go.mod h1:Jzjh1mt4s0HuQ0KvtB1LIuHiGRmU2D5pgj8dUhW7/SE=modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=diff --git a/internal/alerts/alerts.go b/internal/alerts/alerts.goindex c60746ba4..be60d865c 100644--- a/internal/alerts/alerts.go+++ b/internal/alerts/alerts.go@@ -8,11 +8,11 @@ import ("sync""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/mailer""github.com/henrygd/beszel/internal/email""github.com/nicholas-fedor/shoutrrr"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/mailer")type hubLike interface {diff --git a/internal/alerts/alerts_access_test.go b/internal/alerts/alerts_access_test.goindex 03f35b306..cc54f93fd 100644--- a/internal/alerts/alerts_access_test.go+++ b/internal/alerts/alerts_access_test.go@@ -10,13 +10,13 @@ import ("testing/synctest""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/alerts""github.com/henrygd/beszel/internal/entities/monitor""github.com/henrygd/beszel/internal/entities/system"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_api.go b/internal/alerts/alerts_api.goindex 4d21b39be..b84936d0c 100644--- a/internal/alerts/alerts_api.go+++ b/internal/alerts/alerts_api.go@@ -6,10 +6,10 @@ import ("net/http""slices"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/hub/utils""github.com/nicholas-fedor/shoutrrr"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core")// UpsertUserAlerts handles API request to create or update alerts for a userdiff --git a/internal/alerts/alerts_api_test.go b/internal/alerts/alerts_api_test.goindex 4897b1811..6e525e7c0 100644--- a/internal/alerts/alerts_api_test.go+++ b/internal/alerts/alerts_api_test.go@@ -13,11 +13,11 @@ import ("testing""testing/synctest"+ pbTests "ganigeorgiev.com/pocketbase/pocketbase/tests"beszelTests "github.com/henrygd/beszel/internal/tests"- pbTests "github.com/pocketbase/pocketbase/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"diff --git a/internal/alerts/alerts_battery_test.go b/internal/alerts/alerts_battery_test.goindex acc5a4c9e..ef96af38a 100644--- a/internal/alerts/alerts_battery_test.go+++ b/internal/alerts/alerts_battery_test.go@@ -11,8 +11,8 @@ import ("github.com/henrygd/beszel/internal/entities/system"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/tools/types"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_cache.go b/internal/alerts/alerts_cache.goindex 0dfcd5025..590daca2c 100644--- a/internal/alerts/alerts_cache.go+++ b/internal/alerts/alerts_cache.go@@ -4,9 +4,9 @@ import ("sync""time"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/store"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/store")// CachedAlertData represents the relevant fields of an alert record for status checking and updates.diff --git a/internal/alerts/alerts_container.go b/internal/alerts/alerts_container.goindex 6e5d1ba81..922012a8d 100644--- a/internal/alerts/alerts_container.go+++ b/internal/alerts/alerts_container.go@@ -9,7 +9,7 @@ import ("github.com/henrygd/beszel/internal/entities/container""github.com/henrygd/beszel/internal/entities/system"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core")const (diff --git a/internal/alerts/alerts_container_test.go b/internal/alerts/alerts_container_test.goindex ee5bdd494..557b03610 100644--- a/internal/alerts/alerts_container_test.go+++ b/internal/alerts/alerts_container_test.go@@ -9,11 +9,11 @@ import ("testing/synctest""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/alerts""github.com/henrygd/beszel/internal/entities/container""github.com/henrygd/beszel/internal/entities/system"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_disk_test.go b/internal/alerts/alerts_disk_test.goindex 5c9a57389..3dfc3e6cb 100644--- a/internal/alerts/alerts_disk_test.go+++ b/internal/alerts/alerts_disk_test.go@@ -11,8 +11,8 @@ import ("github.com/henrygd/beszel/internal/entities/system"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/tools/types"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_history.go b/internal/alerts/alerts_history.goindex d8283f3c3..78db2c169 100644--- a/internal/alerts/alerts_history.go+++ b/internal/alerts/alerts_history.go@@ -3,8 +3,8 @@ package alertsimport ("time"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// On triggered alert record delete, set matching alert history record to resolveddiff --git a/internal/alerts/alerts_network_monitor_cert_test.go b/internal/alerts/alerts_network_monitor_cert_test.goindex 154cff894..1c41cc8a3 100644--- a/internal/alerts/alerts_network_monitor_cert_test.go+++ b/internal/alerts/alerts_network_monitor_cert_test.go@@ -7,12 +7,12 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbTests "ganigeorgiev.com/pocketbase/pocketbase/tests""github.com/henrygd/beszel/internal/alerts""github.com/henrygd/beszel/internal/entities/monitor"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- pbTests "github.com/pocketbase/pocketbase/tests""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_network_monitors.go b/internal/alerts/alerts_network_monitors.goindex 3e6612c0e..34615e186 100644--- a/internal/alerts/alerts_network_monitors.go+++ b/internal/alerts/alerts_network_monitors.go@@ -10,9 +10,9 @@ import ("strconv""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/entities/monitor"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core")const (diff --git a/internal/alerts/alerts_network_monitors_test.go b/internal/alerts/alerts_network_monitors_test.goindex 0331d822c..16c38ae8c 100644--- a/internal/alerts/alerts_network_monitors_test.go+++ b/internal/alerts/alerts_network_monitors_test.go@@ -8,12 +8,12 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbTests "ganigeorgiev.com/pocketbase/pocketbase/tests""github.com/henrygd/beszel/internal/alerts""github.com/henrygd/beszel/internal/entities/monitor"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- pbTests "github.com/pocketbase/pocketbase/tests""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_quiet_hours_test.go b/internal/alerts/alerts_quiet_hours_test.goindex b58043462..a5bdbbdd9 100644--- a/internal/alerts/alerts_quiet_hours_test.go+++ b/internal/alerts/alerts_quiet_hours_test.go@@ -10,7 +10,7 @@ import ("github.com/henrygd/beszel/internal/alerts"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/dbx""github.com/stretchr/testify/assert")diff --git a/internal/alerts/alerts_smart.go b/internal/alerts/alerts_smart.goindex 1de6b2fd9..286646360 100644--- a/internal/alerts/alerts_smart.go+++ b/internal/alerts/alerts_smart.go@@ -4,7 +4,7 @@ import ("fmt""strings"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// handleSmartDeviceAlert sends alerts when a SMART device state worsens into WARNING/FAILED.diff --git a/internal/alerts/alerts_status.go b/internal/alerts/alerts_status.goindex f6c8258c4..9ba2c4894 100644--- a/internal/alerts/alerts_status.go+++ b/internal/alerts/alerts_status.go@@ -5,7 +5,7 @@ import ("strings""time"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core")type alertInfo struct {diff --git a/internal/alerts/alerts_status_test.go b/internal/alerts/alerts_status_test.goindex a4cddd26b..5d93b94ff 100644--- a/internal/alerts/alerts_status_test.go+++ b/internal/alerts/alerts_status_test.go@@ -7,10 +7,10 @@ import ("testing/synctest""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/alerts"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_system.go b/internal/alerts/alerts_system.goindex 8de3ccd9f..e490ee70f 100644--- a/internal/alerts/alerts_system.go+++ b/internal/alerts/alerts_system.go@@ -8,9 +8,9 @@ import ("github.com/henrygd/beszel/internal/entities/system"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/types"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types")var cpuStateAlerts = map[string]struct {diff --git a/internal/alerts/alerts_systemd.go b/internal/alerts/alerts_systemd.goindex 271cc2554..87ae8027a 100644--- a/internal/alerts/alerts_systemd.go+++ b/internal/alerts/alerts_systemd.go@@ -7,8 +7,8 @@ import ("github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/entities/systemd"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// alertNameSystemdFailed is the alerts.name value for the failed systemd services alert.diff --git a/internal/alerts/alerts_systemd_test.go b/internal/alerts/alerts_systemd_test.goindex 7d8a119be..9227a7d06 100644--- a/internal/alerts/alerts_systemd_test.go+++ b/internal/alerts/alerts_systemd_test.go@@ -6,12 +6,12 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/alerts"systemEntity "github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/entities/systemd"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_test.go b/internal/alerts/alerts_test.goindex 7945fd146..a608fcbe3 100644--- a/internal/alerts/alerts_test.go+++ b/internal/alerts/alerts_test.go@@ -9,8 +9,8 @@ import (beszelTests "github.com/henrygd/beszel/internal/tests"+ "ganigeorgiev.com/pocketbase/dbx""github.com/henrygd/beszel/internal/alerts"- "github.com/pocketbase/dbx""github.com/stretchr/testify/assert")diff --git a/internal/alerts/alerts_test_helpers.go b/internal/alerts/alerts_test_helpers.goindex 7fa7dd44c..fd59c069c 100644--- a/internal/alerts/alerts_test_helpers.go+++ b/internal/alerts/alerts_test_helpers.go@@ -6,7 +6,7 @@ import ("sync""time"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core")func NewTestAlertManagerWithoutWorker(app hubLike) *AlertManager {diff --git a/internal/alerts/alerts_webhooks_test.go b/internal/alerts/alerts_webhooks_test.goindex e75a58c97..a512e7de6 100644--- a/internal/alerts/alerts_webhooks_test.go+++ b/internal/alerts/alerts_webhooks_test.go@@ -8,9 +8,9 @@ import ("sync/atomic""testing"+ "ganigeorgiev.com/pocketbase/dbx""github.com/henrygd/beszel/internal/alerts"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_zfs.go b/internal/alerts/alerts_zfs.goindex af3da336c..7c0966b33 100644--- a/internal/alerts/alerts_zfs.go+++ b/internal/alerts/alerts_zfs.go@@ -4,8 +4,8 @@ import ("fmt""time"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// handleZfsPoolAlert sends alerts when a ZFS pool health state worsens anddiff --git a/internal/alerts/alerts_zfs_disk_test.go b/internal/alerts/alerts_zfs_disk_test.goindex 46ad528b1..058452c17 100644--- a/internal/alerts/alerts_zfs_disk_test.go+++ b/internal/alerts/alerts_zfs_disk_test.go@@ -11,8 +11,8 @@ import ("github.com/henrygd/beszel/internal/entities/system"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/tools/types"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/alerts_zfs_test.go b/internal/alerts/alerts_zfs_test.goindex 5c2af0af1..d018e374c 100644--- a/internal/alerts/alerts_zfs_test.go+++ b/internal/alerts/alerts_zfs_test.go@@ -6,8 +6,8 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/alerts/network_monitor_cache.go b/internal/alerts/network_monitor_cache.goindex e449c58c7..d156ac205 100644--- a/internal/alerts/network_monitor_cache.go+++ b/internal/alerts/network_monitor_cache.go@@ -4,10 +4,10 @@ import ("encoding/json""sync"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/henrygd/beszel/internal/entities/monitor"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/types")// cachedMonitor holds the monitor fields needed for the alert fast path.diff --git a/internal/cmd/hub/hub.go b/internal/cmd/hub/hub.goindex e85a9a89d..398153bb9 100644--- a/internal/cmd/hub/hub.go+++ b/internal/cmd/hub/hub.go@@ -12,8 +12,8 @@ import ("github.com/henrygd/beszel/internal/hub"_ "github.com/henrygd/beszel/internal/migrations"- "github.com/pocketbase/pocketbase"- "github.com/pocketbase/pocketbase/plugins/migratecmd"+ "ganigeorgiev.com/pocketbase/pocketbase"+ "ganigeorgiev.com/pocketbase/pocketbase/plugins/migratecmd""github.com/spf13/cobra")diff --git a/internal/email/auth_email_test.go b/internal/email/auth_email_test.goindex e12005148..be985fda8 100644--- a/internal/email/auth_email_test.go+++ b/internal/email/auth_email_test.go@@ -6,8 +6,8 @@ import ("os""testing"+ "ganigeorgiev.com/pocketbase/pocketbase/mails"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/pocketbase/mails""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/email/email.go b/internal/email/email.goindex 737074caf..949cc1d71 100644--- a/internal/email/email.go+++ b/internal/email/email.go@@ -6,7 +6,7 @@ import ("html/template""strings"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core")var (diff --git a/internal/hub/agent_connect.go b/internal/hub/agent_connect.goindex 0d55ce078..f78981beb 100644--- a/internal/hub/agent_connect.go+++ b/internal/hub/agent_connect.go@@ -13,10 +13,10 @@ import ("github.com/henrygd/beszel/internal/hub/expirymap""github.com/henrygd/beszel/internal/hub/ws"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/blang/semver""github.com/lxzan/gws"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core")// agentConnectRequest holds information related to an agent's connection attempt.diff --git a/internal/hub/agent_connect_test.go b/internal/hub/agent_connect_test.goindex dea5f1149..7c61bcf2f 100644--- a/internal/hub/agent_connect_test.go+++ b/internal/hub/agent_connect_test.go@@ -18,8 +18,8 @@ import ("github.com/henrygd/beszel/internal/common""github.com/henrygd/beszel/internal/hub/ws"- "github.com/pocketbase/pocketbase/core"- pbtests "github.com/pocketbase/pocketbase/tests"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbtests "ganigeorgiev.com/pocketbase/pocketbase/tests""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""golang.org/x/crypto/ssh"diff --git a/internal/hub/api.go b/internal/hub/api.goindex 85fbcb706..df79fe47b 100644--- a/internal/hub/api.go+++ b/internal/hub/api.go@@ -15,6 +15,9 @@ import ("time""uuid"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/blang/semver""github.com/henrygd/beszel""github.com/henrygd/beszel/internal/alerts"@@ -22,9 +25,6 @@ import ("github.com/henrygd/beszel/internal/hub/config""github.com/henrygd/beszel/internal/hub/systems""github.com/henrygd/beszel/internal/hub/utils"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core")// UpdateInfo holds information about the latest update checkdiff --git a/internal/hub/api_test.go b/internal/hub/api_test.goindex 46e4f86f2..64a654bbe 100644--- a/internal/hub/api_test.go+++ b/internal/hub/api_test.go@@ -17,11 +17,11 @@ import (beszelTests "github.com/henrygd/beszel/internal/tests"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbTests "ganigeorgiev.com/pocketbase/pocketbase/tests""github.com/henrygd/beszel/internal/migrations"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core"- pbTests "github.com/pocketbase/pocketbase/tests""github.com/stretchr/testify/require")diff --git a/internal/hub/collections.go b/internal/hub/collections.goindex c8ac6cd00..fd65f71d3 100644--- a/internal/hub/collections.go+++ b/internal/hub/collections.go@@ -1,8 +1,8 @@package hubimport (+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/hub/utils"- "github.com/pocketbase/pocketbase/core")type collectionRules struct {diff --git a/internal/hub/collections_test.go b/internal/hub/collections_test.goindex e5bff713e..40fbb3544 100644--- a/internal/hub/collections_test.go+++ b/internal/hub/collections_test.go@@ -8,9 +8,9 @@ import ("strings""testing"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbTests "ganigeorgiev.com/pocketbase/pocketbase/tests"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/pocketbase/core"- pbTests "github.com/pocketbase/pocketbase/tests""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/config/config.go b/internal/hub/config/config.goindex 7438685a4..f308f5510 100644--- a/internal/hub/config/config.go+++ b/internal/hub/config/config.go@@ -10,8 +10,8 @@ import ("github.com/henrygd/beszel/internal/entities/system"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/spf13/cast""gopkg.in/yaml.v3")diff --git a/internal/hub/config/config_test.go b/internal/hub/config/config_test.goindex 4675a3b42..b5db18edf 100644--- a/internal/hub/config/config_test.go+++ b/internal/hub/config/config_test.go@@ -11,7 +11,7 @@ import ("github.com/henrygd/beszel/internal/hub/config"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""gopkg.in/yaml.v3"diff --git a/internal/hub/expirymap/expirymap.go b/internal/hub/expirymap/expirymap.goindex eed767562..1ee5e3a1e 100644--- a/internal/hub/expirymap/expirymap.go+++ b/internal/hub/expirymap/expirymap.go@@ -7,7 +7,7 @@ import ("sync""time"- "github.com/pocketbase/pocketbase/tools/store"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/store")type val[T comparable] struct {diff --git a/internal/hub/heartbeat/heartbeat.go b/internal/hub/heartbeat/heartbeat.goindex 8f79c9dbd..c0c857e15 100644--- a/internal/hub/heartbeat/heartbeat.go+++ b/internal/hub/heartbeat/heartbeat.go@@ -13,8 +13,8 @@ import ("strings""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel"- "github.com/pocketbase/pocketbase/core")// Default values for heartbeat configuration.diff --git a/internal/hub/heartbeat/heartbeat_test.go b/internal/hub/heartbeat/heartbeat_test.goindex b78143c7f..202b23136 100644--- a/internal/hub/heartbeat/heartbeat_test.go+++ b/internal/hub/heartbeat/heartbeat_test.go@@ -9,9 +9,9 @@ import ("net/http/httptest""testing"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/hub/heartbeat"beszeltests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/hub.go b/internal/hub/hub.goindex ce13aaa73..132ae53fc 100644--- a/internal/hub/hub.go+++ b/internal/hub/hub.go@@ -20,8 +20,8 @@ import ("github.com/henrygd/beszel/internal/records""github.com/henrygd/beszel/internal/users"- "github.com/pocketbase/pocketbase"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase"+ "ganigeorgiev.com/pocketbase/pocketbase/core""golang.org/x/crypto/ssh")diff --git a/internal/hub/network_monitors.go b/internal/hub/network_monitors.goindex c67dde9ae..bd66c169d 100644--- a/internal/hub/network_monitors.go+++ b/internal/hub/network_monitors.go@@ -5,10 +5,10 @@ import ("strconv""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/henrygd/beszel/internal/entities/monitor""github.com/henrygd/beszel/internal/hub/systems"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/types")// generateMonitorID creates a stable hash ID for a monitor based on its configuration and the system it belongs to.diff --git a/internal/hub/network_monitors_test.go b/internal/hub/network_monitors_test.goindex 7040c251f..a63153e9f 100644--- a/internal/hub/network_monitors_test.go+++ b/internal/hub/network_monitors_test.go@@ -9,9 +9,9 @@ import ("net/http/httptest""testing"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/entities/monitor"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/rate_limit_test.go b/internal/hub/rate_limit_test.goindex ffb8c0d06..20fee383c 100644--- a/internal/hub/rate_limit_test.go+++ b/internal/hub/rate_limit_test.go@@ -7,9 +7,9 @@ import ("net/http/httptest""testing"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/require")diff --git a/internal/hub/server_development.go b/internal/hub/server_development.goindex c9e7823e1..79841d01d 100644--- a/internal/hub/server_development.go+++ b/internal/hub/server_development.go@@ -10,8 +10,8 @@ import ("net/url""strings"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/osutils"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/osutils")// Wraps http.RoundTripper to modify dev proxy HTML responsesdiff --git a/internal/hub/server_production.go b/internal/hub/server_production.goindex 0cc7a3111..c7dd75553 100644--- a/internal/hub/server_production.go+++ b/internal/hub/server_production.go@@ -10,8 +10,8 @@ import ("github.com/henrygd/beszel/internal/hub/utils""github.com/henrygd/beszel/internal/site"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// startServer sets up the production server for Beszeldiff --git a/internal/hub/systems/container_records_test.go b/internal/hub/systems/container_records_test.goindex eef95f6f5..e7db0bfb2 100644--- a/internal/hub/systems/container_records_test.go+++ b/internal/hub/systems/container_records_test.go@@ -5,8 +5,8 @@ package systemsimport ("testing"+ "ganigeorgiev.com/pocketbase/dbx""github.com/henrygd/beszel/internal/entities/container"- "github.com/pocketbase/dbx""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/systems/network_monitor_ssh_test.go b/internal/hub/systems/network_monitor_ssh_test.goindex 89c05e3c0..9a2392622 100644--- a/internal/hub/systems/network_monitor_ssh_test.go+++ b/internal/hub/systems/network_monitor_ssh_test.go@@ -11,12 +11,12 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/fxamacker/cbor/v2""github.com/henrygd/beszel/internal/common""github.com/henrygd/beszel/internal/entities/monitor"esystem "github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/hub/expirymap"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/require""golang.org/x/crypto/ssh")diff --git a/internal/hub/systems/network_monitor_stats_test.go b/internal/hub/systems/network_monitor_stats_test.goindex a7e8e6b73..280339b0e 100644--- a/internal/hub/systems/network_monitor_stats_test.go+++ b/internal/hub/systems/network_monitor_stats_test.go@@ -8,11 +8,11 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/subscriptions""github.com/fxamacker/cbor/v2""github.com/henrygd/beszel/internal/entities/monitor""github.com/henrygd/beszel/internal/entities/system"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/subscriptions""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/systems/network_monitor_sync_test.go b/internal/hub/systems/network_monitor_sync_test.goindex b09817af1..298db07a1 100644--- a/internal/hub/systems/network_monitor_sync_test.go+++ b/internal/hub/systems/network_monitor_sync_test.go@@ -10,6 +10,7 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/blang/semver""github.com/fxamacker/cbor/v2""github.com/henrygd/beszel/internal/common"@@ -17,7 +18,6 @@ import (esystem "github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/hub/ws""github.com/lxzan/gws"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/require")diff --git a/internal/hub/systems/system.go b/internal/hub/systems/system.goindex 4cab4997a..263545f44 100644--- a/internal/hub/systems/system.go+++ b/internal/hub/systems/system.go@@ -29,13 +29,13 @@ import ("github.com/henrygd/beszel"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/security"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/blang/semver""github.com/fxamacker/cbor/v2""github.com/lxzan/gws"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/security"- "github.com/pocketbase/pocketbase/tools/types""golang.org/x/crypto/ssh")diff --git a/internal/hub/systems/system_get_record_test.go b/internal/hub/systems/system_get_record_test.goindex 24d7c2249..b0ed1cccb 100644--- a/internal/hub/systems/system_get_record_test.go+++ b/internal/hub/systems/system_get_record_test.go@@ -6,8 +6,8 @@ import ("context""testing"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/systems/system_manager.go b/internal/hub/systems/system_manager.goindex a2875ec67..8a4ba2297 100644--- a/internal/hub/systems/system_manager.go+++ b/internal/hub/systems/system_manager.go@@ -17,10 +17,10 @@ import ("github.com/henrygd/beszel"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/store""github.com/blang/semver"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/store""golang.org/x/crypto/ssh")diff --git a/internal/hub/systems/system_realtime.go b/internal/hub/systems/system_realtime.goindex f290eda6e..3a33bdd2c 100644--- a/internal/hub/systems/system_realtime.go+++ b/internal/hub/systems/system_realtime.go@@ -5,14 +5,14 @@ import ("strings""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/subscriptions""github.com/henrygd/beszel/internal/common""github.com/henrygd/beszel/internal/entities/monitor""github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/hub/utils"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/subscriptions")type subscriptionInfo struct {diff --git a/internal/hub/systems/system_realtime_test.go b/internal/hub/systems/system_realtime_test.goindex ea72b50ba..bdede48e1 100644--- a/internal/hub/systems/system_realtime_test.go+++ b/internal/hub/systems/system_realtime_test.go@@ -4,12 +4,12 @@ import ("testing""time"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core"- pbtests "github.com/pocketbase/pocketbase/tests"- "github.com/pocketbase/pocketbase/tools/hook"- "github.com/pocketbase/pocketbase/tools/store"- "github.com/pocketbase/pocketbase/tools/subscriptions"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbtests "ganigeorgiev.com/pocketbase/pocketbase/tests"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/hook"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/store"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/subscriptions""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/systems/system_smart.go b/internal/hub/systems/system_smart.goindex 390a7552d..e82456522 100644--- a/internal/hub/systems/system_smart.go+++ b/internal/hub/systems/system_smart.go@@ -7,9 +7,9 @@ import ("strings""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel/internal/entities/smart"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core")type smartFetchState struct {diff --git a/internal/hub/systems/system_smart_test.go b/internal/hub/systems/system_smart_test.goindex 460a38f3e..96b5dc744 100644--- a/internal/hub/systems/system_smart_test.go+++ b/internal/hub/systems/system_smart_test.go@@ -13,8 +13,8 @@ import ("github.com/henrygd/beszel/internal/hub/expirymap"_ "github.com/henrygd/beszel/internal/migrations"- "github.com/pocketbase/pocketbase/core"- pbtests "github.com/pocketbase/pocketbase/tests"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbtests "ganigeorgiev.com/pocketbase/pocketbase/tests""github.com/stretchr/testify/assert""github.com/stretchr/testify/require""golang.org/x/crypto/ssh"diff --git a/internal/hub/systems/system_zfs.go b/internal/hub/systems/system_zfs.goindex 9f6405290..f9f1c6142 100644--- a/internal/hub/systems/system_zfs.go+++ b/internal/hub/systems/system_zfs.go@@ -6,11 +6,11 @@ import ("fmt""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/henrygd/beszel""github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/entities/zfs"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core")var errIncompleteZfsData = errors.New("incomplete ZFS pool inventory")diff --git a/internal/hub/systems/systemd_records_test.go b/internal/hub/systems/systemd_records_test.goindex e6d034108..7ccad552e 100644--- a/internal/hub/systems/systemd_records_test.go+++ b/internal/hub/systems/systemd_records_test.go@@ -7,12 +7,12 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/dbx""github.com/fxamacker/cbor/v2""github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/entities/systemd""github.com/henrygd/beszel/internal/hub/systems""github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/hub/systems/systems_test_helpers.go b/internal/hub/systems/systems_test_helpers.goindex 57aa9385f..933eb4a9a 100644--- a/internal/hub/systems/systems_test_helpers.go+++ b/internal/hub/systems/systems_test_helpers.go@@ -7,9 +7,9 @@ import ("fmt""testing"+ "ganigeorgiev.com/pocketbase/pocketbase/core"entities "github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/entities/systemd"- "github.com/pocketbase/pocketbase/core")// The hub integration tests create/replace systems and cleanup the test apps quickly.diff --git a/internal/hub/systems/updater_cleanup_test.go b/internal/hub/systems/updater_cleanup_test.goindex 31914a161..8f2a93471 100644--- a/internal/hub/systems/updater_cleanup_test.go+++ b/internal/hub/systems/updater_cleanup_test.go@@ -10,12 +10,12 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/blang/semver""github.com/henrygd/beszel/internal/entities/monitor"esystem "github.com/henrygd/beszel/internal/entities/system""github.com/henrygd/beszel/internal/hub/ws""github.com/lxzan/gws"- "github.com/pocketbase/pocketbase/core""github.com/stretchr/testify/require")diff --git a/internal/hub/utils/utils.go b/internal/hub/utils/utils.goindex 0cfc1fa9d..29df8bf16 100644--- a/internal/hub/utils/utils.go+++ b/internal/hub/utils/utils.go@@ -4,7 +4,7 @@ package utilsimport ("os"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// GetEnv retrieves an environment variable with a "BESZEL_HUB_" prefix, or falls back to the unprefixed key.diff --git a/internal/migrations/0_collections_snapshot_0_20_0.go b/internal/migrations/0_collections_snapshot_0_20_0.goindex 93043b751..531e23113 100644--- a/internal/migrations/0_collections_snapshot_0_20_0.go+++ b/internal/migrations/0_collections_snapshot_0_20_0.go@@ -1,8 +1,8 @@package migrationsimport (- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")func init() {diff --git a/internal/migrations/1790193183_network_monitor_cert.go b/internal/migrations/1790193183_network_monitor_cert.goindex 023c65bce..c9b31bc6c 100644--- a/internal/migrations/1790193183_network_monitor_cert.go+++ b/internal/migrations/1790193183_network_monitor_cert.go@@ -1,8 +1,8 @@package migrationsimport (- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")func init() {diff --git a/internal/migrations/1790273174_network_monitor_server.go b/internal/migrations/1790273174_network_monitor_server.goindex bdcb26f2a..98dcc3d7c 100644--- a/internal/migrations/1790273174_network_monitor_server.go+++ b/internal/migrations/1790273174_network_monitor_server.go@@ -1,8 +1,8 @@package migrationsimport (- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")func init() {diff --git a/internal/migrations/1790924727_zfs_pool_status.go b/internal/migrations/1790924727_zfs_pool_status.goindex ecdd48502..67e6ec6db 100644--- a/internal/migrations/1790924727_zfs_pool_status.go+++ b/internal/migrations/1790924727_zfs_pool_status.go@@ -1,8 +1,8 @@package migrationsimport (- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")func init() {diff --git a/internal/migrations/1790964708_network_monitor_skip_tls_verify.go b/internal/migrations/1790964708_network_monitor_skip_tls_verify.goindex 8327d3912..0eea2348c 100644--- a/internal/migrations/1790964708_network_monitor_skip_tls_verify.go+++ b/internal/migrations/1790964708_network_monitor_skip_tls_verify.go@@ -1,8 +1,8 @@package migrationsimport (- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")func init() {diff --git a/internal/migrations/1791926360_network_monitor_cert_alert.go b/internal/migrations/1791926360_network_monitor_cert_alert.goindex fa3c3e2f1..12d033935 100644--- a/internal/migrations/1791926360_network_monitor_cert_alert.go+++ b/internal/migrations/1791926360_network_monitor_cert_alert.go@@ -3,8 +3,8 @@ package migrationsimport ("slices"- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")const networkMonitorCertAlertName = "NetworkMonitorCert"diff --git a/internal/migrations/1792309602_system_details_sockets.go b/internal/migrations/1792309602_system_details_sockets.goindex a73c02d72..52fffcf9e 100644--- a/internal/migrations/1792309602_system_details_sockets.go+++ b/internal/migrations/1792309602_system_details_sockets.go@@ -1,8 +1,8 @@package migrationsimport (- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")func init() {diff --git a/internal/migrations/1792483200_enable_request_limits.go b/internal/migrations/1792483200_enable_request_limits.goindex 5fdedf8e9..580d51ccb 100644--- a/internal/migrations/1792483200_enable_request_limits.go+++ b/internal/migrations/1792483200_enable_request_limits.go@@ -3,8 +3,8 @@ package migrationsimport ("slices"- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")// signInRateLimitRule limits password, OTP, and OAuth2 sign-in attempts per client address.diff --git a/internal/migrations/initial-settings.go b/internal/migrations/initial-settings.goindex e0c02f076..632c270d7 100644--- a/internal/migrations/initial-settings.go+++ b/internal/migrations/initial-settings.go@@ -3,8 +3,8 @@ package migrationsimport ("os"- "github.com/pocketbase/pocketbase/core"- m "github.com/pocketbase/pocketbase/migrations"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ m "ganigeorgiev.com/pocketbase/pocketbase/migrations")const (diff --git a/internal/records/monitor_averaging_test.go b/internal/records/monitor_averaging_test.goindex d79a26db5..72cad6c70 100644--- a/internal/records/monitor_averaging_test.go+++ b/internal/records/monitor_averaging_test.go@@ -10,7 +10,7 @@ import ("github.com/henrygd/beszel/internal/records""github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/dbx""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/records/records.go b/internal/records/records.goindex c22f83eb7..f2b36fb63 100644--- a/internal/records/records.go+++ b/internal/records/records.go@@ -10,9 +10,9 @@ import ("github.com/henrygd/beszel/internal/entities/monitor""github.com/henrygd/beszel/internal/entities/system"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/types"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types")type RecordManager struct {diff --git a/internal/records/records_deletion.go b/internal/records/records_deletion.goindex 94bd0aaea..4ef0f98b0 100644--- a/internal/records/records_deletion.go+++ b/internal/records/records_deletion.go@@ -5,8 +5,8 @@ import ("log/slog""time"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// Delete old recordsdiff --git a/internal/records/records_deletion_test.go b/internal/records/records_deletion_test.goindex 77255119a..864ba4aa2 100644--- a/internal/records/records_deletion_test.go+++ b/internal/records/records_deletion_test.go@@ -10,9 +10,9 @@ import ("github.com/henrygd/beszel/internal/records""github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/types"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/records/records_rollup_test.go b/internal/records/records_rollup_test.goindex 334104b8f..33e304a4a 100644--- a/internal/records/records_rollup_test.go+++ b/internal/records/records_rollup_test.go@@ -8,10 +8,10 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/types""github.com/henrygd/beszel/internal/records""github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/tools/types""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")diff --git a/internal/records/records_test_helpers.go b/internal/records/records_test_helpers.goindex ce813ea37..4b8a01c41 100644--- a/internal/records/records_test_helpers.go+++ b/internal/records/records_test_helpers.go@@ -3,7 +3,7 @@package recordsimport (- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core")// DeleteOldSystemStats exposes deleteOldSystemStats for testingdiff --git a/internal/tests/api.go b/internal/tests/api.goindex 3c54f19c7..14c9e5863 100644--- a/internal/tests/api.go+++ b/internal/tests/api.go@@ -13,13 +13,13 @@ import ("testing""time"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core"- pbtests "github.com/pocketbase/pocketbase/tests"- "github.com/pocketbase/pocketbase/tools/hook"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ pbtests "ganigeorgiev.com/pocketbase/pocketbase/tests"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/hook")-// NOTE: This is a copy of https://github.com/pocketbase/pocketbase/blob/master/tests/api.go+// NOTE: This is a copy of https://ganigeorgiev.com/pocketbase/pocketbase/blob/master/tests/api.go// with the following changes:// - Removed automatic cleanup of the test app in ApiScenario.Test (Aug 17 2025)diff --git a/internal/tests/hub.go b/internal/tests/hub.goindex 48eb40637..2b8fb49cf 100644--- a/internal/tests/hub.go+++ b/internal/tests/hub.go@@ -9,11 +9,11 @@ import ("github.com/henrygd/beszel/internal/hub"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tests"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tests""github.com/stretchr/testify/assert"- _ "github.com/pocketbase/pocketbase/migrations"+ _ "ganigeorgiev.com/pocketbase/pocketbase/migrations")// TestHub is a wrapper hub instance used for testing.diff --git a/internal/tests/hub_test.go b/internal/tests/hub_test.goindex dd791d9f1..cf803a033 100644--- a/internal/tests/hub_test.go+++ b/internal/tests/hub_test.go@@ -5,7 +5,7 @@ package testsimport ("testing"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/core""github.com/stretchr/testify/require")diff --git a/internal/users/oauth_test.go b/internal/users/oauth_test.goindex 1f1503531..f92918068 100644--- a/internal/users/oauth_test.go+++ b/internal/users/oauth_test.go@@ -7,10 +7,10 @@ import ("strings""testing"+ "ganigeorgiev.com/pocketbase/pocketbase/apis"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/auth"beszelTests "github.com/henrygd/beszel/internal/tests"- "github.com/pocketbase/pocketbase/apis"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/auth""github.com/stretchr/testify/require""golang.org/x/oauth2")diff --git a/internal/users/users.go b/internal/users/users.goindex c34823c71..69e08de00 100644--- a/internal/users/users.go+++ b/internal/users/users.go@@ -9,8 +9,8 @@ import ("github.com/henrygd/beszel/internal/hub/utils""github.com/henrygd/beszel/internal/migrations"- "github.com/pocketbase/dbx"- "github.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/dbx"+ "ganigeorgiev.com/pocketbase/pocketbase/core")type UserManager struct {diff --git a/internal/users/users_test.go b/internal/users/users_test.goindex ffff6283e..1a370b2b1 100644--- a/internal/users/users_test.go+++ b/internal/users/users_test.go@@ -11,11 +11,11 @@ import ("testing""time"+ "ganigeorgiev.com/pocketbase/pocketbase/core"+ "ganigeorgiev.com/pocketbase/pocketbase/tools/router""github.com/henrygd/beszel/internal/migrations"beszelTests "github.com/henrygd/beszel/internal/tests""github.com/henrygd/beszel/internal/users"- "github.com/pocketbase/pocketbase/core"- "github.com/pocketbase/pocketbase/tools/router""github.com/stretchr/testify/require")