From 7886cf9e37b545a3b48d6574528e404915d226d8 Mon Sep 17 00:00:00 2001 From: Ben Reedy Date: Sun, 12 Mar 2023 10:27:31 +1000 Subject: [PATCH] chore(deps): Update wmi to v1.2.2 This includes a move from github.com/StackExchange/wmi to github.com/yusufpapurcu/wmi, as the StackExchange repository has been archived. Signed-off-by: Ben Reedy --- collector/ad.go | 2 +- collector/cpu_info.go | 2 +- collector/diskdrive.go | 2 +- collector/dns.go | 2 +- collector/fsrmquota.go | 2 +- collector/hyperv.go | 2 +- collector/logon.go | 2 +- collector/mscluster_cluster.go | 3 +-- collector/mscluster_network.go | 3 +-- collector/mscluster_node.go | 3 +-- collector/mscluster_resource.go | 3 +-- collector/mscluster_resourcegroup.go | 3 +-- collector/msmq.go | 2 +- collector/netframework_clrexceptions.go | 2 +- collector/netframework_clrinterop.go | 2 +- collector/netframework_clrjit.go | 2 +- collector/netframework_clrloading.go | 2 +- collector/netframework_clrlocksandthreads.go | 2 +- collector/netframework_clrmemory.go | 2 +- collector/netframework_clrremoting.go | 2 +- collector/netframework_clrsecurity.go | 2 +- collector/process.go | 2 +- collector/service.go | 2 +- collector/teradici_pcoip.go | 2 +- collector/terminal_services.go | 2 +- collector/thermalzone.go | 2 +- collector/vmware.go | 2 +- collector/vmware_blast.go | 2 +- exporter.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- tools/collector-generator/collector.template | 2 +- 32 files changed, 33 insertions(+), 38 deletions(-) diff --git a/collector/ad.go b/collector/ad.go index cbf0b57a..bf2dc7b6 100644 --- a/collector/ad.go +++ b/collector/ad.go @@ -6,9 +6,9 @@ package collector import ( "errors" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/cpu_info.go b/collector/cpu_info.go index 3c087f04..37f16bf1 100644 --- a/collector/cpu_info.go +++ b/collector/cpu_info.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/diskdrive.go b/collector/diskdrive.go index 451a5904..3cce8759 100644 --- a/collector/diskdrive.go +++ b/collector/diskdrive.go @@ -7,9 +7,9 @@ import ( "errors" "strings" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/dns.go b/collector/dns.go index 037766a2..0375e68b 100644 --- a/collector/dns.go +++ b/collector/dns.go @@ -6,9 +6,9 @@ package collector import ( "errors" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/fsrmquota.go b/collector/fsrmquota.go index 23c7c097..563d0ee1 100644 --- a/collector/fsrmquota.go +++ b/collector/fsrmquota.go @@ -1,9 +1,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/hyperv.go b/collector/hyperv.go index 761b5d94..8438bd6d 100644 --- a/collector/hyperv.go +++ b/collector/hyperv.go @@ -6,9 +6,9 @@ package collector import ( "strings" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/logon.go b/collector/logon.go index 182f6bdb..bc9625b0 100644 --- a/collector/logon.go +++ b/collector/logon.go @@ -6,9 +6,9 @@ package collector import ( "errors" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/mscluster_cluster.go b/collector/mscluster_cluster.go index 2f819ca9..bc37de41 100644 --- a/collector/mscluster_cluster.go +++ b/collector/mscluster_cluster.go @@ -1,8 +1,8 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { @@ -560,7 +560,6 @@ func newMSCluster_ClusterCollector() (Collector, error) { // MSCluster_Cluster docs: // - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-cluster -// type MSCluster_Cluster struct { Name string diff --git a/collector/mscluster_network.go b/collector/mscluster_network.go index f0281ef5..d9fa8159 100644 --- a/collector/mscluster_network.go +++ b/collector/mscluster_network.go @@ -1,8 +1,8 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { @@ -56,7 +56,6 @@ func newMSCluster_NetworkCollector() (Collector, error) { // MSCluster_Network docs: // - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-network -// type MSCluster_Network struct { Name string diff --git a/collector/mscluster_node.go b/collector/mscluster_node.go index e3f375f4..7bb9714e 100644 --- a/collector/mscluster_node.go +++ b/collector/mscluster_node.go @@ -1,8 +1,8 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { @@ -119,7 +119,6 @@ func newMSCluster_NodeCollector() (Collector, error) { // MSCluster_Node docs: // - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-node -// type MSCluster_Node struct { Name string diff --git a/collector/mscluster_resource.go b/collector/mscluster_resource.go index 1c50aea7..ff0532c6 100644 --- a/collector/mscluster_resource.go +++ b/collector/mscluster_resource.go @@ -1,8 +1,8 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { @@ -133,7 +133,6 @@ func newMSCluster_ResourceCollector() (Collector, error) { // MSCluster_Resource docs: // - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-resource -// type MSCluster_Resource struct { Name string Type string diff --git a/collector/mscluster_resourcegroup.go b/collector/mscluster_resourcegroup.go index a98bed40..693891af 100644 --- a/collector/mscluster_resourcegroup.go +++ b/collector/mscluster_resourcegroup.go @@ -1,8 +1,8 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { @@ -114,7 +114,6 @@ func newMSCluster_ResourceGroupCollector() (Collector, error) { // MSCluster_ResourceGroup docs: // - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-resourcegroup -// type MSCluster_ResourceGroup struct { Name string diff --git a/collector/msmq.go b/collector/msmq.go index d3638f5a..864d7d8f 100644 --- a/collector/msmq.go +++ b/collector/msmq.go @@ -6,9 +6,9 @@ package collector import ( "strings" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/collector/netframework_clrexceptions.go b/collector/netframework_clrexceptions.go index 134e457d..8f25387a 100644 --- a/collector/netframework_clrexceptions.go +++ b/collector/netframework_clrexceptions.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/netframework_clrinterop.go b/collector/netframework_clrinterop.go index fb4cfdcd..f6a490f4 100644 --- a/collector/netframework_clrinterop.go +++ b/collector/netframework_clrinterop.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/netframework_clrjit.go b/collector/netframework_clrjit.go index ca1e3e6e..b5605f40 100644 --- a/collector/netframework_clrjit.go +++ b/collector/netframework_clrjit.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/netframework_clrloading.go b/collector/netframework_clrloading.go index f0541388..713294b8 100644 --- a/collector/netframework_clrloading.go +++ b/collector/netframework_clrloading.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/netframework_clrlocksandthreads.go b/collector/netframework_clrlocksandthreads.go index e5290474..5cc9b8ea 100644 --- a/collector/netframework_clrlocksandthreads.go +++ b/collector/netframework_clrlocksandthreads.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/netframework_clrmemory.go b/collector/netframework_clrmemory.go index 74fbe1fe..0909d5a7 100644 --- a/collector/netframework_clrmemory.go +++ b/collector/netframework_clrmemory.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/netframework_clrremoting.go b/collector/netframework_clrremoting.go index a4ad25ac..49c7b3a9 100644 --- a/collector/netframework_clrremoting.go +++ b/collector/netframework_clrremoting.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/netframework_clrsecurity.go b/collector/netframework_clrsecurity.go index 416bc7af..25269f85 100644 --- a/collector/netframework_clrsecurity.go +++ b/collector/netframework_clrsecurity.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/process.go b/collector/process.go index d19076de..32326940 100644 --- a/collector/process.go +++ b/collector/process.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/collector/service.go b/collector/service.go index 949872a6..733a6b08 100644 --- a/collector/service.go +++ b/collector/service.go @@ -8,9 +8,9 @@ import ( "strings" "syscall" - "github.com/StackExchange/wmi" "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" diff --git a/collector/teradici_pcoip.go b/collector/teradici_pcoip.go index cda5b756..ada796cc 100644 --- a/collector/teradici_pcoip.go +++ b/collector/teradici_pcoip.go @@ -6,9 +6,9 @@ package collector import ( "errors" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/terminal_services.go b/collector/terminal_services.go index 95237147..0e6e2186 100644 --- a/collector/terminal_services.go +++ b/collector/terminal_services.go @@ -7,9 +7,9 @@ import ( "errors" "strings" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) const ConnectionBrokerFeatureID uint32 = 133 diff --git a/collector/thermalzone.go b/collector/thermalzone.go index 3629d473..cc18bd82 100644 --- a/collector/thermalzone.go +++ b/collector/thermalzone.go @@ -3,9 +3,9 @@ package collector import ( "errors" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/vmware.go b/collector/vmware.go index 0373f774..cf77bd64 100644 --- a/collector/vmware.go +++ b/collector/vmware.go @@ -6,9 +6,9 @@ package collector import ( "errors" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/collector/vmware_blast.go b/collector/vmware_blast.go index 320f6c01..f6bb4c65 100644 --- a/collector/vmware_blast.go +++ b/collector/vmware_blast.go @@ -4,9 +4,9 @@ package collector import ( - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/log" "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" ) func init() { diff --git a/exporter.go b/exporter.go index 1f26a169..378005d3 100644 --- a/exporter.go +++ b/exporter.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "github.com/StackExchange/wmi" "github.com/prometheus-community/windows_exporter/collector" "github.com/prometheus-community/windows_exporter/config" + "github.com/yusufpapurcu/wmi" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" diff --git a/go.mod b/go.mod index 9f3ceed4..b4fa09d6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.13 require ( github.com/Microsoft/hcsshim v0.9.7 - github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f github.com/dimchansky/utfbom v1.1.1 github.com/go-kit/log v0.2.1 github.com/go-ole/go-ole v1.2.6 @@ -14,6 +13,7 @@ require ( github.com/prometheus/common v0.39.0 github.com/prometheus/exporter-toolkit v0.8.2 github.com/sirupsen/logrus v1.9.0 + github.com/yusufpapurcu/wmi v1.2.2 golang.org/x/sys v0.4.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 4528c314..bc4ab07f 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,6 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY= -github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= 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= @@ -744,6 +742,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= diff --git a/tools/collector-generator/collector.template b/tools/collector-generator/collector.template index 8e6685da..f8add001 100644 --- a/tools/collector-generator/collector.template +++ b/tools/collector-generator/collector.template @@ -1,6 +1,6 @@ package collector import ( - "github.com/StackExchange/wmi" + "github.com/yusufpapurcu/wmi" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus-community/windows_exporter/log" )