Merge pull request #1380 from prometheus-community/docs/README

Co-authored-by: Ben Reedy <breed808@users.noreply.github.com>
Signed-off-by: Jan-Otto Kröpke <github@jkroepke.de>

.github/workflows/lint.yml

@@ -77,6 +77,15 @@ jobs:
       - name: Promtool
         run: make promtool
 
+      - name: Upload windows_exporter.exe
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: windows_exporter.amd64.exe
+          path: 'windows_exporter.exe'
+          retention-days: 7
+          if-no-files-found: error
+
   lint:
     runs-on: windows-2022
     steps:

.github/workflows/release.yml

@@ -62,7 +62,7 @@ jobs:
           (Get-Content -Path VERSION) -replace '\+', '_' | Set-Content -Path VERSION
           make build-all
           # GH requires all files to have different names, so add version/arch to differentiate
-          foreach($Arch in "amd64", "arm64","386") {
+          foreach($Arch in "amd64", "arm64") {
             Move-Item output\$Arch\windows_exporter.exe output\windows_exporter-$Version-$Arch.exe
           }
 
@@ -80,7 +80,7 @@ jobs:
           $TagName = $env:GITHUB_REF -replace 'refs/tags/', ''
           # The MSI version is not semver compliant, so just take the numerical parts
           $MSIVersion = $TagName -replace '^v?([0-9\.]+).*$','$1'
-          foreach($Arch in "amd64", "arm64", "386") {
+          foreach($Arch in "amd64", "arm64") {
             Write-Verbose "Building windows_exporter $MSIVersion msi for $Arch"
             .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $MSIVersion -Arch "$Arch"
             Move-Item installer\windows_exporter-$MSIVersion-$Arch.msi output\

Makefile

@@ -41,7 +41,6 @@ crossbuild:
 	# on Windows, so for now, we'll just build twice
 	GOARCH=amd64 promu build --prefix=output/amd64
 	GOARCH=arm64 promu build --prefix=output/arm64
-	GOARCH=386   promu build --prefix=output/386
 
 build-image: crossbuild
 	$(DOCKER) build --build-arg=BASE=$(BASE_IMAGE):$(OS) -f Dockerfile -t $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$(OS) .

docs/README.md

@@ -3,20 +3,32 @@ This directory contains documentation of the collectors in the windows_exporter,
 
 # Collectors
 - [`ad`](collector.ad.md)
+- [`adcs`](collector.adcs.md)
 - [`adfs`](collector.adfs.md)
+- [`cache`](collector.cache.md)
+- [`container`](collector.container.md)
 - [`cpu`](collector.cpu.md)
+- [`cpu_info`](collector.cpu_info.md)
 - [`cs`](collector.cs.md)
-- [`diskdrive`](collector.diskdrive.md)]
 - [`dfsr`](collector.dfsr.md)
 - [`dhcp`](collector.dhcp.md)
+- [`diskdrive`](collector.diskdrive.md)
 - [`dns`](collector.dns.md)
+- [`exchange`](collector.exchange.md)
+- [`fsrmquota`](collector.fsrmquota.md)
 - [`hyperv`](collector.hyperv.md)
 - [`iis`](collector.iis.md)
 - [`logical_disk`](collector.logical_disk.md)
 - [`logon`](collector.logon.md)
 - [`memory`](collector.memory.md)
+- [`mscluster_cluster`](collector.mscluster_cluster.md)
+- [`mscluster_network`](collector.mscluster_network.md)
+- [`mscluster_node`](collector.mscluster_node.md)
+- [`mscluster_resource`](collector.mscluster_resource.md)
+- [`mscluster_resourcegroup`](collector.mscluster_resourcegroup.md)
 - [`msmq`](collector.msmq.md)
 - [`mssql`](collector.mssql.md)
+- [`net`](collector.net.md)
 - [`netframework_clrexceptions`](collector.netframework_clrexceptions.md)
 - [`netframework_clrinterop`](collector.netframework_clrinterop.md)
 - [`netframework_clrjit`](collector.netframework_clrjit.md)
@@ -25,17 +37,21 @@ This directory contains documentation of the collectors in the windows_exporter,
 - [`netframework_clrmemory`](collector.netframework_clrmemory.md)
 - [`netframework_clrremoting`](collector.netframework_clrremoting.md)
 - [`netframework_clrsecurity`](collector.netframework_clrsecurity.md)
-- [`net`](collector.net.md)
 - [`nps`](collector.nps.md)
 - [`os`](collector.os.md)
+- [`physical_disk`](collector.physical_disk.md)
 - [`process`](collector.process.md)
 - [`remote_fx`](collector.remote_fx.md)
 - [`scheduled_task`](collector.scheduled_task.md)
 - [`service`](collector.service.md)
+- [`smb`](collector.smb.md)
 - [`smtp`](collector.smtp.md)
 - [`system`](collector.system.md)
 - [`tcp`](collector.tcp.md)
+- [`teradici_pcoip`](collector.teradici_pcoip.md)
 - [`terminal_services`](collector.terminal_services.md)
 - [`textfile`](collector.textfile.md)
+- [`thermalzone`](collector.thermalzone.md)
 - [`time`](collector.time.md)
 - [`vmware`](collector.vmware.md)
+- [`vmware_blast`](collector.vmware_blast.md)

exporter.go

@@ -153,6 +153,11 @@ func main() {
 		_ = level.Error(logger).Log("msg", "Couldn't load collectors", "err", err)
 		os.Exit(1)
 	}
+	err = collectors.SetPerfCounterQuery()
+	if err != nil {
+		_ = level.Error(logger).Log("msg", "Couldn't set performance counter query", "err", err)
+		os.Exit(1)
+	}
 
 	if u, err := user.Current(); err != nil {
 		_ = level.Warn(logger).Log("msg", "Unable to determine which user is running this exporter. More info: https://github.com/golang/go/issues/37348")

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.3
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
-	golang.org/x/sys v0.15.0
+	golang.org/x/sys v0.16.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -161,8 +161,8 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

installer/build.ps1

@@ -5,7 +5,7 @@ Param (
     [Parameter(Mandatory = $true)]
     [String] $Version,
     [Parameter(Mandatory = $false)]
-    [ValidateSet("amd64", "arm64", "386")]
+    [ValidateSet("amd64", "arm64")]
     [String] $Arch = "amd64"
 )
 $ErrorActionPreference = "Stop"
@@ -23,7 +23,7 @@ mkdir -Force Work | Out-Null
 Copy-Item -Force $PathToExecutable Work/windows_exporter.exe
 
 Write-Verbose "Creating windows_exporter-${Version}-${Arch}.msi"
-$wixArch = @{"amd64" = "x64"; "arm64" = "arm64"; "386" = "x86"}[$Arch]
+$wixArch = @{"amd64" = "x64"; "arm64" = "arm64"}[$Arch]
 $wixOpts = "-ext WixFirewallExtension -ext WixUtilExtension"
 Invoke-Expression "wix build -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\windows_exporter.wxs -d Version=$($Version) -ext WixToolset.Firewall.wixext -ext WixToolset.Util.wixext"
 

pkg/initiate/initiate.go

@@ -13,9 +13,7 @@ const (
 	serviceName = "windows_exporter"
 )
 
-type windowsExporterService struct {
-	stopCh chan<- bool
-}
+type windowsExporterService struct{}
 
 var logger *eventlog.Log
 
@@ -39,7 +37,6 @@ loop:
 			}
 		}
 	}
-	s.stopCh <- true
 	return
 }
 
@@ -63,10 +60,11 @@ func init() {
 		}
 		_ = logger.Info(100, "Attempting to start exporter service")
 		go func() {
-			err = svc.Run(serviceName, &windowsExporterService{stopCh: StopCh})
+			err = svc.Run(serviceName, &windowsExporterService{})
 			if err != nil {
 				_ = logger.Error(102, fmt.Sprintf("Failed to start service: %v", err))
 			}
+			StopCh <- true
 		}()
 	}
 }