CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update shirou/gopsutil to v3 (#10119)

This commit is contained in:
Pierre Fersing 2021-11-18 17:33:47 +01:00 committed by GitHub
parent 3dc5281632
commit 4a0397342a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
go.mod
View File

@ -103,7 +103,7 @@ require (
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-logfmt/logfmt v0.5.0
github.com/go-logr/logr v0.4.0 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c
github.com/go-redis/redis v6.15.9+incompatible
github.com/go-sql-driver/mysql v1.6.0
@ -232,7 +232,7 @@ require (
github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e // indirect
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/sensu/sensu-go/api/core/v2 v2.9.0
github.com/shirou/gopsutil v3.21.8+incompatible
github.com/shirou/gopsutil/v3 v3.21.10
github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114 // indirect
github.com/showwin/speedtest-go v1.1.4
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 // indirect
@ -283,7 +283,7 @@ require (
golang.org/x/net v0.0.0-20211005215030-d2e5035098b3
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.7
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
@ -343,6 +343,7 @@ require (
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/pierrec/lz4/v4 v4.1.8 // indirect
go.opentelemetry.io/otel v1.0.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.24.0 // indirect

14
go.sum
View File

@ -795,8 +795,9 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg
github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
@ -1430,6 +1431,8 @@ github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0U
github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@ -1888,10 +1891,11 @@ github.com/sensu/sensu-go/api/core/v2 v2.9.0 h1:NanHMIWbrHP/L4Ge0V1x2+0G9bxFHpvh
github.com/sensu/sensu-go/api/core/v2 v2.9.0/go.mod h1:QcgxKxydmScE66hLBTzbFhhiPSR/JHqUjNi/+Lelh6E=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc=
github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shirou/gopsutil v3.21.8+incompatible h1:sh0foI8tMRlCidUJR+KzqWYWxrkuuPIGiO6Vp+KXdCU=
github.com/shirou/gopsutil v3.21.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shirou/gopsutil/v3 v3.21.1/go.mod h1:igHnfak0qnw1biGeI2qKQvu0ZkwvEkUcCLlYhZzdr/4=
github.com/shirou/gopsutil/v3 v3.21.10 h1:flTg1DrnV/UVrBqjLgVgDJzx6lf+91rC64/dBHmO2IA=
github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew=
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114 h1:Pm6R878vxWWWR+Sa3ppsLce/Zq+JNTs6aVvRu13jv9A=
github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@ -2550,8 +2554,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef h1:fPxZ3Umkct3LZ8gK9nbk+DWDJ9fstZa2grBn+lWVKPs=
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
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-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=

2
plugins/inputs/cpu/cpu.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"time"
cpuUtil "github.com/shirou/gopsutil/cpu"
cpuUtil "github.com/shirou/gopsutil/v3/cpu"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs"

2
plugins/inputs/cpu/cpu_test.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"testing"
cpuUtil "github.com/shirou/gopsutil/cpu"
cpuUtil "github.com/shirou/gopsutil/v3/cpu"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf/plugins/inputs/system"

6
plugins/inputs/disk/disk.go
View File

@ -52,7 +52,7 @@ func (ds *DiskStats) Gather(acc telegraf.Accumulator) error {
// Skip dummy filesystem (procfs, cgroupfs, ...)
continue
}
mountOpts := parseOptions(partitions[i].Opts)
mountOpts := MountOptions(partitions[i].Opts)
tags := map[string]string{
"path": du.Path,
"device": strings.Replace(partitions[i].Device, "/dev/", "", -1),
@ -101,10 +101,6 @@ func (opts MountOptions) exists(opt string) bool {
return false
}
func parseOptions(opts string) MountOptions {
return strings.Split(opts, ",")
}
func init() {
ps := system.NewSystemPS()
inputs.Add("disk", func() telegraf.Input {

18
plugins/inputs/disk/disk_test.go
View File

@ -5,7 +5,7 @@ import (
"os"
"testing"
diskUtil "github.com/shirou/gopsutil/disk"
diskUtil "github.com/shirou/gopsutil/v3/disk"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
@ -30,13 +30,13 @@ func TestDiskUsage(t *testing.T) {
Device: "/dev/sda",
Mountpoint: "/",
Fstype: "ext4",
Opts: "ro,noatime,nodiratime",
Opts: []string{"ro", "noatime", "nodiratime"},
},
{
Device: "/dev/sdb",
Mountpoint: "/home",
Fstype: "ext4",
Opts: "rw,noatime,nodiratime,errors=remount-ro",
Opts: []string{"rw", "noatime", "nodiratime", "errors=remount-ro"},
},
}
duAll := []diskUtil.UsageStat{
@ -137,7 +137,7 @@ func TestDiskUsageHostMountPrefix(t *testing.T) {
Device: "/dev/sda",
Mountpoint: "/",
Fstype: "ext4",
Opts: "ro",
Opts: []string{"ro"},
},
},
usageStats: []*diskUtil.UsageStat{
@ -169,7 +169,7 @@ func TestDiskUsageHostMountPrefix(t *testing.T) {
Device: "/dev/sda",
Mountpoint: "/hostfs/var",
Fstype: "ext4",
Opts: "ro",
Opts: []string{"ro"},
},
},
usageStats: []*diskUtil.UsageStat{
@ -202,7 +202,7 @@ func TestDiskUsageHostMountPrefix(t *testing.T) {
Device: "/dev/sda",
Mountpoint: "/hostfs",
Fstype: "ext4",
Opts: "ro",
Opts: []string{"ro"},
},
},
usageStats: []*diskUtil.UsageStat{
@ -301,13 +301,13 @@ func TestDiskStats(t *testing.T) {
Device: "/dev/sda",
Mountpoint: "/",
Fstype: "ext4",
Opts: "ro,noatime,nodiratime",
Opts: []string{"ro", "noatime", "nodiratime"},
},
{
Device: "/dev/sdb",
Mountpoint: "/home",
Fstype: "ext4",
Opts: "rw,noatime,nodiratime,errors=remount-ro",
Opts: []string{"rw", "noatime", "nodiratime", "errors=remount-ro"},
},
}
@ -316,7 +316,7 @@ func TestDiskStats(t *testing.T) {
Device: "/dev/sda",
Mountpoint: "/",
Fstype: "ext4",
Opts: "ro,noatime,nodiratime",
Opts: []string{"ro", "noatime", "nodiratime"},
},
}

2
plugins/inputs/diskio/diskio_test.go
View File

@ -5,7 +5,7 @@ import (
"github.com/influxdata/telegraf/plugins/inputs/system"
"github.com/influxdata/telegraf/testutil"
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/v3/disk"
"github.com/stretchr/testify/require"
)

14
plugins/inputs/mem/memory.go
View File

@ -79,16 +79,16 @@ func (ms *MemStats) Gather(acc telegraf.Accumulator) error {
fields["page_tables"] = vm.PageTables
fields["shared"] = vm.Shared
fields["slab"] = vm.Slab
fields["sreclaimable"] = vm.SReclaimable
fields["sunreclaim"] = vm.SUnreclaim
fields["sreclaimable"] = vm.Sreclaimable
fields["sunreclaim"] = vm.Sunreclaim
fields["swap_cached"] = vm.SwapCached
fields["swap_free"] = vm.SwapFree
fields["swap_total"] = vm.SwapTotal
fields["vmalloc_chunk"] = vm.VMallocChunk
fields["vmalloc_total"] = vm.VMallocTotal
fields["vmalloc_used"] = vm.VMallocUsed
fields["write_back_tmp"] = vm.WritebackTmp
fields["write_back"] = vm.Writeback
fields["vmalloc_chunk"] = vm.VmallocChunk
fields["vmalloc_total"] = vm.VmallocTotal
fields["vmalloc_used"] = vm.VmallocUsed
fields["write_back_tmp"] = vm.WriteBackTmp
fields["write_back"] = vm.WriteBack
}
acc.AddGauge("mem", fields, nil)

16
plugins/inputs/mem/memory_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs/system"
"github.com/influxdata/telegraf/testutil"
"github.com/shirou/gopsutil/mem"
"github.com/shirou/gopsutil/v3/mem"
"github.com/stretchr/testify/require"
)
@ -42,16 +42,16 @@ func TestMemStats(t *testing.T) {
Mapped: 42236,
PageTables: 1236,
Shared: 0,
SReclaimable: 1923022848,
SUnreclaim: 157728768,
Sreclaimable: 1923022848,
Sunreclaim: 157728768,
SwapCached: 0,
SwapFree: 524280,
SwapTotal: 524280,
VMallocChunk: 3872908,
VMallocTotal: 3874808,
VMallocUsed: 1416,
Writeback: 0,
WritebackTmp: 0,
VmallocChunk: 3872908,
VmallocTotal: 3874808,
VmallocUsed: 1416,
WriteBack: 0,
WriteBackTmp: 0,
}
mps.On("VMStat").Return(vms, nil)

2
plugins/inputs/net/net_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/influxdata/telegraf/plugins/inputs/system"
"github.com/influxdata/telegraf/testutil"
"github.com/shirou/gopsutil/net"
"github.com/shirou/gopsutil/v3/net"
"github.com/stretchr/testify/require"
)

2
plugins/inputs/procstat/native_finder.go
View File

@ -7,7 +7,7 @@ import (
"strconv"
"strings"
"github.com/shirou/gopsutil/process"
"github.com/shirou/gopsutil/v3/process"
)
//NativeFinder uses gopsutil to find processes

4
plugins/inputs/procstat/process.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"time"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/process"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/process"
)
type Process interface {

2
plugins/inputs/procstat/procstat.go
View File

@ -13,7 +13,7 @@ import (
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs"
"github.com/shirou/gopsutil/process"
"github.com/shirou/gopsutil/v3/process"
)
var (

4
plugins/inputs/procstat/procstat_test.go
View File

@ -10,8 +10,8 @@ import (
"testing"
"time"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/process"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/process"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf/testutil"

2
plugins/inputs/swap/swap_test.go
View File

@ -5,7 +5,7 @@ import (
"github.com/influxdata/telegraf/plugins/inputs/system"
"github.com/influxdata/telegraf/testutil"
"github.com/shirou/gopsutil/mem"
"github.com/shirou/gopsutil/v3/mem"
"github.com/stretchr/testify/require"
)

12
plugins/inputs/system/mock_PS.go
View File

@ -5,13 +5,13 @@ import (
"github.com/stretchr/testify/mock"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/host"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/disk"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/load"
"github.com/shirou/gopsutil/mem"
"github.com/shirou/gopsutil/net"
"github.com/shirou/gopsutil/v3/load"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v3/net"
)
type MockPS struct {

12
plugins/inputs/system/ps.go
View File

@ -5,13 +5,13 @@ import (
"path/filepath"
"strings"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/disk"
"github.com/shirou/gopsutil/host"
"github.com/shirou/gopsutil/mem"
"github.com/shirou/gopsutil/net"
"github.com/influxdata/telegraf/internal"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/disk"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v3/net"
)
type PS interface {

6
plugins/inputs/system/system.go
View File

@ -10,9 +10,9 @@ import (
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs"
"github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/host"
"github.com/shirou/gopsutil/load"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v3/load"
)
type SystemStats struct {

2
plugins/inputs/temp/temp_test.go
View File

@ -3,7 +3,7 @@ package temp
import (
"testing"
"github.com/shirou/gopsutil/host"
"github.com/shirou/gopsutil/v3/host"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf/plugins/inputs/system"