diff --git a/beszel/Makefile b/beszel/Makefile index 529db3d1..ca5317f7 100644 --- a/beszel/Makefile +++ b/beszel/Makefile @@ -84,9 +84,9 @@ dev-hub: dev-agent: @if command -v entr >/dev/null 2>&1; then \ - find ./cmd/agent/*.go ./internal/agent/*.go | entr -r go run beszel/cmd/agent; \ + find ./cmd/agent/*.go ./internal/agent/*.go | entr -r go run github.com/henrygd/beszel/cmd/agent; \ else \ - go run beszel/cmd/agent; \ + go run github.com/henrygd/beszel/cmd/agent; \ fi build-dotnet: diff --git a/beszel/cmd/agent/agent.go b/beszel/cmd/agent/agent.go index c2bc0498..cb8c0e38 100644 --- a/beszel/cmd/agent/agent.go +++ b/beszel/cmd/agent/agent.go @@ -1,14 +1,14 @@ package main import ( - "beszel" - "beszel/internal/agent" - "beszel/internal/agent/health" "fmt" "log" "os" "strings" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/internal/agent" + "github.com/henrygd/beszel/internal/agent/health" "github.com/spf13/pflag" "golang.org/x/crypto/ssh" ) diff --git a/beszel/cmd/hub/hub.go b/beszel/cmd/hub/hub.go index 048b8a94..79a1ef45 100644 --- a/beszel/cmd/hub/hub.go +++ b/beszel/cmd/hub/hub.go @@ -1,15 +1,16 @@ package main import ( - "beszel" - "beszel/internal/hub" - _ "beszel/migrations" "fmt" "log" "net/http" "os" "time" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/internal/hub" + _ "github.com/henrygd/beszel/migrations" + "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/plugins/migratecmd" "github.com/spf13/cobra" diff --git a/beszel/go.mod b/beszel/go.mod index d4c05ee4..7f1de8db 100644 --- a/beszel/go.mod +++ b/beszel/go.mod @@ -1,4 +1,4 @@ -module beszel +module github.com/henrygd/beszel go 1.25.1 diff --git a/beszel/internal/agent/agent.go b/beszel/internal/agent/agent.go index 2e5f6396..4b65ff5c 100644 --- a/beszel/internal/agent/agent.go +++ b/beszel/internal/agent/agent.go @@ -2,8 +2,6 @@ package agent import ( - "beszel" - "beszel/internal/entities/system" "crypto/sha256" "encoding/hex" "log/slog" @@ -14,6 +12,8 @@ import ( "time" "github.com/gliderlabs/ssh" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/internal/entities/system" "github.com/shirou/gopsutil/v4/host" gossh "golang.org/x/crypto/ssh" ) diff --git a/beszel/internal/agent/disk.go b/beszel/internal/agent/disk.go index c9b2dd69..0b64ec29 100644 --- a/beszel/internal/agent/disk.go +++ b/beszel/internal/agent/disk.go @@ -1,7 +1,6 @@ package agent import ( - "beszel/internal/entities/system" "log/slog" "os" "path/filepath" @@ -9,6 +8,8 @@ import ( "strings" "time" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/shirou/gopsutil/v4/disk" ) diff --git a/beszel/internal/agent/docker.go b/beszel/internal/agent/docker.go index b634979a..1b941a2a 100644 --- a/beszel/internal/agent/docker.go +++ b/beszel/internal/agent/docker.go @@ -1,7 +1,6 @@ package agent import ( - "beszel/internal/entities/container" "bytes" "context" "encoding/json" @@ -15,6 +14,8 @@ import ( "sync" "time" + "github.com/henrygd/beszel/internal/entities/container" + "github.com/blang/semver" ) diff --git a/beszel/internal/agent/gpu.go b/beszel/internal/agent/gpu.go index 26850c72..5ba70adb 100644 --- a/beszel/internal/agent/gpu.go +++ b/beszel/internal/agent/gpu.go @@ -1,7 +1,6 @@ package agent import ( - "beszel/internal/entities/system" "bufio" "bytes" "encoding/json" @@ -13,6 +12,8 @@ import ( "sync" "time" + "github.com/henrygd/beszel/internal/entities/system" + "golang.org/x/exp/slog" ) diff --git a/beszel/internal/agent/system.go b/beszel/internal/agent/system.go index 908bc131..ae63f442 100644 --- a/beszel/internal/agent/system.go +++ b/beszel/internal/agent/system.go @@ -1,9 +1,6 @@ package agent import ( - "beszel" - "beszel/internal/agent/battery" - "beszel/internal/entities/system" "bufio" "fmt" "log/slog" @@ -12,6 +9,10 @@ import ( "strings" "time" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/internal/agent/battery" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/disk" "github.com/shirou/gopsutil/v4/host" diff --git a/beszel/internal/agent/update.go b/beszel/internal/agent/update.go index a98f21ab..72e05a32 100644 --- a/beszel/internal/agent/update.go +++ b/beszel/internal/agent/update.go @@ -1,13 +1,14 @@ package agent import ( - "beszel/internal/ghupdate" "fmt" "log" "os" "os/exec" "runtime" "strings" + + "github.com/henrygd/beszel/internal/ghupdate" ) // restarter knows how to restart the beszel-agent service. diff --git a/beszel/internal/entities/system/system.go b/beszel/internal/entities/system/system.go index ca257c34..3e81e62b 100644 --- a/beszel/internal/entities/system/system.go +++ b/beszel/internal/entities/system/system.go @@ -3,8 +3,9 @@ package system // TODO: this is confusing, make common package with common/types common/helpers etc import ( - "beszel/internal/entities/container" "time" + + "github.com/henrygd/beszel/internal/entities/container" ) type Stats struct { diff --git a/beszel/internal/hub/config/config.go b/beszel/internal/hub/config/config.go index d70d09c2..18cb6407 100644 --- a/beszel/internal/hub/config/config.go +++ b/beszel/internal/hub/config/config.go @@ -2,13 +2,14 @@ package config import ( - "beszel/internal/entities/system" "fmt" "log" "os" "path/filepath" "github.com/google/uuid" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" "github.com/spf13/cast" diff --git a/beszel/internal/hub/hub.go b/beszel/internal/hub/hub.go index 3f56ca5b..2ca742f0 100644 --- a/beszel/internal/hub/hub.go +++ b/beszel/internal/hub/hub.go @@ -2,12 +2,6 @@ package hub import ( - "beszel" - "beszel/internal/alerts" - "beszel/internal/hub/config" - "beszel/internal/hub/systems" - "beszel/internal/records" - "beszel/internal/users" "crypto/ed25519" "encoding/pem" "fmt" @@ -18,6 +12,11 @@ import ( "strings" "time" + "github.com/henrygd/beszel" + "github.com/henrygd/beszel/internal/alerts" + "github.com/henrygd/beszel/internal/records" + "github.com/henrygd/beszel/internal/users" + "github.com/google/uuid" "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/apis" diff --git a/beszel/internal/hub/update.go b/beszel/internal/hub/update.go index b6aebee5..cf16ff17 100644 --- a/beszel/internal/hub/update.go +++ b/beszel/internal/hub/update.go @@ -1,12 +1,12 @@ package hub import ( - "beszel/internal/ghupdate" "fmt" "log" "os" "os/exec" + "github.com/henrygd/beszel/internal/ghupdate" "github.com/spf13/cobra" ) diff --git a/beszel/internal/records/records.go b/beszel/internal/records/records.go index d37ba32d..03f14914 100644 --- a/beszel/internal/records/records.go +++ b/beszel/internal/records/records.go @@ -2,8 +2,6 @@ package records import ( - "beszel/internal/entities/container" - "beszel/internal/entities/system" "encoding/json" "fmt" "log" @@ -11,6 +9,9 @@ import ( "strings" "time" + "github.com/henrygd/beszel/internal/entities/container" + "github.com/henrygd/beszel/internal/entities/system" + "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" ) @@ -39,12 +40,14 @@ type StatsRecord struct { } // global variables for reusing allocations -var statsRecord StatsRecord -var containerStats []container.Stats -var sumStats system.Stats -var tempStats system.Stats -var queryParams = make(dbx.Params, 1) -var containerSums = make(map[string]*container.Stats) +var ( + statsRecord StatsRecord + containerStats []container.Stats + sumStats system.Stats + tempStats system.Stats + queryParams = make(dbx.Params, 1) + containerSums = make(map[string]*container.Stats) +) // Create longer records by averaging shorter records func (rm *RecordManager) CreateLongerRecords() { diff --git a/beszel/internal/users/users.go b/beszel/internal/users/users.go index 8ed7dda9..488b05f2 100644 --- a/beszel/internal/users/users.go +++ b/beszel/internal/users/users.go @@ -2,10 +2,11 @@ package users import ( - "beszel/migrations" "log" "net/http" + "github.com/henrygd/beszel/migrations" + "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase/core" )