Moved system package inputs out to top level (#4406)

plugins/inputs/all/all.go

@@ -17,7 +17,10 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/consul"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchbase"
 	_ "github.com/influxdata/telegraf/plugins/inputs/couchdb"
+	_ "github.com/influxdata/telegraf/plugins/inputs/cpu"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dcos"
+	_ "github.com/influxdata/telegraf/plugins/inputs/disk"
+	_ "github.com/influxdata/telegraf/plugins/inputs/diskio"
 	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dmcache"
 	_ "github.com/influxdata/telegraf/plugins/inputs/dns_query"
@@ -48,12 +51,16 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer_legacy"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kapacitor"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kernel"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kernel_vmstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/kubernetes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/linux_sysctl_fs"
 	_ "github.com/influxdata/telegraf/plugins/inputs/logparser"
 	_ "github.com/influxdata/telegraf/plugins/inputs/lustre2"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mailchimp"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mcrouter"
+	_ "github.com/influxdata/telegraf/plugins/inputs/mem"
 	_ "github.com/influxdata/telegraf/plugins/inputs/memcached"
 	_ "github.com/influxdata/telegraf/plugins/inputs/mesos"
 	_ "github.com/influxdata/telegraf/plugins/inputs/minecraft"
@@ -62,6 +69,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/mysql"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nats"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nats_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/net"
 	_ "github.com/influxdata/telegraf/plugins/inputs/net_response"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
 	_ "github.com/influxdata/telegraf/plugins/inputs/nginx_plus"
@@ -80,6 +88,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql"
 	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql_extensible"
 	_ "github.com/influxdata/telegraf/plugins/inputs/powerdns"
+	_ "github.com/influxdata/telegraf/plugins/inputs/processes"
 	_ "github.com/influxdata/telegraf/plugins/inputs/procstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/prometheus"
 	_ "github.com/influxdata/telegraf/plugins/inputs/puppetagent"
@@ -97,6 +106,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/inputs/solr"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sqlserver"
 	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
+	_ "github.com/influxdata/telegraf/plugins/inputs/swap"
 	_ "github.com/influxdata/telegraf/plugins/inputs/syslog"
 	_ "github.com/influxdata/telegraf/plugins/inputs/sysstat"
 	_ "github.com/influxdata/telegraf/plugins/inputs/system"

plugins/inputs/system/cpu.go → plugins/inputs/cpu/cpu.go

@@ -1,16 +1,17 @@
-package system
+package cpu
 
 import (
 	"fmt"
 	"time"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/shirou/gopsutil/cpu"
 )
 
 type CPUStats struct {
-	ps        PS
+	ps        system.PS
 	lastStats map[string]cpu.TimesStat
 
 	PerCPU         bool `toml:"percpu"`
@@ -19,7 +20,7 @@ type CPUStats struct {
 	ReportActive   bool `toml:"report_active"`
 }
 
-func NewCPUStats(ps PS) *CPUStats {
+func NewCPUStats(ps system.PS) *CPUStats {
 	return &CPUStats{
 		ps:             ps,
 		CollectCPUTime: true,
@@ -146,7 +147,7 @@ func init() {
 		return &CPUStats{
 			PerCPU:   true,
 			TotalCPU: true,
-			ps:       newSystemPS(),
+			ps:       system.NewSystemPS(),
 		}
 	})
 }

plugins/inputs/system/cpu_test.go → plugins/inputs/cpu/cpu_test.go

@@ -1,17 +1,18 @@
-package system
+package cpu
 
 import (
 	"fmt"
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestCPUStats(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
 
@@ -68,7 +69,7 @@ func TestCPUStats(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_guest", 3.1, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_guest_nice", 0.324, 0, cputags)
 
-	mps2 := MockPS{}
+	mps2 := system.MockPS{}
 	mps2.On("CPUTimes").Return([]cpu.TimesStat{cts2}, nil)
 	cs.ps = &mps2
 
@@ -153,8 +154,8 @@ func assertContainsTaggedFloat(
 // TestCPUCountChange tests that no errors are encountered if the number of
 // CPUs increases as reported with LXC.
 func TestCPUCountIncrease(t *testing.T) {
-	var mps MockPS
-	var mps2 MockPS
+	var mps system.MockPS
+	var mps2 system.MockPS
 	var acc testutil.Accumulator
 	var err error
 
@@ -188,7 +189,7 @@ func TestCPUCountIncrease(t *testing.T) {
 // TestCPUTimesDecrease tests that telegraf continue to works after
 // CPU times decrease, which seems to occur when Linux system is suspended.
 func TestCPUTimesDecrease(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
 
@@ -230,15 +231,15 @@ func TestCPUTimesDecrease(t *testing.T) {
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_idle", 80, 0, cputags)
 	assertContainsTaggedFloat(t, &acc, "cpu", "time_iowait", 2, 0, cputags)
 
-	mps2 := MockPS{}
+	mps2 := system.MockPS{}
 	mps2.On("CPUTimes").Return([]cpu.TimesStat{cts2}, nil)
 	cs.ps = &mps2
 
 	// CPU times decreased. An error should be raised
 	err = cs.Gather(&acc)
 	require.Error(t, err)
 
-	mps3 := MockPS{}
+	mps3 := system.MockPS{}
 	mps3.On("CPUTimes").Return([]cpu.TimesStat{cts3}, nil)
 	cs.ps = &mps3
 

plugins/inputs/system/disk.go → plugins/inputs/disk/disk.go

@@ -1,15 +1,16 @@
-package system
+package disk
 
 import (
 	"fmt"
 	"strings"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 type DiskStats struct {
-	ps PS
+	ps system.PS
 
 	// Legacy support
 	Mountpoints []string
@@ -105,7 +106,7 @@ func parseOptions(opts string) MountOptions {
 }
 
 func init() {
-	ps := newSystemPS()
+	ps := system.NewSystemPS()
 	inputs.Add("disk", func() telegraf.Input {
 		return &DiskStats{ps: ps}
 	})

plugins/inputs/system/disk_test.go → plugins/inputs/disk/disk_test.go

@@ -1,9 +1,10 @@
-package system
+package disk
 
 import (
 	"os"
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/stretchr/testify/assert"
@@ -17,7 +18,7 @@ type MockFileInfo struct {
 
 func TestDiskUsage(t *testing.T) {
 	mck := &mock.Mock{}
-	mps := MockPSDisk{&systemPS{&mockDiskUsage{mck}}, mck}
+	mps := system.MockPSDisk{SystemPS: &system.SystemPS{PSDiskDeps: &system.MockDiskUsage{Mock: mck}}, Mock: mck}
 	defer mps.AssertExpectations(t)
 
 	var acc testutil.Accumulator
@@ -229,7 +230,7 @@ func TestDiskUsageHostMountPrefix(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mck := &mock.Mock{}
-			mps := MockPSDisk{&systemPS{&mockDiskUsage{mck}}, mck}
+			mps := system.MockPSDisk{SystemPS: &system.SystemPS{PSDiskDeps: &system.MockDiskUsage{Mock: mck}}, Mock: mck}
 			defer mps.AssertExpectations(t)
 
 			var acc testutil.Accumulator
@@ -252,7 +253,7 @@ func TestDiskUsageHostMountPrefix(t *testing.T) {
 }
 
 func TestDiskStats(t *testing.T) {
-	var mps MockPS
+	var mps system.MockPS
 	defer mps.AssertExpectations(t)
 	var acc testutil.Accumulator
 	var err error

plugins/inputs/system/diskio.go → plugins/inputs/diskio/diskio.go

@@ -1,4 +1,4 @@
-package system
+package diskio
 
 import (
 	"fmt"
@@ -9,14 +9,15 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/filter"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 )
 
 var (
 	varRegex = regexp.MustCompile(`\$(?:\w+|\{\w+\})`)
 )
 
 type DiskIO struct {
-	ps PS
+	ps system.PS
 
 	Devices          []string
 	DeviceTags       []string
@@ -189,7 +190,7 @@ func (s *DiskIO) diskTags(devName string) map[string]string {
 }
 
 func init() {
-	ps := newSystemPS()
+	ps := system.NewSystemPS()
 	inputs.Add("diskio", func() telegraf.Input {
 		return &DiskIO{ps: ps, SkipSerialNumber: true}
 	})

plugins/inputs/system/diskio_linux.go → plugins/inputs/diskio/diskio_linux.go

@@ -1,4 +1,4 @@
-package system
+package diskio
 
 import (
 	"bufio"

plugins/inputs/system/diskio_linux_test.go → plugins/inputs/diskio/diskio_linux_test.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package diskio
 
 import (
 	"io/ioutil"

plugins/inputs/system/diskio_other.go → plugins/inputs/diskio/diskio_other.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package system
+package diskio
 
 type diskInfoCache struct{}
 

plugins/inputs/system/diskio_test.go → plugins/inputs/diskio/diskio_test.go

@@ -1,8 +1,9 @@
-package system
+package diskio
 
 import (
 	"testing"
 
+	"github.com/influxdata/telegraf/plugins/inputs/system"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/stretchr/testify/require"
@@ -96,7 +97,7 @@ func TestDiskIO(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			var mps MockPS
+			var mps system.MockPS
 			mps.On("DiskIO").Return(tt.result.stats, tt.result.err)
 
 			var acc testutil.Accumulator

plugins/inputs/system/kernel.go → plugins/inputs/kernel/kernel.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel
 
 import (
 	"bytes"

plugins/inputs/system/kernel_notlinux.go → plugins/inputs/kernel/kernel_notlinux.go

@@ -1,6 +1,6 @@
 // +build !linux
 
-package system
+package kernel
 
 import (
 	"github.com/influxdata/telegraf"

plugins/inputs/system/kernel_test.go → plugins/inputs/kernel/kernel_test.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel
 
 import (
 	"io/ioutil"
@@ -168,7 +168,7 @@ const entropyStatFile_Partial = `1024`
 const entropyStatFile_Invalid = ``
 
 func makeFakeStatFile(content []byte) string {
-	tmpfile, err := ioutil.TempFile("", "kerneltest")
+	tmpfile, err := ioutil.TempFile("", "kernel_test")
 	if err != nil {
 		panic(err)
 	}

plugins/inputs/system/kernel_vmstat.go → plugins/inputs/kernel_vmstat/kernel_vmstat.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel_vmstat
 
 import (
 	"bytes"

plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go

@@ -0,0 +1,3 @@
+// +build !linux
+
+package kernel_vmstat

plugins/inputs/system/kernel_vmstat_test.go → plugins/inputs/kernel_vmstat/kernel_vmstat_test.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package system
+package kernel_vmstat
 
 import (
 	"io/ioutil"
@@ -13,7 +13,7 @@ import (
 )
 
 func TestFullVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Full))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Full))
 	defer os.Remove(tmpfile)
 
 	k := KernelVmstat{
@@ -121,7 +121,7 @@ func TestFullVmStatProcFile(t *testing.T) {
 }
 
 func TestPartialVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Partial))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Partial))
 	defer os.Remove(tmpfile)
 
 	k := KernelVmstat{
@@ -151,7 +151,7 @@ func TestPartialVmStatProcFile(t *testing.T) {
 }
 
 func TestInvalidVmStatProcFile1(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Invalid))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Invalid))
 	defer os.Remove(tmpfile)
 
 	k := KernelVmstat{
@@ -164,7 +164,7 @@ func TestInvalidVmStatProcFile1(t *testing.T) {
 }
 
 func TestNoVmStatProcFile(t *testing.T) {
-	tmpfile := makeFakeStatFile([]byte(vmStatFile_Invalid))
+	tmpfile := makeFakeVmStatFile([]byte(vmStatFile_Invalid))
 	os.Remove(tmpfile)
 
 	k := KernelVmstat{

plugins/inputs/system/linux_sysctl_fs.go → plugins/inputs/linux_sysctl_fs/linux_sysctl_fs.go

@@ -1,4 +1,4 @@
-package system
+package linux_sysctl_fs
 
 import (
 	"bytes"

plugins/inputs/system/linux_sysctl_fs_test.go → plugins/inputs/linux_sysctl_fs/linux_sysctl_fs_test.go

@@ -1,4 +1,4 @@
-package system
+package linux_sysctl_fs
 
 import (
 	"io/ioutil"