From f83245ae6b18a3667e45bdef59d81aa96e135fca Mon Sep 17 00:00:00 2001 From: junya koyama Date: Sat, 4 Mar 2023 22:59:25 +0900 Subject: [PATCH] build(deps): migrating kingpin.v2 to github.com/alecthomas/kingpin/v2 Signed-off-by: junya koyama --- collector/arp_linux.go | 2 +- collector/bcache_linux.go | 2 +- collector/collector.go | 2 +- collector/cpu_linux.go | 2 +- collector/diskstats_common.go | 2 +- collector/ethtool_linux.go | 2 +- collector/filesystem_common.go | 2 +- collector/filesystem_linux.go | 2 +- collector/filesystem_linux_test.go | 2 +- collector/ipvs_linux.go | 2 +- collector/ipvs_linux_test.go | 2 +- collector/netclass_linux.go | 2 +- collector/netclass_rtnl_linux.go | 2 +- collector/netdev_common.go | 2 +- collector/netdev_linux.go | 2 +- collector/netstat_linux.go | 2 +- collector/ntp.go | 2 +- collector/paths.go | 2 +- collector/paths_test.go | 2 +- collector/perf_linux.go | 2 +- collector/powersupplyclass.go | 2 +- collector/processes_linux_test.go | 2 +- collector/qdisc_linux.go | 2 +- collector/rapl_linux.go | 2 +- collector/runit.go | 2 +- collector/stat_linux.go | 2 +- collector/supervisord.go | 2 +- collector/sysctl_linux.go | 2 +- collector/systemd_linux.go | 2 +- collector/tapestats_linux.go | 2 +- collector/textfile.go | 2 +- collector/textfile_test.go | 2 +- collector/vmstat_linux.go | 2 +- collector/wifi_linux.go | 2 +- go.mod | 16 ++++++++-------- go.sum | 29 ++++++++++++++--------------- node_exporter.go | 2 +- 37 files changed, 57 insertions(+), 58 deletions(-) diff --git a/collector/arp_linux.go b/collector/arp_linux.go index b2cd62c701..ce4f058345 100644 --- a/collector/arp_linux.go +++ b/collector/arp_linux.go @@ -18,10 +18,10 @@ package collector import ( "fmt" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/bcache_linux.go b/collector/bcache_linux.go index 63a22d033a..002a7f4062 100644 --- a/collector/bcache_linux.go +++ b/collector/bcache_linux.go @@ -19,10 +19,10 @@ package collector import ( "fmt" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs/bcache" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/collector.go b/collector/collector.go index 5edf27c81d..5c30585903 100644 --- a/collector/collector.go +++ b/collector/collector.go @@ -20,10 +20,10 @@ import ( "sync" "time" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) // Namespace defines the common namespace to be used by all metrics. diff --git a/collector/cpu_linux.go b/collector/cpu_linux.go index e16764d4f3..7bdd206547 100644 --- a/collector/cpu_linux.go +++ b/collector/cpu_linux.go @@ -24,12 +24,12 @@ import ( "strconv" "sync" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs" "github.com/prometheus/procfs/sysfs" - "gopkg.in/alecthomas/kingpin.v2" ) type cpuCollector struct { diff --git a/collector/diskstats_common.go b/collector/diskstats_common.go index 09ba917cec..cafff99b43 100644 --- a/collector/diskstats_common.go +++ b/collector/diskstats_common.go @@ -20,10 +20,10 @@ package collector import ( "errors" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) const ( diff --git a/collector/ethtool_linux.go b/collector/ethtool_linux.go index e4f05a6f5a..472a146e62 100644 --- a/collector/ethtool_linux.go +++ b/collector/ethtool_linux.go @@ -30,13 +30,13 @@ import ( "sync" "syscall" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs/sysfs" "github.com/safchain/ethtool" "golang.org/x/sys/unix" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/filesystem_common.go b/collector/filesystem_common.go index 930ba24650..8f4c601c35 100644 --- a/collector/filesystem_common.go +++ b/collector/filesystem_common.go @@ -21,10 +21,10 @@ import ( "errors" "regexp" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) // Arch-dependent implementation must define: diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.go index 19ad8145d8..0a3b4430f4 100644 --- a/collector/filesystem_linux.go +++ b/collector/filesystem_linux.go @@ -26,10 +26,10 @@ import ( "sync" "time" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "golang.org/x/sys/unix" - "gopkg.in/alecthomas/kingpin.v2" ) const ( diff --git a/collector/filesystem_linux_test.go b/collector/filesystem_linux_test.go index 1d18fd5920..1ae2f42091 100644 --- a/collector/filesystem_linux_test.go +++ b/collector/filesystem_linux_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - kingpin "gopkg.in/alecthomas/kingpin.v2" + kingpin "github.com/alecthomas/kingpin/v2" ) func Test_parseFilesystemLabelsError(t *testing.T) { diff --git a/collector/ipvs_linux.go b/collector/ipvs_linux.go index 4a9c14b6d3..b4033ea2c1 100644 --- a/collector/ipvs_linux.go +++ b/collector/ipvs_linux.go @@ -24,11 +24,11 @@ import ( "strconv" "strings" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) type ipvsCollector struct { diff --git a/collector/ipvs_linux_test.go b/collector/ipvs_linux_test.go index fb62a930ae..0c6c57c2b7 100644 --- a/collector/ipvs_linux_test.go +++ b/collector/ipvs_linux_test.go @@ -24,9 +24,9 @@ import ( "github.com/go-kit/log" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "gopkg.in/alecthomas/kingpin.v2" ) func TestIPVSCollector(t *testing.T) { diff --git a/collector/netclass_linux.go b/collector/netclass_linux.go index 8f2b0d22b4..b5c79a7b92 100644 --- a/collector/netclass_linux.go +++ b/collector/netclass_linux.go @@ -22,11 +22,11 @@ import ( "os" "regexp" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs/sysfs" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/netclass_rtnl_linux.go b/collector/netclass_rtnl_linux.go index aecf27aeeb..b5e699644f 100644 --- a/collector/netclass_rtnl_linux.go +++ b/collector/netclass_rtnl_linux.go @@ -21,11 +21,11 @@ import ( "fmt" "io/fs" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log/level" "github.com/jsimonetti/rtnetlink" "github.com/mdlayher/ethtool" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/netdev_common.go b/collector/netdev_common.go index 0a9b522b84..371fddee9d 100644 --- a/collector/netdev_common.go +++ b/collector/netdev_common.go @@ -24,10 +24,10 @@ import ( "strconv" "sync" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/netdev_linux.go b/collector/netdev_linux.go index 527d33e470..4c3b09eaca 100644 --- a/collector/netdev_linux.go +++ b/collector/netdev_linux.go @@ -19,11 +19,11 @@ package collector import ( "fmt" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/jsimonetti/rtnetlink" "github.com/prometheus/procfs" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/netstat_linux.go b/collector/netstat_linux.go index a034ab6415..44226b22a6 100644 --- a/collector/netstat_linux.go +++ b/collector/netstat_linux.go @@ -26,9 +26,9 @@ import ( "strconv" "strings" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) const ( diff --git a/collector/ntp.go b/collector/ntp.go index d6ce44907f..0726ae9be4 100644 --- a/collector/ntp.go +++ b/collector/ntp.go @@ -22,10 +22,10 @@ import ( "sync" "time" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/beevik/ntp" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) const ( diff --git a/collector/paths.go b/collector/paths.go index 61aa64708d..5602a52271 100644 --- a/collector/paths.go +++ b/collector/paths.go @@ -17,8 +17,8 @@ import ( "path/filepath" "strings" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/prometheus/procfs" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/paths_test.go b/collector/paths_test.go index eca7b3a48d..c2ddee9f3b 100644 --- a/collector/paths_test.go +++ b/collector/paths_test.go @@ -16,8 +16,8 @@ package collector import ( "testing" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/prometheus/procfs" - "gopkg.in/alecthomas/kingpin.v2" ) func TestDefaultProcPath(t *testing.T) { diff --git a/collector/perf_linux.go b/collector/perf_linux.go index e2405f1238..058397611a 100644 --- a/collector/perf_linux.go +++ b/collector/perf_linux.go @@ -22,12 +22,12 @@ import ( "strconv" "strings" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/hodgesds/perf-utils" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sys/unix" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) const ( diff --git a/collector/powersupplyclass.go b/collector/powersupplyclass.go index ffa4d4e61d..9c2ebd22b1 100644 --- a/collector/powersupplyclass.go +++ b/collector/powersupplyclass.go @@ -20,9 +20,9 @@ package collector import ( "regexp" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/processes_linux_test.go b/collector/processes_linux_test.go index 9a5c86f5be..9f896a84bf 100644 --- a/collector/processes_linux_test.go +++ b/collector/processes_linux_test.go @@ -19,9 +19,9 @@ package collector import ( "testing" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/procfs" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) func TestReadProcessStatus(t *testing.T) { diff --git a/collector/qdisc_linux.go b/collector/qdisc_linux.go index 5262e564dd..0a8d546371 100644 --- a/collector/qdisc_linux.go +++ b/collector/qdisc_linux.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/ema/qdisc" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) type qdiscStatCollector struct { diff --git a/collector/rapl_linux.go b/collector/rapl_linux.go index f6f7dfc795..46f405e7df 100644 --- a/collector/rapl_linux.go +++ b/collector/rapl_linux.go @@ -22,11 +22,11 @@ import ( "os" "strconv" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs/sysfs" - "gopkg.in/alecthomas/kingpin.v2" ) const raplCollectorSubsystem = "rapl" diff --git a/collector/runit.go b/collector/runit.go index 2449691dbb..c185dfee9c 100644 --- a/collector/runit.go +++ b/collector/runit.go @@ -17,11 +17,11 @@ package collector import ( + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/soundcloud/go-runit/runit" - "gopkg.in/alecthomas/kingpin.v2" ) var runitServiceDir = kingpin.Flag("collector.runit.servicedir", "Path to runit service directory.").Default("/etc/service").String() diff --git a/collector/stat_linux.go b/collector/stat_linux.go index 83ad2b6de8..852790b48f 100644 --- a/collector/stat_linux.go +++ b/collector/stat_linux.go @@ -19,10 +19,10 @@ package collector import ( "fmt" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs" - "gopkg.in/alecthomas/kingpin.v2" ) type statCollector struct { diff --git a/collector/supervisord.go b/collector/supervisord.go index b3b0f1372c..bf3f2e9db2 100644 --- a/collector/supervisord.go +++ b/collector/supervisord.go @@ -24,11 +24,11 @@ import ( "net/url" "time" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/mattn/go-xmlrpc" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/sysctl_linux.go b/collector/sysctl_linux.go index 4b0d105333..3aff056889 100644 --- a/collector/sysctl_linux.go +++ b/collector/sysctl_linux.go @@ -18,10 +18,10 @@ import ( "strconv" "strings" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/systemd_linux.go b/collector/systemd_linux.go index c81a3fa7ca..a06fd7e176 100644 --- a/collector/systemd_linux.go +++ b/collector/systemd_linux.go @@ -27,11 +27,11 @@ import ( "sync" "time" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/coreos/go-systemd/v22/dbus" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) const ( diff --git a/collector/tapestats_linux.go b/collector/tapestats_linux.go index 441ac61073..eaa89baaf1 100644 --- a/collector/tapestats_linux.go +++ b/collector/tapestats_linux.go @@ -21,11 +21,11 @@ import ( "os" "regexp" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/procfs/sysfs" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/textfile.go b/collector/textfile.go index 5bdda3b698..1d2b72e45d 100644 --- a/collector/textfile.go +++ b/collector/textfile.go @@ -24,12 +24,12 @@ import ( "strings" "time" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/textfile_test.go b/collector/textfile_test.go index 8ec2584756..17c6084cdf 100644 --- a/collector/textfile_test.go +++ b/collector/textfile_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/common/promlog" "github.com/prometheus/common/promlog/flag" - "gopkg.in/alecthomas/kingpin.v2" ) type collectorAdapter struct { diff --git a/collector/vmstat_linux.go b/collector/vmstat_linux.go index a59916573b..9f561de28e 100644 --- a/collector/vmstat_linux.go +++ b/collector/vmstat_linux.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) const ( diff --git a/collector/wifi_linux.go b/collector/wifi_linux.go index d8f5883852..032eed7436 100644 --- a/collector/wifi_linux.go +++ b/collector/wifi_linux.go @@ -23,11 +23,11 @@ import ( "os" "path/filepath" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/mdlayher/wifi" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) type wifiCollector struct { diff --git a/go.mod b/go.mod index 93fc7cccf4..5516684c45 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/prometheus/node_exporter go 1.18 require ( + github.com/alecthomas/kingpin/v2 v2.3.1 github.com/beevik/ntp v0.3.0 github.com/coreos/go-systemd/v22 v22.5.0 github.com/dennwc/btrfs v0.0.0-20221026161108-3097362dc072 @@ -22,17 +23,15 @@ require ( github.com/opencontainers/selinux v1.10.2 github.com/prometheus/client_golang v1.14.0 github.com/prometheus/client_model v0.3.0 - github.com/prometheus/common v0.39.0 - github.com/prometheus/exporter-toolkit v0.8.2 + github.com/prometheus/common v0.41.0 + github.com/prometheus/exporter-toolkit v0.8.3-0.20230303163244-2ee7ad310770 github.com/prometheus/procfs v0.9.0 github.com/safchain/ethtool v0.2.0 github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a golang.org/x/sys v0.5.0 - gopkg.in/alecthomas/kingpin.v2 v2.2.6 ) require ( - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect @@ -42,21 +41,22 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/jpillora/backoff v1.0.0 // indirect - github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mdlayher/genetlink v1.2.0 // indirect github.com/mdlayher/socket v0.4.0 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect + github.com/xhit/go-str2duration v1.2.0 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect + golang.org/x/crypto v0.6.0 // indirect golang.org/x/net v0.7.0 // indirect - golang.org/x/oauth2 v0.3.0 // indirect + golang.org/x/oauth2 v0.5.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/text v0.7.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index dda6e32a42..3c1664e1fe 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,6 @@ -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/kingpin/v2 v2.3.1 h1:ANLJcKmQm4nIaog7xdr/id6FM6zm5hHnfZrvtKPxqGg= +github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/beevik/ntp v0.3.0 h1:xzVrPrE4ziasFXgBVBZJDP0Wg/KpMwk2KHJ4Ba8GrDw= @@ -57,7 +58,6 @@ github.com/jsimonetti/rtnetlink v0.0.0-20190830100107-3784a6c7c552/go.mod h1:Oz+ github.com/jsimonetti/rtnetlink v1.3.0 h1:lScjubfLwewsD1F+YaDLiq1HDDq7IGADIhGATPwlKHg= github.com/jsimonetti/rtnetlink v1.3.0/go.mod h1:SDPgjZRgWa6SvsU59TWBji7nxZGDVHt0HarV7J9E0kM= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lufia/iostat v1.2.1 h1:tnCdZBIglgxD47RyD55kfWQcJMGzO+1QBziSQfesf2k= @@ -84,17 +84,16 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/opencontainers/selinux v1.10.2 h1:NFy2xCsjn7+WspbfZkUd5zyVeisV7VFbPSP96+8/ha4= github.com/opencontainers/selinux v1.10.2/go.mod h1:cARutUbaUrlRClyvxOICCgKixCs6L05aUsohzA3EkHQ= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= -github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= -github.com/prometheus/exporter-toolkit v0.8.2 h1:sbJAfBXQFkG6sUkbwBun8MNdzW9+wd5YfPYofbmj0YM= -github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0= +github.com/prometheus/common v0.41.0 h1:npo01n6vUlRViIj5fgwiK8vlNIh8bnoxqh3gypKsyAw= +github.com/prometheus/common v0.41.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/exporter-toolkit v0.8.3-0.20230303163244-2ee7ad310770 h1:opb1G+ajURR3+i15P6UqdOgMGVef9kjJ/sMZ73devNI= +github.com/prometheus/exporter-toolkit v0.8.3-0.20230303163244-2ee7ad310770/go.mod h1:6e3W/PU6ZRWjZIz9/NpRDAwQAWhsyDEogJSAJ2nHa98= github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= @@ -106,16 +105,19 @@ github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod h1:G81a github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a h1:os5OBNhwOwybXZMNLqT96XqtjdTtwRFw2w08uluvNeI= github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a/go.mod h1:LeFCbQYJ3KJlPs/FvPz2dy1tkpxyeNESVyCNNzRXFR0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/xhit/go-str2duration v1.2.0 h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc= +github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20221012134737-56aed061732a h1:NmSIgad6KjE6VvHciPZuNRTKxGhlPfD6OA87W/PLkqg= -golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -123,8 +125,8 @@ golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/oauth2 v0.3.0 h1:6l90koy8/LaBLmLu8jpHeHexzMwEita0zFfYlggy2F8= -golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= +golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= +golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= @@ -162,12 +164,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/node_exporter.go b/node_exporter.go index ac2ed880d3..3aec8208bb 100644 --- a/node_exporter.go +++ b/node_exporter.go @@ -26,6 +26,7 @@ import ( "github.com/prometheus/common/promlog" "github.com/prometheus/common/promlog/flag" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" @@ -35,7 +36,6 @@ import ( "github.com/prometheus/exporter-toolkit/web" "github.com/prometheus/exporter-toolkit/web/kingpinflag" "github.com/prometheus/node_exporter/collector" - kingpin "gopkg.in/alecthomas/kingpin.v2" ) // handler wraps an unfiltered http.Handler but uses a filtered handler,