Skip to content

Commit dca4e67

Browse files
authored
update shirou/gopsutil to v4 (#1744)
1 parent fb9ea28 commit dca4e67

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/pkg/errors v0.9.1
3535
github.com/replicatedhq/termui/v3 v3.1.1-0.20200811145416-f40076d26851
3636
github.com/segmentio/ksuid v1.0.4
37-
github.com/shirou/gopsutil/v3 v3.24.5
37+
github.com/shirou/gopsutil/v4 v4.25.1
3838
github.com/spf13/cobra v1.9.1
3939
github.com/spf13/pflag v1.0.6
4040
github.com/spf13/viper v1.19.0
@@ -91,6 +91,7 @@ require (
9191
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
9292
github.com/distribution/reference v0.6.0 // indirect
9393
github.com/docker/distribution v2.8.3+incompatible // indirect
94+
github.com/ebitengine/purego v0.8.2 // indirect
9495
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
9596
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
9697
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
@@ -128,7 +129,6 @@ require (
128129
github.com/russross/blackfriday/v2 v2.1.0 // indirect
129130
github.com/sagikazarmark/locafero v0.4.0 // indirect
130131
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
131-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
132132
github.com/shopspring/decimal v1.4.0 // indirect
133133
github.com/sirupsen/logrus v1.9.3 // indirect
134134
github.com/sourcegraph/conc v0.3.0 // indirect

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,8 @@ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L
816816
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
817817
github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
818818
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
819+
github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
820+
github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
819821
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
820822
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
821823
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -1359,12 +1361,8 @@ github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c
13591361
github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
13601362
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
13611363
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
1362-
github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
1363-
github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
1364-
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
1365-
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
1366-
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
1367-
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
1364+
github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
1365+
github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
13681366
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
13691367
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
13701368
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

pkg/collect/host_cpu.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"github.com/pkg/errors"
88
troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
9-
"github.com/shirou/gopsutil/v3/cpu"
10-
"github.com/shirou/gopsutil/v3/host"
9+
"github.com/shirou/gopsutil/v4/cpu"
10+
"github.com/shirou/gopsutil/v4/host"
1111
)
1212

1313
type CPUInfo struct {

pkg/collect/host_disk_usage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/pkg/errors"
1111
troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
12-
"github.com/shirou/gopsutil/v3/disk"
12+
"github.com/shirou/gopsutil/v4/disk"
1313
)
1414

1515
type DiskUsageInfo struct {

pkg/collect/host_memory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/pkg/errors"
88
troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
9-
"github.com/shirou/gopsutil/v3/mem"
9+
"github.com/shirou/gopsutil/v4/mem"
1010
)
1111

1212
type MemoryInfo struct {

pkg/collect/host_os_info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/pkg/errors"
88
troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
9-
osutils "github.com/shirou/gopsutil/v3/host"
9+
osutils "github.com/shirou/gopsutil/v4/host"
1010
)
1111

1212
type HostOSInfo struct {

0 commit comments

Comments
 (0)