From 416ccf12288a2762bbe417546dcd869956155a82 Mon Sep 17 00:00:00 2001 From: Ben Reedy Date: Mon, 13 Mar 2023 09:32:17 +1000 Subject: [PATCH] chore(deps): bump github.com/alecthomas/kingpin Bumps [github.com/alecthomas/kingpin](https://github.com/alecthomas/kingpin) from v2.2.6 to v2.3.2. This also changes the upstream package name from gopkg.in/alecthomas/kingpin.v2 to github.com/alecthomas/kingpin/v2 which is required by the upstream exporter-toolkit package. Signed-off-by: Ben Reedy --- collector/dfsr.go | 2 +- collector/exchange.go | 2 +- collector/iis.go | 2 +- collector/logical_disk.go | 2 +- collector/msmq.go | 2 +- collector/mssql.go | 2 +- collector/net.go | 2 +- collector/process.go | 2 +- collector/scheduled_task.go | 2 +- collector/service.go | 2 +- collector/smtp.go | 2 +- collector/textfile.go | 2 +- config/config.go | 2 +- exporter.go | 2 +- go.mod | 2 +- go.sum | 2 -- log/log.go | 2 +- 17 files changed, 16 insertions(+), 18 deletions(-) diff --git a/collector/dfsr.go b/collector/dfsr.go index ef438ee3..a5e176e4 100644 --- a/collector/dfsr.go +++ b/collector/dfsr.go @@ -4,9 +4,9 @@ package collector import ( + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) var dfsrEnabledCollectors = kingpin.Flag("collectors.dfsr.sources-enabled", "Comma-seperated list of DFSR Perflib sources to use.").Default("connection,folder,volume").String() diff --git a/collector/exchange.go b/collector/exchange.go index 25b0354d..5d443e7f 100644 --- a/collector/exchange.go +++ b/collector/exchange.go @@ -8,9 +8,9 @@ import ( "os" "strings" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) func init() { diff --git a/collector/iis.go b/collector/iis.go index 5703e37d..95f383c4 100644 --- a/collector/iis.go +++ b/collector/iis.go @@ -7,10 +7,10 @@ import ( "fmt" "regexp" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sys/windows/registry" - "gopkg.in/alecthomas/kingpin.v2" ) func init() { diff --git a/collector/logical_disk.go b/collector/logical_disk.go index 8dedf12e..a9c4c013 100644 --- a/collector/logical_disk.go +++ b/collector/logical_disk.go @@ -7,9 +7,9 @@ import ( "fmt" "regexp" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) func init() { diff --git a/collector/msmq.go b/collector/msmq.go index 864d7d8f..ab419faf 100644 --- a/collector/msmq.go +++ b/collector/msmq.go @@ -6,10 +6,10 @@ package collector import ( "strings" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" "github.com/yusufpapurcu/wmi" - "gopkg.in/alecthomas/kingpin.v2" ) func init() { diff --git a/collector/mssql.go b/collector/mssql.go index d8430e01..0947daa0 100644 --- a/collector/mssql.go +++ b/collector/mssql.go @@ -11,10 +11,10 @@ import ( "sync" "time" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sys/windows/registry" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/net.go b/collector/net.go index 392314c6..cce16f66 100644 --- a/collector/net.go +++ b/collector/net.go @@ -7,9 +7,9 @@ import ( "fmt" "regexp" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) func init() { diff --git a/collector/process.go b/collector/process.go index 32326940..5927dba0 100644 --- a/collector/process.go +++ b/collector/process.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" "github.com/yusufpapurcu/wmi" - "gopkg.in/alecthomas/kingpin.v2" ) func init() { diff --git a/collector/scheduled_task.go b/collector/scheduled_task.go index 20bc4b41..76e528a1 100644 --- a/collector/scheduled_task.go +++ b/collector/scheduled_task.go @@ -9,11 +9,11 @@ import ( "runtime" "strings" + "github.com/alecthomas/kingpin/v2" ole "github.com/go-ole/go-ole" "github.com/go-ole/go-ole/oleutil" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" ) var ( diff --git a/collector/service.go b/collector/service.go index 733a6b08..178ed9ce 100644 --- a/collector/service.go +++ b/collector/service.go @@ -8,12 +8,12 @@ import ( "strings" "syscall" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" "github.com/yusufpapurcu/wmi" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc/mgr" - "gopkg.in/alecthomas/kingpin.v2" ) func init() { diff --git a/collector/smtp.go b/collector/smtp.go index 94650123..b3cd406a 100644 --- a/collector/smtp.go +++ b/collector/smtp.go @@ -5,9 +5,9 @@ package collector import ( "fmt" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" - "gopkg.in/alecthomas/kingpin.v2" "regexp" ) diff --git a/collector/textfile.go b/collector/textfile.go index 2a8d6617..a51b4593 100644 --- a/collector/textfile.go +++ b/collector/textfile.go @@ -27,12 +27,12 @@ import ( "strings" "time" + kingpin "github.com/alecthomas/kingpin/v2" "github.com/dimchansky/utfbom" "github.com/prometheus-community/windows_exporter/log" "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/config/config.go b/config/config.go index b7f08bd5..a87a9348 100644 --- a/config/config.go +++ b/config/config.go @@ -17,8 +17,8 @@ import ( "io/ioutil" "os" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/log" - "gopkg.in/alecthomas/kingpin.v2" "gopkg.in/yaml.v3" ) diff --git a/exporter.go b/exporter.go index 378005d3..9685afe8 100644 --- a/exporter.go +++ b/exporter.go @@ -24,13 +24,13 @@ import ( "github.com/prometheus-community/windows_exporter/config" "github.com/yusufpapurcu/wmi" + "github.com/alecthomas/kingpin/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/common/version" "github.com/prometheus/exporter-toolkit/web" webflag "github.com/prometheus/exporter-toolkit/web/kingpinflag" - "gopkg.in/alecthomas/kingpin.v2" ) type windowsCollector struct { diff --git a/go.mod b/go.mod index a9e6b94f..9fc3f335 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.13 require ( github.com/Microsoft/hcsshim v0.9.7 + github.com/alecthomas/kingpin/v2 v2.3.2 github.com/dimchansky/utfbom v1.1.1 github.com/go-kit/log v0.2.1 github.com/go-ole/go-ole v1.2.6 @@ -15,6 +16,5 @@ require ( github.com/sirupsen/logrus v1.9.0 github.com/yusufpapurcu/wmi v1.2.2 golang.org/x/sys v0.6.0 - gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index cadb4a4d..56d5e44b 100644 --- a/go.sum +++ b/go.sum @@ -100,7 +100,6 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -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/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -1302,7 +1301,6 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw 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/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= -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-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/log/log.go b/log/log.go index eccef380..f92453e2 100644 --- a/log/log.go +++ b/log/log.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" + "github.com/alecthomas/kingpin/v2" "github.com/sirupsen/logrus" - "gopkg.in/alecthomas/kingpin.v2" ) // setSyslogFormatter is nil if the target architecture does not support syslog.