diff --git a/cmd/agent/edit.go b/cmd/agent/edit.go index 0067318..6109460 100644 --- a/cmd/agent/edit.go +++ b/cmd/agent/edit.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/shirou/gopsutil/v4/disk" - psnet "github.com/shirou/gopsutil/v4/net" + "github.com/nezhahq/gopsutil/v4/disk" + psnet "github.com/nezhahq/gopsutil/v4/net" "github.com/spf13/cobra" ) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 628bb47..969fbc9 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -21,10 +21,10 @@ import ( "github.com/ebi-yade/altsvc-go" "github.com/go-ping/ping" "github.com/nezhahq/go-github-selfupdate/selfupdate" + "github.com/nezhahq/gopsutil/v4/host" "github.com/nezhahq/service" "github.com/quic-go/quic-go/http3" utls "github.com/refraction-networking/utls" - "github.com/shirou/gopsutil/v4/host" "github.com/spf13/cobra" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/go.mod b/go.mod index a7334ab..79a0f91 100644 --- a/go.mod +++ b/go.mod @@ -16,10 +16,10 @@ require ( github.com/jaypipes/ghw v0.12.0 github.com/json-iterator/go v1.1.12 github.com/nezhahq/go-github-selfupdate v0.0.0-20240713123605-d560a87d03a0 + github.com/nezhahq/gopsutil/v4 v4.24.9-patch1 github.com/nezhahq/service v0.0.0-20240704142721-eba37f9cc709 github.com/quic-go/quic-go v0.40.1 github.com/refraction-networking/utls v1.6.3 - github.com/shirou/gopsutil/v4 v4.24.9 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 golang.org/x/net v0.29.0 diff --git a/go.sum b/go.sum index e3bf6f1..8b239aa 100644 --- a/go.sum +++ b/go.sum @@ -112,6 +112,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/nezhahq/go-github-selfupdate v0.0.0-20240713123605-d560a87d03a0 h1:Otiv4k7gSyOUsMTH+DDDTGdGczyZDmDbPm/SxwpSM2E= github.com/nezhahq/go-github-selfupdate v0.0.0-20240713123605-d560a87d03a0/go.mod h1:NVxyW3iSQ7YII8vvCIBTzk4HzsAa08Iibb68e0i0Nww= +github.com/nezhahq/gopsutil/v4 v4.24.9-patch1 h1:R+DvRg96RIjEB8B4MpjDFaSfciY12YfuSKtR4idSLqs= +github.com/nezhahq/gopsutil/v4 v4.24.9-patch1/go.mod h1:y9PwgI3WLXKHOIfEFXtv9Jzg9JjgAR+rlt2PaIdaLcM= github.com/nezhahq/service v0.0.0-20240704142721-eba37f9cc709 h1:WzZo/RXmJI2ReodnIg09QI4J6D/cHsU7o1WHWcmtqqo= github.com/nezhahq/service v0.0.0-20240704142721-eba37f9cc709/go.mod h1:i6zO7Vzuv5+mdaCzHrvAC4U63W59uXmX9n6o7p4PJGk= github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= @@ -139,8 +141,6 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/shirou/gopsutil/v4 v4.24.9 h1:KIV+/HaHD5ka5f570RZq+2SaeFsb/pq+fp2DGNWYoOI= -github.com/shirou/gopsutil/v4 v4.24.9/go.mod h1:3fkaHNeYsUFCGZ8+9vZVWtbyM1k2eRnlL+bWO8Bxa/Q= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= diff --git a/pkg/monitor/monitor.go b/pkg/monitor/monitor.go index 9b5daea..efdf11c 100644 --- a/pkg/monitor/monitor.go +++ b/pkg/monitor/monitor.go @@ -12,14 +12,14 @@ import ( "time" "github.com/dean2021/goss" - "github.com/shirou/gopsutil/v4/cpu" - "github.com/shirou/gopsutil/v4/disk" - "github.com/shirou/gopsutil/v4/host" - "github.com/shirou/gopsutil/v4/load" - "github.com/shirou/gopsutil/v4/mem" - "github.com/shirou/gopsutil/v4/net" - "github.com/shirou/gopsutil/v4/process" - "github.com/shirou/gopsutil/v4/sensors" + "github.com/nezhahq/gopsutil/v4/cpu" + "github.com/nezhahq/gopsutil/v4/disk" + "github.com/nezhahq/gopsutil/v4/host" + "github.com/nezhahq/gopsutil/v4/load" + "github.com/nezhahq/gopsutil/v4/mem" + "github.com/nezhahq/gopsutil/v4/net" + "github.com/nezhahq/gopsutil/v4/process" + "github.com/nezhahq/gopsutil/v4/sensors" "github.com/nezhahq/agent/model" "github.com/nezhahq/agent/pkg/gpu" diff --git a/pkg/pty/pty_windows.go b/pkg/pty/pty_windows.go index bba4a44..3357d1b 100644 --- a/pkg/pty/pty_windows.go +++ b/pkg/pty/pty_windows.go @@ -16,7 +16,7 @@ import ( "github.com/UserExistsError/conpty" "github.com/artdarek/go-unzip" "github.com/iamacarpet/go-winpty" - "github.com/shirou/gopsutil/v4/host" + "github.com/nezhahq/gopsutil/v4/host" ) var isWin10 bool