added terminal services collector for number of session count

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @prometheus-community/windows_exporter-reviewers

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/ci.yml

@@ -1,142 +0,0 @@
-name: windows_exporter CI/CD
-
-# Trigger on pull requests and releases
-# Deployments will only occur for releases (see `if` clauses in the build job).
-on:
-  pull_request:
-    branches:
-      - master
-  release:
-    types:
-      - published
-      - edited
-
-jobs:
-  test:
-    runs-on: windows-2019
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '^1.17.5'
-
-      - name: Test
-        run: make test
-
-      - name: Install e2e deps
-        run: |
-          go get github.com/prometheus/promu@v0.11.1
-          go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.2.0
-          # GOPATH\bin dir must be appended to PATH else the `promu` command won't be found
-          echo "$(go env GOPATH)\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: e2e Test
-        run: make e2e-test
-
-  lint:
-    runs-on: windows-2019
-    steps:
-      # `gofmt` linter run by golangci-lint fails on CRLF line endings (the default for Windows)
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '^1.17.5'
-
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: v1.43
-          args: "--timeout=5m"
-
-      # golangci-lint action doesn't always provide helpful output, so re-run without the action for
-      # better output of the problem.
-      # The cache from the golangci-lint step is re-used here, so this step should finish quickly.
-      - name: errors
-        if: ${{ failure() }}
-        run: golangci-lint run --timeout=5m -c .golangci.yaml
-
-  codespell:
-    name: Check for spelling errors
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: codespell-project/actions-codespell@master
-        with:
-          check_filenames: true
-          # When using this Action in other repos, the --skip option below can be removed
-          skip: ./.git
-          ignore_words_list: calle
-
-  build:
-    runs-on: windows-2019
-    needs:
-      - test
-      - lint
-      - codespell
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          # fetch-depth required for gitversion in `Build` step
-          fetch-depth: 0
-
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '^1.17.5'
-
-      - name: Install Build deps
-        run: |
-          go get github.com/prometheus/promu@v0.11.1
-          go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.2.0
-          # GOPATH\bin dir must be added to PATH else the `promu` and `goversioninfo` commands won't be found
-          echo "$(go env GOPATH)\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Build
-        run: |
-          $ErrorActionPreference = "Stop"
-
-          gitversion /output json /showvariable FullSemVer | Set-Content VERSION -PassThru
-          $Version = Get-Content VERSION
-          # Windows versioninfo resources need the file version by parts (but product version is free text)
-          $VersionParts = ($Version -replace '^v?([0-9\.]+).*$','$1').Split(".")
-          goversioninfo.exe -ver-major $VersionParts[0] -ver-minor $VersionParts[1] -ver-patch $VersionParts[2] -product-version $Version -platform-specific
-
-          make crossbuild
-          # GH requires all files to have different names, so add version/arch to differentiate
-          foreach($Arch in "amd64","386") {
-            Move-Item output\$Arch\windows_exporter.exe output\windows_exporter-$Version-$Arch.exe
-          }
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: windows_exporter_binaries
-          path: output\windows_exporter-*.exe
-
-      - name: Build Release Artifacts
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          $ErrorActionPreference = "Stop"
-          $BuildVersion = Get-Content VERSION
-          $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","386") {
-            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\Output\windows_exporter-$MSIVersion-$Arch.msi output\
-          }
-
-          promu checksum output\
-
-      - name: Release
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          $TagName = $env:GITHUB_REF -replace 'refs/tags/', ''
-          Get-ChildItem -Path output\* -Include @('windows_exporter*.msi', 'windows_exporter*.exe', 'sha256sums.txt') | Foreach-Object {gh release upload $TagName $_}

.gitignore

@@ -4,5 +4,4 @@ VERSION
 *.un~
 output/
 .vscode
-.idea
-*.syso
+.idea

.golangci.yaml

@@ -3,10 +3,11 @@ linters:
   enable:
   - deadcode
   - errcheck
-  - revive
+  - golint
   - govet
   - gofmt
   - ineffassign
+  - interfacer
   - structcheck
   - unconvert
   - varcheck
@@ -19,7 +20,4 @@ issues:
   - # Golint has many capitalisation complaints on WMI class names
     text: "`?\\w+`? should be `?\\w+`?"
     linters:
-    - revive
-  - text: "don't use ALL_CAPS in Go names; use CamelCase"
-    linters:
-    - revive
+    - golint

.promu.yml

@@ -1,8 +1,8 @@
 repository:
-    path: github.com/prometheus-community/windows_exporter
+    path: github.com/martinlindhe/wmi_exporter
 build:
     binaries:
-        - name: windows_exporter
+        - name: wmi_exporter
     ldflags: |
         -X github.com/prometheus/common/version.Version={{.Version}}
         -X github.com/prometheus/common/version.Revision={{.Revision}}

AUTHORS.md

@@ -0,0 +1,4 @@
+Contributors in alphabetical order
+
+* [Martin Lindhe](https://github.com/martinlindhe)
+* [Calle Pettersson](https://github.com/carlpett)

CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-## Prometheus Community Code of Conduct
-
-Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

MAINTAINERS.md

@@ -1,9 +0,0 @@
-Maintainers in alphabetical order
-
-* [Ben Reedy](https://github.com/breed808) - breed808@breed808.com
-* [Calle Pettersson](https://github.com/carlpett) - calle@cape.nu
-
-Alumni
-
-* [Brian Brazil](https://github.com/brian-brazil)
-* [Martin Lindhe](https://github.com/martinlindhe)

Makefile

@@ -1,23 +1,14 @@
 export GOOS=windows
 
-.PHONY: build
-build: windows_exporter.exe
-windows_exporter.exe: **/*.go
+build:
 	promu build -v
 
 test:
 	go test -v ./...
 
-bench:
-	go test -v -bench='benchmark(cpu|logicaldisk|logon|memory|net|process|service|system|tcp|time)collector' ./...
-
 lint:
 	golangci-lint -c .golangci.yaml run
 
-.PHONY: e2e-test
-e2e-test: windows_exporter.exe
-	pwsh -NonInteractive -ExecutionPolicy Bypass -File .\tools\end-to-end-test.ps1
-
 fmt:
 	gofmt -l -w -s .
 

README.md

@@ -1,8 +1,8 @@
-# windows_exporter
+# WMI exporter
 
-![Build Status](https://github.com/prometheus-community/windows_exporter/workflows/windows_exporter%20CI/CD/badge.svg)
+[![Build status](https://ci.appveyor.com/api/projects/status/ljwan71as6pf2joe/branch/master?svg=true)](https://ci.appveyor.com/project/martinlindhe/wmi-exporter)
 
-A Prometheus exporter for Windows machines.
+Prometheus exporter for Windows machines, using the WMI (Windows Management Instrumentation).
 
 
 ## Collectors
@@ -10,18 +10,11 @@ A Prometheus exporter for Windows machines.
 Name     | Description | Enabled by default
 ---------|-------------|--------------------
 [ad](docs/collector.ad.md) | Active Directory Domain Services |
-[adcs](docs/collector.adcs.md) | Active Directory Certificate Services |
 [adfs](docs/collector.adfs.md) | Active Directory Federation Services |
-[cache](docs/collector.cache.md) | Cache metrics |
 [cpu](docs/collector.cpu.md) | CPU usage | ✓
-[cpu_info](docs/collector.cpu_info.md) | CPU Information |
 [cs](docs/collector.cs.md) | "Computer System" metrics (system properties, num cpus/total memory) | ✓
 [container](docs/collector.container.md) | Container metrics |
-[dfsr](docs/collector.dfsr.md) | DFSR metrics |
-[dhcp](docs/collector.dhcp.md) | DHCP Server |
 [dns](docs/collector.dns.md) | DNS Server |
-[exchange](docs/collector.exchange.md) | Exchange metrics |
-[fsrmquota](docs/collector.fsrmquota.md) | Microsoft File Server Resource Manager (FSRM) Quotas collector |
 [hyperv](docs/collector.hyperv.md) | Hyper-V hosts |
 [iis](docs/collector.iis.md) | IIS sites and applications |
 [logical_disk](docs/collector.logical_disk.md) | Logical disks, disk I/O | ✓
@@ -40,52 +33,19 @@ Name     | Description | Enabled by default
 [net](docs/collector.net.md) | Network interface I/O | ✓
 [os](docs/collector.os.md) | OS metrics (memory, processes, users) | ✓
 [process](docs/collector.process.md) | Per-process metrics |
-[remote_fx](docs/collector.remote_fx.md) | RemoteFX protocol (RDP) metrics |
 [service](docs/collector.service.md) | Service state metrics | ✓
-[smtp](docs/collector.smtp.md) | IIS SMTP Server |
 [system](docs/collector.system.md) | System calls | ✓
 [tcp](docs/collector.tcp.md) | TCP connections |
-[time](docs/collector.time.md) | Windows Time Service |
 [thermalzone](docs/collector.thermalzone.md) | Thermal information
-[terminal_services](docs/collector.terminal_services.md) | Terminal services (RDS)
 [textfile](docs/collector.textfile.md) | Read prometheus metrics from a text file | ✓
 [vmware](docs/collector.vmware.md) | Performance counters installed by the Vmware Guest agent |
 
 See the linked documentation on each collector for more information on reported metrics, configuration settings and usage examples.
 
-### Filtering enabled collectors
-
-The `windows_exporter` will expose all metrics from enabled collectors by default.  This is the recommended way to collect metrics to avoid errors when comparing metrics of different families.
-
-For advanced use the `windows_exporter` can be passed an optional list of collectors to filter metrics. The `collect[]` parameter may be used multiple times. In Prometheus configuration you can use this syntax under the [scrape config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#<scrape_config>).
-
-```
-  params:
-    collect[]:
-      - foo
-      - bar
-```
-
-This can be useful for having different Prometheus servers collect specific metrics from nodes.
-
-## Flags
-
-windows_exporter accepts flags to configure certain behaviours. The ones configuring the global behaviour of the exporter are listed below, while collector-specific ones are documented in the respective collector documentation above.
-
-Flag     | Description | Default value
----------|-------------|--------------------
-`--telemetry.addr` | host:port for exporter. | `:9182`
-`--telemetry.path` | URL path for surfacing collected metrics. | `/metrics`
-`--telemetry.max-requests` | Maximum number of concurrent requests. 0 to disable. | `5`
-`--collectors.enabled` | Comma-separated list of collectors to use. Use `[defaults]` as a placeholder which gets expanded containing all the collectors enabled by default." | `[defaults]`
-`--collectors.print` | If true, print available collectors and exit. | 
-`--scrape.timeout-margin` | Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads. | `0.5`
-`--web.config.file` | A [web config][web_config] for setting up TLS and Auth | None
-
 ## Installation
-The latest release can be downloaded from the [releases page](https://github.com/prometheus-community/windows_exporter/releases).
+The latest release can be downloaded from the [releases page](https://github.com/martinlindhe/wmi_exporter/releases).
 
-Each release provides a .msi installer. The installer will setup the windows_exporter as a Windows service, as well as create an exception in the Windows Firewall.
+Each release provides a .msi installer. The installer will setup the WMI Exporter as a Windows service, as well as create an exception in the Windows Firewall.
 
 If the installer is run without any parameters, the exporter will run with default settings for enabled collectors, ports, etc. The following parameters are available:
 
@@ -96,7 +56,6 @@ Name | Description
 `LISTEN_PORT` | The port to bind to. Defaults to 9182.
 `METRICS_PATH` | The path at which to serve metrics. Defaults to `/metrics`
 `TEXTFILE_DIR` | As the `--collector.textfile.directory` flag, provide a directory to read text files with metrics from
-`REMOTE_ADDR` | Allows setting comma separated remote IP addresses for the Windows Firewall exception (whitelist). Defaults to an empty string (any remote address).
 `EXTRA_FLAGS` | Allows passing full CLI flags. Defaults to an empty string.
 
 Parameters are sent to the installer via `msiexec`. Example invocations:
@@ -112,20 +71,21 @@ msiexec /i <path-to-msi-file> ENABLED_COLLECTORS=os,service --% EXTRA_FLAGS="--c
 
 On some older versions of Windows you may need to surround parameter values with double quotes to get the install command parsing properly:
 ```powershell
-msiexec /i C:\Users\Administrator\Downloads\windows_exporter.msi ENABLED_COLLECTORS="ad,iis,logon,memory,process,tcp,thermalzone" TEXTFILE_DIR="C:\custom_metrics\"
+msiexec /i C:\Users\Administrator\Downloads\wmi_exporter.msi ENABLED_COLLECTORS="ad,iis,logon,memory,process,tcp,thermalzone" TEXTFILE_DIR="C:\custom_metrics\"
 ```
 
-## Supported versions
+## Roadmap
+
+See [open issues](https://github.com/martinlindhe/wmi_exporter/issues)
 
-windows_exporter supports Windows Server versions 2008R2 and later, and desktop Windows version 7 and later.
 
 ## Usage
 
     go get -u github.com/prometheus/promu
-    go get -u github.com/prometheus-community/windows_exporter
-    cd $env:GOPATH/src/github.com/prometheus-community/windows_exporter
-    promu build -v
-    .\windows_exporter.exe
+    go get -u github.com/martinlindhe/wmi_exporter
+    cd $env:GOPATH/src/github.com/martinlindhe/wmi_exporter
+    promu build -v .
+    .\wmi_exporter.exe
 
 The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182)
 
@@ -133,53 +93,17 @@ The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182
 
 ### Enable only service collector and specify a custom query
 
-    .\windows_exporter.exe --collectors.enabled "service" --collector.service.services-where "Name='windows_exporter'"
+    .\wmi_exporter.exe --collectors.enabled "service" --collector.service.services-where "Name='wmi_exporter'"
 
 ### Enable only process collector and specify a custom query
 
-    .\windows_exporter.exe --collectors.enabled "process" --collector.process.whitelist="firefox.+"
+    .\wmi_exporter.exe --collectors.enabled "process" --collector.process.processes-where "Name LIKE 'firefox%'"
 
-When there are multiple processes with the same name, WMI represents those after the first instance as `process-name#index`. So to get them all, rather than just the first one, the [regular expression](https://en.wikipedia.org/wiki/Regular_expression) must use `.+`. See [process](docs/collector.process.md) for more information.
+When there are multiple processes with the same name, WMI represents those after the first instance as `process-name#index`. So to get them all, rather than just the first one, the query needs to be a wildcard search using a `%` character.
 
-### Using [defaults] with `--collectors.enabled` argument
+Please note that in Windows batch scripts (and when using the `cmd` command prompt), the `%` character is reserved, so it has to be escaped with another `%`. For example, the wildcard syntax for searching for all firefox processes is `firefox%%`.
 
-Using `[defaults]`  with `--collectors.enabled` argument which gets expanded with all default collectors.
-
-    .\windows_exporter.exe --collectors.enabled "[defaults],process,container"
-    
-This enables the additional process and container collectors on top of the defaults.
-
-### Using a configuration file
-
-YAML configuration files can be specified with the `--config.file` flag. E.G. `.\windows_exporter.exe --config.file=config.yml`
-
-```yaml
-collectors:
-  enabled: cpu,cs,net,service
-collector:
-  service:
-    services-where: "Name='windows_exporter'"
-log:
-  level: warn
-```
-
-An example configuration file can be found [here](docs/example_config.yml).
-
-#### Configuration file notes
-
-Configuration file values can be mixed with CLI flags. E.G.
-
-`.\windows_exporter.exe --collectors.enabled=cpu,logon`
-
-```yaml
-log:
-  level: debug
-```
-
-CLI flags enjoy a higher priority over values specified in the configuration file.
 
 ## License
 
 Under [MIT](LICENSE)
-
-[web_config]: https://github.com/prometheus/exporter-toolkit/blob/master/docs/web-configuration.md

SECURITY.md

@@ -1,6 +0,0 @@
-# Reporting a security issue
-
-The Prometheus security policy, including how to report vulnerabilities, can be
-found here:
-
-https://prometheus.io/docs/operating/security/

appveyor.yml

@@ -0,0 +1,78 @@
+version: "{build}"
+
+os: Visual Studio 2017
+build: off
+stack: go 1.13
+
+environment:
+  GOPATH: c:\gopath
+  GO111MODULE: on
+
+clone_folder: c:\gopath\src\github.com\martinlindhe\wmi_exporter
+
+install:
+  - mkdir %GOPATH%\bin
+  - set PATH=%GOPATH%\bin;%PATH%
+  - set PATH=%PATH%;C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
+  - choco install gitversion.portable make -y
+  - ps: |
+      appveyor DownloadFile https://github.com/golangci/golangci-lint/releases/download/v1.21.0/golangci-lint-1.21.0-windows-amd64.zip
+      Expand-Archive golangci-lint-1.21.0-windows-amd64.zip
+      Move-Item golangci-lint-1.21.0-windows-amd64\golangci-lint-1.21.0-windows-amd64\golangci-lint.exe $env:GOPATH\bin\golangci-lint.exe
+  - ps: |
+      $env:GO111MODULE="off"
+      go get -u github.com/prometheus/promu
+      $env:GO111MODULE="on"
+
+test_script:
+  - make test
+
+after_test:
+  - make lint
+
+build_script:
+  - ps: |
+      # go mod download (or, if we don't call it, go build) will write every dependent package name to
+      # stderr, which will be interpreted as an error and abort the build if ErrorActionPreference is Stop,
+      # so we need to run it before setting the preference.
+      go mod download
+      $ErrorActionPreference = "Stop"
+      gitversion /output json /showvariable FullSemVer | Set-Content VERSION -PassThru
+      $Version = Get-Content VERSION
+      make crossbuild
+      # GH requires all files to have different names, so add version/arch to differentiate
+      foreach($Arch in "amd64","386") {
+        Rename-Item output\$Arch\wmi_exporter.exe -NewName wmi_exporter-$Version-$Arch.exe
+      }
+
+after_build:
+  - ps: |
+      # Build installer packages only on tagged releases
+      if($env:APPVEYOR_REPO_TAG -ne "True") {
+        return
+      }
+      $ErrorActionPreference = "Stop"
+      $BuildVersion = Get-Content VERSION
+      # The MSI version is not semver compliant, so just take the numerical parts
+      $MSIVersion = $env:APPVEYOR_REPO_TAG_NAME -replace '^v?([0-9\.]+).*$','$1'
+      foreach($Arch in "amd64","386") {
+        Write-Verbose "Building wmi_exporter $MSIVersion msi for $Arch"
+        .\installer\build.ps1 -PathToExecutable .\output\$Arch\wmi_exporter-$BuildVersion-$Arch.exe -Version $MSIVersion -Arch "$Arch"
+        Move-Item installer\Output\wmi_exporter-$MSIVersion-$Arch.msi output\$Arch\
+      }
+  - promu checksum output\
+
+artifacts:
+  - name: Artifacts
+    path: output\**\*
+
+deploy:
+  - provider: GitHub
+    description: WMI Exporter version $(appveyor_build_version)
+    artifact: Artifacts
+    auth_token:
+      secure: 'CrXWeTf7qONUOEki5olFfGEUPMLDeHj61koDXV3OVEaLgtACmnVHsKUub9POflda'
+    draft: false
+    prerelease: false
+    on:
+      appveyor_repo_tag: true

collector/ad.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"errors"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/ad_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkADCollector(b *testing.B) {
-	benchmarkCollector(b, "ad", NewADCollector)
-}

collector/adcs.go

@@ -1,242 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"errors"
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-	"strings"
-)
-
-func init() {
-	registerCollector("adcs", adcsCollectorMethod, "Certification Authority")
-}
-
-type adcsCollector struct {
-	RequestsPerSecond                            *prometheus.Desc
-	RequestProcessingTime                        *prometheus.Desc
-	RetrievalsPerSecond                          *prometheus.Desc
-	RetrievalProcessingTime                      *prometheus.Desc
-	FailedRequestsPerSecond                      *prometheus.Desc
-	IssuedRequestsPerSecond                      *prometheus.Desc
-	PendingRequestsPerSecond                     *prometheus.Desc
-	RequestCryptographicSigningTime              *prometheus.Desc
-	RequestPolicyModuleProcessingTime            *prometheus.Desc
-	ChallengeResponsesPerSecond                  *prometheus.Desc
-	ChallengeResponseProcessingTime              *prometheus.Desc
-	SignedCertificateTimestampListsPerSecond     *prometheus.Desc
-	SignedCertificateTimestampListProcessingTime *prometheus.Desc
-}
-
-// ADCSCollectorMethod ...
-func adcsCollectorMethod() (Collector, error) {
-	const subsystem = "adcs"
-	return &adcsCollector{
-		RequestsPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "requests_total"),
-			"Total certificate requests processed",
-			[]string{"cert_template"},
-			nil,
-		),
-		RequestProcessingTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "request_processing_time_seconds"),
-			"Last time elapsed for certificate requests",
-			[]string{"cert_template"},
-			nil,
-		),
-		RetrievalsPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "retrievals_total"),
-			"Total certificate retrieval requests processed",
-			[]string{"cert_template"},
-			nil,
-		),
-		RetrievalProcessingTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "retrievals_processing_time_seconds"),
-			"Last time elapsed for certificate retrieval request",
-			[]string{"cert_template"},
-			nil,
-		),
-		FailedRequestsPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failed_requests_total"),
-			"Total failed certificate requests processed",
-			[]string{"cert_template"},
-			nil,
-		),
-		IssuedRequestsPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "issued_requests_total"),
-			"Total issued certificate requests processed",
-			[]string{"cert_template"},
-			nil,
-		),
-		PendingRequestsPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "pending_requests_total"),
-			"Total pending certificate requests processed",
-			[]string{"cert_template"},
-			nil,
-		),
-		RequestCryptographicSigningTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "request_cryptographic_signing_time_seconds"),
-			"Last time elapsed for signing operation request",
-			[]string{"cert_template"},
-			nil,
-		),
-		RequestPolicyModuleProcessingTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "request_policy_module_processing_time_seconds"),
-			"Last time elapsed for policy module processing request",
-			[]string{"cert_template"},
-			nil,
-		),
-		ChallengeResponsesPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "challenge_responses_total"),
-			"Total certificate challenge responses processed",
-			[]string{"cert_template"},
-			nil,
-		),
-		ChallengeResponseProcessingTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "challenge_response_processing_time_seconds"),
-			"Last time elapsed for challenge response",
-			[]string{"cert_template"},
-			nil,
-		),
-		SignedCertificateTimestampListsPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "signed_certificate_timestamp_lists_total"),
-			"Total Signed Certificate Timestamp Lists processed",
-			[]string{"cert_template"},
-			nil,
-		),
-		SignedCertificateTimestampListProcessingTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "signed_certificate_timestamp_list_processing_time_seconds"),
-			"Last time elapsed for Signed Certificate Timestamp List",
-			[]string{"cert_template"},
-			nil,
-		),
-	}, nil
-}
-
-func (c *adcsCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collectADCSCounters(ctx, ch); err != nil {
-		log.Error("Failed collecting ADCS Metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-type perflibADCS struct {
-	Name                                         string
-	RequestsPerSecond                            float64 `perflib:"Requests/sec"`
-	RequestProcessingTime                        float64 `perflib:"Request processing time (ms)"`
-	RetrievalsPerSecond                          float64 `perflib:"Retrievals/sec"`
-	RetrievalProcessingTime                      float64 `perflib:"Retrieval processing time (ms)"`
-	FailedRequestsPerSecond                      float64 `perflib:"Failed Requests/sec"`
-	IssuedRequestsPerSecond                      float64 `perflib:"Issued Requests/sec"`
-	PendingRequestsPerSecond                     float64 `perflib:"Pending Requests/sec"`
-	RequestCryptographicSigningTime              float64 `perflib:"Request cryptographic signing time (ms)"`
-	RequestPolicyModuleProcessingTime            float64 `perflib:"Request policy module processing time (ms)"`
-	ChallengeResponsesPerSecond                  float64 `perflib:"Challenge Responses/sec"`
-	ChallengeResponseProcessingTime              float64 `perflib:"Challenge Response processing time (ms)"`
-	SignedCertificateTimestampListsPerSecond     float64 `perflib:"Signed Certificate Timestamp Lists/sec"`
-	SignedCertificateTimestampListProcessingTime float64 `perflib:"Signed Certificate Timestamp List processing time (ms)"`
-}
-
-func (c *adcsCollector) collectADCSCounters(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	dst := make([]perflibADCS, 0)
-	if _, ok := ctx.perfObjects["Certification Authority"]; !ok {
-		return nil, errors.New("Perflib did not contain an entry for Certification Authority")
-	}
-	err := unmarshalObject(ctx.perfObjects["Certification Authority"], &dst)
-	if err != nil {
-		return nil, err
-	}
-	if len(dst) == 0 {
-		return nil, errors.New("Perflib query for Certification Authority (ADCS) returned empty result set")
-	}
-
-	for _, d := range dst {
-		n := strings.ToLower(d.Name)
-		if n == "" {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.RequestsPerSecond,
-			prometheus.CounterValue,
-			d.RequestsPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RequestProcessingTime,
-			prometheus.GaugeValue,
-			milliSecToSec(d.RequestProcessingTime),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RetrievalsPerSecond,
-			prometheus.CounterValue,
-			d.RetrievalsPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RetrievalProcessingTime,
-			prometheus.GaugeValue,
-			milliSecToSec(d.RetrievalProcessingTime),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.FailedRequestsPerSecond,
-			prometheus.CounterValue,
-			d.FailedRequestsPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.IssuedRequestsPerSecond,
-			prometheus.CounterValue,
-			d.IssuedRequestsPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PendingRequestsPerSecond,
-			prometheus.CounterValue,
-			d.PendingRequestsPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RequestCryptographicSigningTime,
-			prometheus.GaugeValue,
-			milliSecToSec(d.RequestCryptographicSigningTime),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RequestPolicyModuleProcessingTime,
-			prometheus.GaugeValue,
-			milliSecToSec(d.RequestPolicyModuleProcessingTime),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ChallengeResponsesPerSecond,
-			prometheus.CounterValue,
-			d.ChallengeResponsesPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ChallengeResponseProcessingTime,
-			prometheus.GaugeValue,
-			milliSecToSec(d.ChallengeResponseProcessingTime),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.SignedCertificateTimestampListsPerSecond,
-			prometheus.CounterValue,
-			d.SignedCertificateTimestampListsPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.SignedCertificateTimestampListProcessingTime,
-			prometheus.GaugeValue,
-			milliSecToSec(d.SignedCertificateTimestampListProcessingTime),
-			d.Name,
-		)
-	}
-
-	return nil, nil
-}

collector/adcs_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkADCSCollector(b *testing.B) {
-	benchmarkCollector(b, "adcs", adcsCollectorMethod)
-}

collector/adfs.go

@@ -1,61 +1,27 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
-	"math"
 )
 
 func init() {
-	registerCollector("adfs", newADFSCollector, "AD FS")
+	registerCollector("adfs", newADFSCollector)
 }
 
 type adfsCollector struct {
-	adLoginConnectionFailures                          *prometheus.Desc
-	certificateAuthentications                         *prometheus.Desc
-	deviceAuthentications                              *prometheus.Desc
-	extranetAccountLockouts                            *prometheus.Desc
-	federatedAuthentications                           *prometheus.Desc
-	passportAuthentications                            *prometheus.Desc
-	passiveRequests                                    *prometheus.Desc
-	passwordChangeFailed                               *prometheus.Desc
-	passwordChangeSucceeded                            *prometheus.Desc
-	tokenRequests                                      *prometheus.Desc
-	windowsIntegratedAuthentications                   *prometheus.Desc
-	oAuthAuthZRequests                                 *prometheus.Desc
-	oAuthClientAuthentications                         *prometheus.Desc
-	oAuthClientAuthenticationsFailures                 *prometheus.Desc
-	oAuthClientCredentialsRequestFailures              *prometheus.Desc
-	oAuthClientCredentialsRequests                     *prometheus.Desc
-	oAuthClientPrivateKeyJwtAuthenticationFailures     *prometheus.Desc
-	oAuthClientPrivateKeyJwtAuthentications            *prometheus.Desc
-	oAuthClientSecretBasicAuthenticationFailures       *prometheus.Desc
-	oAuthClientSecretBasicAuthentications              *prometheus.Desc
-	oAuthClientSecretPostAuthenticationFailures        *prometheus.Desc
-	oAuthClientSecretPostAuthentications               *prometheus.Desc
-	oAuthClientWindowsIntegratedAuthenticationFailures *prometheus.Desc
-	oAuthClientWindowsIntegratedAuthentications        *prometheus.Desc
-	oAuthLogonCertificateRequestFailures               *prometheus.Desc
-	oAuthLogonCertificateTokenRequests                 *prometheus.Desc
-	oAuthPasswordGrantRequestFailures                  *prometheus.Desc
-	oAuthPasswordGrantRequests                         *prometheus.Desc
-	oAuthTokenRequests                                 *prometheus.Desc
-	samlPTokenRequests                                 *prometheus.Desc
-	ssoAuthenticationFailures                          *prometheus.Desc
-	ssoAuthentications                                 *prometheus.Desc
-	wsfedTokenRequests                                 *prometheus.Desc
-	wstrustTokenRequests                               *prometheus.Desc
-	upAuthenticationFailures                           *prometheus.Desc
-	upAuthentications                                  *prometheus.Desc
-	externalAuthenticationFailures                     *prometheus.Desc
-	externalAuthentications                            *prometheus.Desc
-	artifactDBFailures                                 *prometheus.Desc
-	avgArtifactDBQueryTime                             *prometheus.Desc
-	configDBFailures                                   *prometheus.Desc
-	avgConfigDBQueryTime                               *prometheus.Desc
-	federationMetadataRequests                         *prometheus.Desc
+	adLoginConnectionFailures        *prometheus.Desc
+	certificateAuthentications       *prometheus.Desc
+	deviceAuthentications            *prometheus.Desc
+	extranetAccountLockouts          *prometheus.Desc
+	federatedAuthentications         *prometheus.Desc
+	passportAuthentications          *prometheus.Desc
+	passiveRequests                  *prometheus.Desc
+	passwordChangeFailed             *prometheus.Desc
+	passwordChangeSucceeded          *prometheus.Desc
+	tokenRequests                    *prometheus.Desc
+	windowsIntegratedAuthentications *prometheus.Desc
 }
 
 // newADFSCollector constructs a new adfsCollector
@@ -64,310 +30,86 @@ func newADFSCollector() (Collector, error) {
 
 	return &adfsCollector{
 		adLoginConnectionFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ad_login_connection_failures_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "ad_login_connection_failures"),
 			"Total number of connection failures to an Active Directory domain controller",
 			nil,
 			nil,
 		),
 		certificateAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "certificate_authentications_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "certificate_authentications"),
 			"Total number of User Certificate authentications",
 			nil,
 			nil,
 		),
 		deviceAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "device_authentications_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "device_authentications"),
 			"Total number of Device authentications",
 			nil,
 			nil,
 		),
 		extranetAccountLockouts: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "extranet_account_lockouts_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "extranet_account_lockouts"),
 			"Total number of Extranet Account Lockouts",
 			nil,
 			nil,
 		),
 		federatedAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "federated_authentications_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "federated_authentications"),
 			"Total number of authentications from a federated source",
 			nil,
 			nil,
 		),
 		passportAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "passport_authentications_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "passport_authentications"),
 			"Total number of Microsoft Passport SSO authentications",
 			nil,
 			nil,
 		),
 		passiveRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "passive_requests_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "passive_requests"),
 			"Total number of passive (browser-based) requests",
 			nil,
 			nil,
 		),
 		passwordChangeFailed: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "password_change_failed_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "password_change_failed"),
 			"Total number of failed password changes",
 			nil,
 			nil,
 		),
 		passwordChangeSucceeded: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "password_change_succeeded_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "password_change_succeeded"),
 			"Total number of successful password changes",
 			nil,
 			nil,
 		),
 		tokenRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "token_requests_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "token_requests"),
 			"Total number of token requests",
 			nil,
 			nil,
 		),
 		windowsIntegratedAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "windows_integrated_authentications_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "windows_integrated_authentications"),
 			"Total number of Windows integrated authentications (Kerberos/NTLM)",
 			nil,
 			nil,
 		),
-		oAuthAuthZRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_authorization_requests_total"),
-			"Total number of incoming requests to the OAuth Authorization endpoint",
-			nil,
-			nil,
-		),
-		oAuthClientAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_authentication_success_total"),
-			"Total number of successful OAuth client Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientAuthenticationsFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_authentication_failure_total"),
-			"Total number of failed OAuth client Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientCredentialsRequestFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_credentials_failure_total"),
-			"Total number of failed OAuth Client Credentials Requests",
-			nil,
-			nil,
-		),
-		oAuthClientCredentialsRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_credentials_success_total"),
-			"Total number of successful RP tokens issued for OAuth Client Credentials Requests",
-			nil,
-			nil,
-		),
-		oAuthClientPrivateKeyJwtAuthenticationFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_privkey_jtw_authentication_failure_total"),
-			"Total number of failed OAuth Client Private Key Jwt Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientPrivateKeyJwtAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_privkey_jwt_authentications_success_total"),
-			"Total number of successful OAuth Client Private Key Jwt Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientSecretBasicAuthenticationFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_secret_basic_authentications_failure_total"),
-			"Total number of failed OAuth Client Secret Basic Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientSecretBasicAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_secret_basic_authentications_success_total"),
-			"Total number of successful OAuth Client Secret Basic Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientSecretPostAuthenticationFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_secret_post_authentications_failure_total"),
-			"Total number of failed OAuth Client Secret Post Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientSecretPostAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_secret_post_authentications_success_total"),
-			"Total number of successful OAuth Client Secret Post Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientWindowsIntegratedAuthenticationFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_windows_authentications_failure_total"),
-			"Total number of failed OAuth Client Windows Integrated Authentications",
-			nil,
-			nil,
-		),
-		oAuthClientWindowsIntegratedAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_client_windows_authentications_success_total"),
-			"Total number of successful OAuth Client Windows Integrated Authentications",
-			nil,
-			nil,
-		),
-		oAuthLogonCertificateRequestFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_logon_certificate_requests_failure_total"),
-			"Total number of failed OAuth Logon Certificate Requests",
-			nil,
-			nil,
-		),
-		oAuthLogonCertificateTokenRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_logon_certificate_token_requests_success_total"),
-			"Total number of successful RP tokens issued for OAuth Logon Certificate Requests",
-			nil,
-			nil,
-		),
-		oAuthPasswordGrantRequestFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_password_grant_requests_failure_total"),
-			"Total number of failed OAuth Password Grant Requests",
-			nil,
-			nil,
-		),
-		oAuthPasswordGrantRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_password_grant_requests_success_total"),
-			"Total number of successful OAuth Password Grant Requests",
-			nil,
-			nil,
-		),
-		oAuthTokenRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "oauth_token_requests_success_total"),
-			"Total number of successful RP tokens issued over OAuth protocol",
-			nil,
-			nil,
-		),
-		samlPTokenRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "samlp_token_requests_success_total"),
-			"Total number of successful RP tokens issued over SAML-P protocol",
-			nil,
-			nil,
-		),
-		ssoAuthenticationFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "sso_authentications_failure_total"),
-			"Total number of failed SSO authentications",
-			nil,
-			nil,
-		),
-		ssoAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "sso_authentications_success_total"),
-			"Total number of successful SSO authentications",
-			nil,
-			nil,
-		),
-		wsfedTokenRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "wsfed_token_requests_success_total"),
-			"Total number of successful RP tokens issued over WS-Fed protocol",
-			nil,
-			nil,
-		),
-		wstrustTokenRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "wstrust_token_requests_success_total"),
-			"Total number of successful RP tokens issued over WS-Trust protocol",
-			nil,
-			nil,
-		),
-		upAuthenticationFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "userpassword_authentications_failure_total"),
-			"Total number of failed AD U/P authentications",
-			nil,
-			nil,
-		),
-		upAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "userpassword_authentications_success_total"),
-			"Total number of successful AD U/P authentications",
-			nil,
-			nil,
-		),
-		externalAuthenticationFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "external_authentications_failure_total"),
-			"Total number of failed authentications from external MFA providers",
-			nil,
-			nil,
-		),
-		externalAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "external_authentications_success_total"),
-			"Total number of successful authentications from external MFA providers",
-			nil,
-			nil,
-		),
-		artifactDBFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "db_artifact_failure_total"),
-			"Total number of failures connecting to the artifact database",
-			nil,
-			nil,
-		),
-		avgArtifactDBQueryTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "db_artifact_query_time_seconds_total"),
-			"Accumulator of time taken for an artifact database query",
-			nil,
-			nil,
-		),
-		configDBFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "db_config_failure_total"),
-			"Total number of failures connecting to the configuration database",
-			nil,
-			nil,
-		),
-		avgConfigDBQueryTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "db_config_query_time_seconds_total"),
-			"Accumulator of time taken for a configuration database query",
-			nil,
-			nil,
-		),
-		federationMetadataRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "federation_metadata_requests_total"),
-			"Total number of Federation Metadata requests",
-			nil,
-			nil,
-		),
 	}, nil
 }
 
 type perflibADFS struct {
-	AdLoginConnectionFailures            float64 `perflib:"AD Login Connection Failures"`
-	CertificateAuthentications           float64 `perflib:"Certificate Authentications"`
-	DeviceAuthentications                float64 `perflib:"Device Authentications"`
-	ExtranetAccountLockouts              float64 `perflib:"Extranet Account Lockouts"`
-	FederatedAuthentications             float64 `perflib:"Federated Authentications"`
-	PassportAuthentications              float64 `perflib:"Microsoft Passport Authentications"`
-	PassiveRequests                      float64 `perflib:"Passive Requests"`
-	PasswordChangeFailed                 float64 `perflib:"Password Change Failed Requests"`
-	PasswordChangeSucceeded              float64 `perflib:"Password Change Successful Requests"`
-	TokenRequests                        float64 `perflib:"Token Requests"`
-	WindowsIntegratedAuthentications     float64 `perflib:"Windows Integrated Authentications"`
-	OAuthAuthZRequests                   float64 `perflib:"OAuth AuthZ Requests"`
-	OAuthClientAuthentications           float64 `perflib:"OAuth Client Authentications"`
-	OAuthClientAuthenticationFailures    float64 `perflib:"OAuth Client Authentications Failures"`
-	OAuthClientCredentialRequestFailures float64 `perflib:"OAuth Client Credentials Request Failures"`
-	OAuthClientCredentialRequests        float64 `perflib:"OAuth Client Credentials Requests"`
-	OAuthClientPrivKeyJWTAuthnFailures   float64 `perflib:"OAuth Client Private Key Jwt Authentication Failures"`
-	OAuthClientPrivKeyJWTAuthentications float64 `perflib:"OAuth Client Private Key Jwt Authentications"`
-	OAuthClientBasicAuthnFailures        float64 `perflib:"OAuth Client Secret Basic Authentication Failures"`
-	OAuthClientBasicAuthentications      float64 `perflib:"OAuth Client Secret Basic Authentication Requests"`
-	OAuthClientSecretPostAuthnFailures   float64 `perflib:"OAuth Client Secret Post Authentication Failures"`
-	OAuthClientSecretPostAuthentications float64 `perflib:"OAuth Client Secret Post Authentications"`
-	OAuthClientWindowsAuthnFailures      float64 `perflib:"OAuth Client Windows Integrated Authentication Failures"`
-	OAuthClientWindowsAuthentications    float64 `perflib:"OAuth Client Windows Integrated Authentications"`
-	OAuthLogonCertRequestFailures        float64 `perflib:"OAuth Logon Certificate Request Failures"`
-	OAuthLogonCertTokenRequests          float64 `perflib:"OAuth Logon Certificate Token Requests"`
-	OAuthPasswordGrantRequestFailures    float64 `perflib:"OAuth Password Grant Request Failures"`
-	OAuthPasswordGrantRequests           float64 `perflib:"OAuth Password Grant Requests"`
-	OAuthTokenRequests                   float64 `perflib:"OAuth Token Requests"`
-	SAMLPTokenRequests                   float64 `perflib:"SAML-P Token Requests"`
-	SSOAuthenticationFailures            float64 `perflib:"SSO Authentication Failures"`
-	SSOAuthentications                   float64 `perflib:"SSO Authentications"`
-	WSFedTokenRequests                   float64 `perflib:"WS-Fed Token Requests"`
-	WSTrustTokenRequests                 float64 `perflib:"WS-Trust Token Requests"`
-	UsernamePasswordAuthnFailures        float64 `perflib:"U/P Authentication Failures"`
-	UsernamePasswordAuthentications      float64 `perflib:"U/P Authentications"`
-	ExternalAuthentications              float64 `perflib:"External Authentications"`
-	ExternalAuthNFailures                float64 `perflib:"External Authentication Failures"`
-	ArtifactDBFailures                   float64 `perflib:"Artifact Database Connection Failures"`
-	AvgArtifactDBQueryTime               float64 `perflib:"Average Artifact Database Query Time"`
-	ConfigDBFailures                     float64 `perflib:"Configuration Database Connection Failures"`
-	AvgConfigDBQueryTime                 float64 `perflib:"Average Config Database Query Time"`
-	FederationMetadataRequests           float64 `perflib:"Federation Metadata Requests"`
+	AdLoginConnectionFailures        float64 `perflib:"AD login Connection Failures"`
+	CertificateAuthentications       float64 `perflib:"Certificate Authentications"`
+	DeviceAuthentications            float64 `perflib:"Device Authentications"`
+	ExtranetAccountLockouts          float64 `perflib:"Extranet Account Lockouts"`
+	FederatedAuthentications         float64 `perflib:"Federated Authentications"`
+	PassportAuthentications          float64 `perflib:"Microsoft Passport Authentications"`
+	PassiveRequests                  float64 `perflib:"Passive Requests"`
+	PasswordChangeFailed             float64 `perflib:"Password Change Failed Requests"`
+	PasswordChangeSucceeded          float64 `perflib:"Password Change Successful Requests"`
+	TokenRequests                    float64 `perflib:"Token Requests"`
+	WindowsIntegratedAuthentications float64 `perflib:"Windows Integrated Authentications"`
 }
 
 func (c *adfsCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
@@ -442,197 +184,5 @@ func (c *adfsCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric)
 		prometheus.CounterValue,
 		adfsData[0].WindowsIntegratedAuthentications,
 	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthAuthZRequests,
-		prometheus.CounterValue,
-		adfsData[0].OAuthAuthZRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientAuthenticationsFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientAuthenticationFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientCredentialsRequestFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientCredentialRequestFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientCredentialsRequests,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientCredentialRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientPrivateKeyJwtAuthenticationFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientPrivKeyJWTAuthnFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientPrivateKeyJwtAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientPrivKeyJWTAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientSecretBasicAuthenticationFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientBasicAuthnFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientSecretBasicAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientBasicAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientSecretPostAuthenticationFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientSecretPostAuthnFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientSecretPostAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientSecretPostAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientWindowsIntegratedAuthenticationFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientWindowsAuthnFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthClientWindowsIntegratedAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].OAuthClientWindowsAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthLogonCertificateRequestFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthLogonCertRequestFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthLogonCertificateTokenRequests,
-		prometheus.CounterValue,
-		adfsData[0].OAuthLogonCertTokenRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthPasswordGrantRequestFailures,
-		prometheus.CounterValue,
-		adfsData[0].OAuthPasswordGrantRequestFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthPasswordGrantRequests,
-		prometheus.CounterValue,
-		adfsData[0].OAuthPasswordGrantRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.oAuthTokenRequests,
-		prometheus.CounterValue,
-		adfsData[0].OAuthTokenRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.samlPTokenRequests,
-		prometheus.CounterValue,
-		adfsData[0].SAMLPTokenRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ssoAuthenticationFailures,
-		prometheus.CounterValue,
-		adfsData[0].SSOAuthenticationFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ssoAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].SSOAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.wsfedTokenRequests,
-		prometheus.CounterValue,
-		adfsData[0].WSFedTokenRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.wstrustTokenRequests,
-		prometheus.CounterValue,
-		adfsData[0].WSTrustTokenRequests,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.upAuthenticationFailures,
-		prometheus.CounterValue,
-		adfsData[0].UsernamePasswordAuthnFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.upAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].UsernamePasswordAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.externalAuthenticationFailures,
-		prometheus.CounterValue,
-		adfsData[0].ExternalAuthNFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.externalAuthentications,
-		prometheus.CounterValue,
-		adfsData[0].ExternalAuthentications,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.artifactDBFailures,
-		prometheus.CounterValue,
-		adfsData[0].ArtifactDBFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.avgArtifactDBQueryTime,
-		prometheus.CounterValue,
-		adfsData[0].AvgArtifactDBQueryTime*math.Pow(10, -8),
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.configDBFailures,
-		prometheus.CounterValue,
-		adfsData[0].ConfigDBFailures,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.avgConfigDBQueryTime,
-		prometheus.CounterValue,
-		adfsData[0].AvgConfigDBQueryTime*math.Pow(10, -8),
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.federationMetadataRequests,
-		prometheus.CounterValue,
-		adfsData[0].FederationMetadataRequests,
-	)
 	return nil
 }

collector/adfs_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkADFSCollector(b *testing.B) {
-	benchmarkCollector(b, "adfs", newADFSCollector)
-}

collector/cache.go

@@ -1,453 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-func init() {
-	registerCollector("cache", newCacheCollector, "Cache")
-}
-
-// A CacheCollector is a Prometheus collector for Perflib Cache metrics
-type CacheCollector struct {
-	AsyncCopyReadsTotal         *prometheus.Desc
-	AsyncDataMapsTotal          *prometheus.Desc
-	AsyncFastReadsTotal         *prometheus.Desc
-	AsyncMDLReadsTotal          *prometheus.Desc
-	AsyncPinReadsTotal          *prometheus.Desc
-	CopyReadHitsTotal           *prometheus.Desc
-	CopyReadsTotal              *prometheus.Desc
-	DataFlushesTotal            *prometheus.Desc
-	DataFlushPagesTotal         *prometheus.Desc
-	DataMapHitsPercent          *prometheus.Desc
-	DataMapPinsTotal            *prometheus.Desc
-	DataMapsTotal               *prometheus.Desc
-	DirtyPages                  *prometheus.Desc
-	DirtyPageThreshold          *prometheus.Desc
-	FastReadNotPossiblesTotal   *prometheus.Desc
-	FastReadResourceMissesTotal *prometheus.Desc
-	FastReadsTotal              *prometheus.Desc
-	LazyWriteFlushesTotal       *prometheus.Desc
-	LazyWritePagesTotal         *prometheus.Desc
-	MDLReadHitsTotal            *prometheus.Desc
-	MDLReadsTotal               *prometheus.Desc
-	PinReadHitsTotal            *prometheus.Desc
-	PinReadsTotal               *prometheus.Desc
-	ReadAheadsTotal             *prometheus.Desc
-	SyncCopyReadsTotal          *prometheus.Desc
-	SyncDataMapsTotal           *prometheus.Desc
-	SyncFastReadsTotal          *prometheus.Desc
-	SyncMDLReadsTotal           *prometheus.Desc
-	SyncPinReadsTotal           *prometheus.Desc
-}
-
-// NewCacheCollector ...
-func newCacheCollector() (Collector, error) {
-	const subsystem = "cache"
-	return &CacheCollector{
-		AsyncCopyReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "async_copy_reads_total"),
-			"(AsyncCopyReadsTotal)",
-			nil,
-			nil,
-		),
-		AsyncDataMapsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "async_data_maps_total"),
-			"(AsyncDataMapsTotal)",
-			nil,
-			nil,
-		),
-		AsyncFastReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "async_fast_reads_total"),
-			"(AsyncFastReadsTotal)",
-			nil,
-			nil,
-		),
-		AsyncMDLReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "async_mdl_reads_total"),
-			"(AsyncMDLReadsTotal)",
-			nil,
-			nil,
-		),
-		AsyncPinReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "async_pin_reads_total"),
-			"(AsyncPinReadsTotal)",
-			nil,
-			nil,
-		),
-		CopyReadHitsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "copy_read_hits_total"),
-			"(CopyReadHitsTotal)",
-			nil,
-			nil,
-		),
-		CopyReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "copy_reads_total"),
-			"(CopyReadsTotal)",
-			nil,
-			nil,
-		),
-		DataFlushesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "data_flushes_total"),
-			"(DataFlushesTotal)",
-			nil,
-			nil,
-		),
-		DataFlushPagesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "data_flush_pages_total"),
-			"(DataFlushPagesTotal)",
-			nil,
-			nil,
-		),
-		DataMapHitsPercent: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "data_map_hits_percent"),
-			"(DataMapHitsPercent)",
-			nil,
-			nil,
-		),
-		DataMapPinsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "data_map_pins_total"),
-			"(DataMapPinsTotal)",
-			nil,
-			nil,
-		),
-		DataMapsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "data_maps_total"),
-			"(DataMapsTotal)",
-			nil,
-			nil,
-		),
-		DirtyPages: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "dirty_pages"),
-			"(DirtyPages)",
-			nil,
-			nil,
-		),
-		DirtyPageThreshold: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "dirty_page_threshold"),
-			"(DirtyPageThreshold)",
-			nil,
-			nil,
-		),
-		FastReadNotPossiblesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "fast_read_not_possibles_total"),
-			"(FastReadNotPossiblesTotal)",
-			nil,
-			nil,
-		),
-		FastReadResourceMissesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "fast_read_resource_misses_total"),
-			"(FastReadResourceMissesTotal)",
-			nil,
-			nil,
-		),
-		FastReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "fast_reads_total"),
-			"(FastReadsTotal)",
-			nil,
-			nil,
-		),
-		LazyWriteFlushesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "lazy_write_flushes_total"),
-			"(LazyWriteFlushesTotal)",
-			nil,
-			nil,
-		),
-		LazyWritePagesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "lazy_write_pages_total"),
-			"(LazyWritePagesTotal)",
-			nil,
-			nil,
-		),
-		MDLReadHitsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "mdl_read_hits_total"),
-			"(MDLReadHitsTotal)",
-			nil,
-			nil,
-		),
-		MDLReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "mdl_reads_total"),
-			"(MDLReadsTotal)",
-			nil,
-			nil,
-		),
-		PinReadHitsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "pin_read_hits_total"),
-			"(PinReadHitsTotal)",
-			nil,
-			nil,
-		),
-		PinReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "pin_reads_total"),
-			"(PinReadsTotal)",
-			nil,
-			nil,
-		),
-		ReadAheadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "read_aheads_total"),
-			"(ReadAheadsTotal)",
-			nil,
-			nil,
-		),
-		SyncCopyReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "sync_copy_reads_total"),
-			"(SyncCopyReadsTotal)",
-			nil,
-			nil,
-		),
-		SyncDataMapsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "sync_data_maps_total"),
-			"(SyncDataMapsTotal)",
-			nil,
-			nil,
-		),
-		SyncFastReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "sync_fast_reads_total"),
-			"(SyncFastReadsTotal)",
-			nil,
-			nil,
-		),
-		SyncMDLReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "sync_mdl_reads_total"),
-			"(SyncMDLReadsTotal)",
-			nil,
-			nil,
-		),
-		SyncPinReadsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "sync_pin_reads_total"),
-			"(SyncPinReadsTotal)",
-			nil,
-			nil,
-		),
-	}, nil
-}
-
-// Collect implements the Collector interface
-func (c *CacheCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		log.Error("failed collecting cache metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-// Perflib "Cache":
-// - https://docs.microsoft.com/en-us/previous-versions/aa394267(v=vs.85)
-type perflibCache struct {
-	AsyncCopyReadsTotal         float64 `perflib:"Async Copy Reads/sec"`
-	AsyncDataMapsTotal          float64 `perflib:"Async Data Maps/sec"`
-	AsyncFastReadsTotal         float64 `perflib:"Async Fast Reads/sec"`
-	AsyncMDLReadsTotal          float64 `perflib:"Async MDL Reads/sec"`
-	AsyncPinReadsTotal          float64 `perflib:"Async Pin Reads/sec"`
-	CopyReadHitsTotal           float64 `perflib:"Copy Read Hits %"`
-	CopyReadsTotal              float64 `perflib:"Copy Reads/sec"`
-	DataFlushesTotal            float64 `perflib:"Data Flushes/sec"`
-	DataFlushPagesTotal         float64 `perflib:"Data Flush Pages/sec"`
-	DataMapHitsPercent          float64 `perflib:"Data Map Hits %"`
-	DataMapPinsTotal            float64 `perflib:"Data Map Pins/sec"`
-	DataMapsTotal               float64 `perflib:"Data Maps/sec"`
-	DirtyPages                  float64 `perflib:"Dirty Pages"`
-	DirtyPageThreshold          float64 `perflib:"Dirty Page Threshold"`
-	FastReadNotPossiblesTotal   float64 `perflib:"Fast Read Not Possibles/sec"`
-	FastReadResourceMissesTotal float64 `perflib:"Fast Read Resource Misses/sec"`
-	FastReadsTotal              float64 `perflib:"Fast Reads/sec"`
-	LazyWriteFlushesTotal       float64 `perflib:"Lazy Write Flushes/sec"`
-	LazyWritePagesTotal         float64 `perflib:"Lazy Write Pages/sec"`
-	MDLReadHitsTotal            float64 `perflib:"MDL Read Hits %"`
-	MDLReadsTotal               float64 `perflib:"MDL Reads/sec"`
-	PinReadHitsTotal            float64 `perflib:"Pin Read Hits %"`
-	PinReadsTotal               float64 `perflib:"Pin Reads/sec"`
-	ReadAheadsTotal             float64 `perflib:"Read Aheads/sec"`
-	SyncCopyReadsTotal          float64 `perflib:"Sync Copy Reads/sec"`
-	SyncDataMapsTotal           float64 `perflib:"Sync Data Maps/sec"`
-	SyncFastReadsTotal          float64 `perflib:"Sync Fast Reads/sec"`
-	SyncMDLReadsTotal           float64 `perflib:"Sync MDL Reads/sec"`
-	SyncPinReadsTotal           float64 `perflib:"Sync Pin Reads/sec"`
-}
-
-func (c *CacheCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []perflibCache // Single-instance class, array is required but will have single entry.
-	if err := unmarshalObject(ctx.perfObjects["Cache"], &dst); err != nil {
-		return nil, err
-	}
-
-	ch <- prometheus.MustNewConstMetric(
-		c.AsyncCopyReadsTotal,
-		prometheus.CounterValue,
-		dst[0].AsyncCopyReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.AsyncDataMapsTotal,
-		prometheus.CounterValue,
-		dst[0].AsyncDataMapsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.AsyncFastReadsTotal,
-		prometheus.CounterValue,
-		dst[0].AsyncFastReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.AsyncMDLReadsTotal,
-		prometheus.CounterValue,
-		dst[0].AsyncMDLReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.AsyncPinReadsTotal,
-		prometheus.CounterValue,
-		dst[0].AsyncPinReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.CopyReadHitsTotal,
-		prometheus.GaugeValue,
-		dst[0].CopyReadHitsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.CopyReadsTotal,
-		prometheus.CounterValue,
-		dst[0].CopyReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DataFlushesTotal,
-		prometheus.CounterValue,
-		dst[0].DataFlushesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DataFlushPagesTotal,
-		prometheus.CounterValue,
-		dst[0].DataFlushPagesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DataMapHitsPercent,
-		prometheus.GaugeValue,
-		dst[0].DataMapHitsPercent,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DataMapPinsTotal,
-		prometheus.CounterValue,
-		dst[0].DataMapPinsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DataMapsTotal,
-		prometheus.CounterValue,
-		dst[0].DataMapsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DirtyPages,
-		prometheus.GaugeValue,
-		dst[0].DirtyPages,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DirtyPageThreshold,
-		prometheus.GaugeValue,
-		dst[0].DirtyPageThreshold,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FastReadNotPossiblesTotal,
-		prometheus.CounterValue,
-		dst[0].FastReadNotPossiblesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FastReadResourceMissesTotal,
-		prometheus.CounterValue,
-		dst[0].FastReadResourceMissesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FastReadsTotal,
-		prometheus.CounterValue,
-		dst[0].FastReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.LazyWriteFlushesTotal,
-		prometheus.CounterValue,
-		dst[0].LazyWriteFlushesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.LazyWritePagesTotal,
-		prometheus.CounterValue,
-		dst[0].LazyWritePagesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.MDLReadHitsTotal,
-		prometheus.CounterValue,
-		dst[0].MDLReadHitsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.MDLReadsTotal,
-		prometheus.CounterValue,
-		dst[0].MDLReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.PinReadHitsTotal,
-		prometheus.CounterValue,
-		dst[0].PinReadHitsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.PinReadsTotal,
-		prometheus.CounterValue,
-		dst[0].PinReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ReadAheadsTotal,
-		prometheus.CounterValue,
-		dst[0].ReadAheadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncCopyReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncCopyReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncDataMapsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncDataMapsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncFastReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncFastReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncMDLReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncMDLReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncPinReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncPinReadsTotal,
-	)
-
-	return nil, nil
-}

collector/collector.go

@@ -1,21 +1,19 @@
 package collector
 
 import (
-	"fmt"
-	"sort"
 	"strconv"
 	"strings"
 
 	"github.com/leoluk/perflib_exporter/perflib"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 	"golang.org/x/sys/windows/registry"
 )
 
 // ...
 const (
 	// TODO: Make package-local
-	Namespace = "windows"
+	Namespace = "wmi"
 
 	// Conversion factors
 	ticksToSecondsScaleFactor = 1 / 1e7
@@ -59,10 +57,6 @@ var (
 
 func registerCollector(name string, builder collectorBuilder, perfCounterNames ...string) {
 	builders[name] = builder
-	addPerfCounterDependencies(name, perfCounterNames)
-}
-
-func addPerfCounterDependencies(name string, perfCounterNames []string) {
 	perfIndicies := make([]string, 0, len(perfCounterNames))
 	for _, cn := range perfCounterNames {
 		perfIndicies = append(perfIndicies, MapCounterToIndex(cn))
@@ -78,11 +72,7 @@ func Available() []string {
 	return cs
 }
 func Build(collector string) (Collector, error) {
-	builder, exists := builders[collector]
-	if !exists {
-		return nil, fmt.Errorf("Unknown collector %q", collector)
-	}
-	return builder()
+	return builders[collector]()
 }
 func getPerfQuery(collectors []string) string {
 	parts := make([]string, 0, len(collectors))
@@ -114,41 +104,3 @@ func PrepareScrapeContext(collectors []string) (*ScrapeContext, error) {
 
 	return &ScrapeContext{objs}, nil
 }
-func boolToFloat(b bool) float64 {
-	if b {
-		return 1.0
-	}
-	return 0.0
-}
-
-func find(slice []string, val string) bool {
-	for _, item := range slice {
-		if item == val {
-			return true
-		}
-	}
-	return false
-}
-
-// Used by more complex collectors where user input specifies enabled child collectors.
-// Splits provided child collectors and deduplicate.
-func expandEnabledChildCollectors(enabled string) []string {
-	separated := strings.Split(enabled, ",")
-	unique := map[string]bool{}
-	for _, s := range separated {
-		if s != "" {
-			unique[s] = true
-		}
-	}
-	result := make([]string, 0, len(unique))
-	for s := range unique {
-		result = append(result, s)
-	}
-	// Ensure result is ordered, to prevent test failure
-	sort.Strings(result)
-	return result
-}
-
-func milliSecToSec(t float64) float64 {
-	return t / 1000
-}

collector/collector_test.go

@@ -1,60 +0,0 @@
-package collector
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-func TestExpandChildCollectors(t *testing.T) {
-	cases := []struct {
-		name           string
-		input          string
-		expectedOutput []string
-	}{
-		{
-			name:           "simple",
-			input:          "testing1,testing2,testing3",
-			expectedOutput: []string{"testing1", "testing2", "testing3"},
-		},
-		{
-			name:           "duplicate",
-			input:          "testing1,testing2,testing2,testing3",
-			expectedOutput: []string{"testing1", "testing2", "testing3"},
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			output := expandEnabledChildCollectors(c.input)
-			if !reflect.DeepEqual(output, c.expectedOutput) {
-				t.Errorf("Output mismatch, expected %+v, got %+v", c.expectedOutput, output)
-			}
-		})
-	}
-}
-
-func benchmarkCollector(b *testing.B, name string, collectFunc func() (Collector, error)) {
-	// Create perflib scrape context. Some perflib collectors required a correct context,
-	// or will fail during benchmark.
-	scrapeContext, err := PrepareScrapeContext([]string{name})
-	if err != nil {
-		b.Error(err)
-	}
-	c, err := collectFunc()
-	if err != nil {
-		b.Error(err)
-	}
-
-	metrics := make(chan prometheus.Metric)
-	go func() {
-		for {
-			<-metrics
-		}
-	}()
-
-	for i := 0; i < b.N; i++ {
-		c.Collect(scrapeContext, metrics) //nolint:errcheck
-	}
-}

collector/container.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/Microsoft/hcsshim"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -169,67 +168,70 @@ func (c *ContainerMetricsCollector) collect(ch chan<- prometheus.Metric) (*prome
 	}
 
 	for _, containerDetails := range containers {
-		container, err := hcsshim.OpenContainer(containerDetails.ID)
+		containerId := containerDetails.ID
+
+		container, err := hcsshim.OpenContainer(containerId)
 		if container != nil {
 			defer containerClose(container)
 		}
 		if err != nil {
-			log.Error("err in opening container: ", containerDetails.ID, err)
+			log.Error("err in opening container: ", containerId, err)
 			continue
 		}
 
 		cstats, err := container.Statistics()
 		if err != nil {
-			log.Error("err in fetching container Statistics: ", containerDetails.ID, err)
+			log.Error("err in fetching container Statistics: ", containerId, err)
 			continue
 		}
-		containerIdWithPrefix := getContainerIdWithPrefix(containerDetails)
+		// HCS V1 is for docker runtime. Add the docker:// prefix on container_id
+		containerId = "docker://" + containerId
 
 		ch <- prometheus.MustNewConstMetric(
 			c.ContainerAvailable,
 			prometheus.CounterValue,
 			1,
-			containerIdWithPrefix,
+			containerId,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.UsageCommitBytes,
 			prometheus.GaugeValue,
 			float64(cstats.Memory.UsageCommitBytes),
-			containerIdWithPrefix,
+			containerId,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.UsageCommitPeakBytes,
 			prometheus.GaugeValue,
 			float64(cstats.Memory.UsageCommitPeakBytes),
-			containerIdWithPrefix,
+			containerId,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.UsagePrivateWorkingSetBytes,
 			prometheus.GaugeValue,
 			float64(cstats.Memory.UsagePrivateWorkingSetBytes),
-			containerIdWithPrefix,
+			containerId,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.RuntimeTotal,
 			prometheus.CounterValue,
 			float64(cstats.Processor.TotalRuntime100ns)*ticksToSecondsScaleFactor,
-			containerIdWithPrefix,
+			containerId,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.RuntimeUser,
 			prometheus.CounterValue,
 			float64(cstats.Processor.RuntimeUser100ns)*ticksToSecondsScaleFactor,
-			containerIdWithPrefix,
+			containerId,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.RuntimeKernel,
 			prometheus.CounterValue,
 			float64(cstats.Processor.RuntimeKernel100ns)*ticksToSecondsScaleFactor,
-			containerIdWithPrefix,
+			containerId,
 		)
 
 		if len(cstats.Network) == 0 {
-			log.Info("No Network Stats for container: ", containerDetails.ID)
+			log.Info("No Network Stats for container: ", containerId)
 			continue
 		}
 
@@ -240,37 +242,37 @@ func (c *ContainerMetricsCollector) collect(ch chan<- prometheus.Metric) (*prome
 				c.BytesReceived,
 				prometheus.CounterValue,
 				float64(networkInterface.BytesReceived),
-				containerIdWithPrefix, networkInterface.EndpointId,
+				containerId, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.BytesSent,
 				prometheus.CounterValue,
 				float64(networkInterface.BytesSent),
-				containerIdWithPrefix, networkInterface.EndpointId,
+				containerId, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.PacketsReceived,
 				prometheus.CounterValue,
 				float64(networkInterface.PacketsReceived),
-				containerIdWithPrefix, networkInterface.EndpointId,
+				containerId, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.PacketsSent,
 				prometheus.CounterValue,
 				float64(networkInterface.PacketsSent),
-				containerIdWithPrefix, networkInterface.EndpointId,
+				containerId, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.DroppedPacketsIncoming,
 				prometheus.CounterValue,
 				float64(networkInterface.DroppedPacketsIncoming),
-				containerIdWithPrefix, networkInterface.EndpointId,
+				containerId, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.DroppedPacketsOutgoing,
 				prometheus.CounterValue,
 				float64(networkInterface.DroppedPacketsOutgoing),
-				containerIdWithPrefix, networkInterface.EndpointId,
+				containerId, networkInterface.EndpointId,
 			)
 			break
 		}
@@ -278,13 +280,3 @@ func (c *ContainerMetricsCollector) collect(ch chan<- prometheus.Metric) (*prome
 
 	return nil, nil
 }
-
-func getContainerIdWithPrefix(containerDetails hcsshim.ContainerProperties) string {
-	switch containerDetails.Owner {
-	case "containerd-shim-runhcs-v1.exe":
-		return "containerd://" + containerDetails.ID
-	default:
-		// default to docker or if owner is not set
-		return "docker://" + containerDetails.ID
-	}
-}

collector/container_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkContainerCollector(b *testing.B) {
-	benchmarkCollector(b, "container", NewContainerMetricsCollector)
-}

collector/cpu.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector

collector/cpu_info.go

@@ -1,97 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"errors"
-	"strconv"
-	"strings"
-
-	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-func init() {
-	registerCollector("cpu_info", newCpuInfoCollector)
-}
-
-// If you are adding additional labels to the metric, make sure that they get added in here as well. See below for explanation.
-const (
-	win32ProcessorQuery = "SELECT Architecture, DeviceId, Description, Family, L2CacheSize, L3CacheSize, Name FROM Win32_Processor"
-)
-
-// A CpuInfoCollector is a Prometheus collector for a few WMI metrics in Win32_Processor
-type CpuInfoCollector struct {
-	CpuInfo *prometheus.Desc
-}
-
-func newCpuInfoCollector() (Collector, error) {
-	return &CpuInfoCollector{
-		CpuInfo: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, "", "cpu_info"),
-			"Labeled CPU information as provided provided by Win32_Processor",
-			[]string{
-				"architecture",
-				"device_id",
-				"description",
-				"family",
-				"l2_cache_size",
-				"l3_cache_size",
-				"name"},
-			nil,
-		),
-	}, nil
-}
-
-type win32_Processor struct {
-	Architecture uint32
-	DeviceID     string
-	Description  string
-	Family       uint16
-	L2CacheSize  uint32
-	L3CacheSize  uint32
-	Name         string
-}
-
-// Collect sends the metric values for each metric
-// to the provided prometheus Metric channel.
-func (c *CpuInfoCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		log.Error("failed collecting cpu_info metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-func (c *CpuInfoCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []win32_Processor
-	// We use a static query here because the provided methods in wmi.go all issue a SELECT *;
-	// This results in the time consuming LoadPercentage field being read which seems to measure each CPU
-	// serially over a 1 second interval, so the scrape time is at least 1s * num_sockets
-	if err := wmi.Query(win32ProcessorQuery, &dst); err != nil {
-		return nil, err
-	}
-	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
-	}
-
-	// Some CPUs end up exposing trailing spaces for certain strings, so clean them up
-	for _, processor := range dst {
-		ch <- prometheus.MustNewConstMetric(
-			c.CpuInfo,
-			prometheus.GaugeValue,
-			1.0,
-			strconv.Itoa(int(processor.Architecture)),
-			strings.TrimRight(processor.DeviceID, " "),
-			strings.TrimRight(processor.Description, " "),
-			strconv.Itoa(int(processor.Family)),
-			strconv.Itoa(int(processor.L2CacheSize)),
-			strconv.Itoa(int(processor.L3CacheSize)),
-			strings.TrimRight(processor.Name, " "),
-		)
-	}
-
-	return nil, nil
-}

collector/cpu_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkCPUCollector(b *testing.B) {
-	benchmarkCollector(b, "cpu", newCPUCollector)
-}

collector/cs.go

@@ -1,13 +1,13 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"github.com/prometheus-community/windows_exporter/headers/sysinfoapi"
-	"github.com/prometheus-community/windows_exporter/log"
+	"errors"
 
+	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -60,47 +60,51 @@ func (c *CSCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) e
 	return nil
 }
 
-func (c *CSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	// Get systeminfo for number of processors
-	systemInfo := sysinfoapi.GetSystemInfo()
+// Win32_ComputerSystem docs:
+// - https://msdn.microsoft.com/en-us/library/aa394102
+type Win32_ComputerSystem struct {
+	NumberOfLogicalProcessors uint32
+	TotalPhysicalMemory       uint64
+	DNSHostname               string
+	Domain                    string
+	Workgroup                 *string
+}
 
-	// Get memory status for physical memory
-	mem, err := sysinfoapi.GlobalMemoryStatusEx()
-	if err != nil {
+func (c *CSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_ComputerSystem
+	q := queryAll(&dst)
+	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.LogicalProcessors,
 		prometheus.GaugeValue,
-		float64(systemInfo.NumberOfProcessors),
+		float64(dst[0].NumberOfLogicalProcessors),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PhysicalMemoryBytes,
 		prometheus.GaugeValue,
-		float64(mem.TotalPhys),
+		float64(dst[0].TotalPhysicalMemory),
 	)
 
-	hostname, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSHostname)
-	if err != nil {
-		return nil, err
-	}
-	domain, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSDomain)
-	if err != nil {
-		return nil, err
-	}
-	fqdn, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSFullyQualified)
-	if err != nil {
-		return nil, err
+	var fqdn string
+	if dst[0].Workgroup == nil || dst[0].Domain != *dst[0].Workgroup {
+		fqdn = dst[0].DNSHostname + "." + dst[0].Domain
+	} else {
+		fqdn = dst[0].DNSHostname
 	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.Hostname,
 		prometheus.GaugeValue,
 		1.0,
-		hostname,
-		domain,
+		dst[0].DNSHostname,
+		dst[0].Domain,
 		fqdn,
 	)
 

collector/cs_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkCsCollector(b *testing.B) {
-	benchmarkCollector(b, "cs", NewCSCollector)
-}

collector/dfsr.go

@@ -1,810 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"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()
-
-func init() {
-	// Perflib sources are dynamic, depending on the enabled child collectors
-	var perflibDependencies []string
-	for _, source := range expandEnabledChildCollectors(*dfsrEnabledCollectors) {
-		perflibDependencies = append(perflibDependencies, dfsrGetPerfObjectName(source))
-	}
-
-	registerCollector("dfsr", NewDFSRCollector, perflibDependencies...)
-}
-
-// DFSRCollector contains the metric and state data of the DFSR collectors.
-type DFSRCollector struct {
-	// Connection source
-	ConnectionBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
-	ConnectionBytesReceivedTotal                       *prometheus.Desc
-	ConnectionCompressedSizeOfFilesReceivedTotal       *prometheus.Desc
-	ConnectionFilesReceivedTotal                       *prometheus.Desc
-	ConnectionRDCBytesReceivedTotal                    *prometheus.Desc
-	ConnectionRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
-	ConnectionRDCSizeOfFilesReceivedTotal              *prometheus.Desc
-	ConnectionRDCNumberofFilesReceivedTotal            *prometheus.Desc
-	ConnectionSizeOfFilesReceivedTotal                 *prometheus.Desc
-
-	// Folder source
-	FolderBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
-	FolderCompressedSizeOfFilesReceivedTotal       *prometheus.Desc
-	FolderConflictBytesCleanedupTotal              *prometheus.Desc
-	FolderConflictBytesGeneratedTotal              *prometheus.Desc
-	FolderConflictFilesCleanedUpTotal              *prometheus.Desc
-	FolderConflictFilesGeneratedTotal              *prometheus.Desc
-	FolderConflictFolderCleanupsCompletedTotal     *prometheus.Desc
-	FolderConflictSpaceInUse                       *prometheus.Desc
-	FolderDeletedSpaceInUse                        *prometheus.Desc
-	FolderDeletedBytesCleanedUpTotal               *prometheus.Desc
-	FolderDeletedBytesGeneratedTotal               *prometheus.Desc
-	FolderDeletedFilesCleanedUpTotal               *prometheus.Desc
-	FolderDeletedFilesGeneratedTotal               *prometheus.Desc
-	FolderFileInstallsRetriedTotal                 *prometheus.Desc
-	FolderFileInstallsSucceededTotal               *prometheus.Desc
-	FolderFilesReceivedTotal                       *prometheus.Desc
-	FolderRDCBytesReceivedTotal                    *prometheus.Desc
-	FolderRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
-	FolderRDCNumberofFilesReceivedTotal            *prometheus.Desc
-	FolderRDCSizeOfFilesReceivedTotal              *prometheus.Desc
-	FolderSizeOfFilesReceivedTotal                 *prometheus.Desc
-	FolderStagingSpaceInUse                        *prometheus.Desc
-	FolderStagingBytesCleanedUpTotal               *prometheus.Desc
-	FolderStagingBytesGeneratedTotal               *prometheus.Desc
-	FolderStagingFilesCleanedUpTotal               *prometheus.Desc
-	FolderStagingFilesGeneratedTotal               *prometheus.Desc
-	FolderUpdatesDroppedTotal                      *prometheus.Desc
-
-	// Volume source
-	VolumeDatabaseLookupsTotal           *prometheus.Desc
-	VolumeDatabaseCommitsTotal           *prometheus.Desc
-	VolumeUSNJournalUnreadPercentage     *prometheus.Desc
-	VolumeUSNJournalRecordsAcceptedTotal *prometheus.Desc
-	VolumeUSNJournalRecordsReadTotal     *prometheus.Desc
-
-	// Map of child collector functions used during collection
-	dfsrChildCollectors []dfsrCollectorFunc
-}
-
-type dfsrCollectorFunc func(ctx *ScrapeContext, ch chan<- prometheus.Metric) error
-
-// Map Perflib sources to DFSR collector names
-// E.G. volume -> DFS Replication Service Volumes
-func dfsrGetPerfObjectName(collector string) string {
-	prefix := "DFS "
-	suffix := ""
-	switch collector {
-	case "connection":
-		suffix = "Replication Connections"
-	case "folder":
-		suffix = "Replicated Folders"
-	case "volume":
-		suffix = "Replication Service Volumes"
-	}
-	return (prefix + suffix)
-}
-
-// NewDFSRCollector is registered
-func NewDFSRCollector() (Collector, error) {
-	log.Info("dfsr collector is in an experimental state! Metrics for this collector have not been tested.")
-	const subsystem = "dfsr"
-
-	enabled := expandEnabledChildCollectors(*dfsrEnabledCollectors)
-	perfCounters := make([]string, 0, len(enabled))
-	for _, c := range enabled {
-		perfCounters = append(perfCounters, dfsrGetPerfObjectName(c))
-	}
-	addPerfCounterDependencies(subsystem, perfCounters)
-
-	dfsrCollector := DFSRCollector{
-		// Connection
-		ConnectionBandwidthSavingsUsingDFSReplicationTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_bandwidth_savings_using_dfs_replication_bytes_total"),
-			"Total bytes of bandwidth saved using DFS Replication for this connection",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionBytesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_bytes_received_total"),
-			"Total bytes received for connection",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionCompressedSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_compressed_size_of_files_received_bytes_total"),
-			"Total compressed size of files received on the connection, in bytes",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_received_files_total"),
-			"Total number of files received for connection",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionRDCBytesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_rdc_received_bytes_total"),
-			"Total bytes received on the connection while replicating files using Remote Differential Compression",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionRDCCompressedSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_rdc_compressed_size_of_received_files_bytes_total"),
-			"Total uncompressed size of files received with Remote Differential Compression for connection",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionRDCNumberofFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_rdc_received_files_total"),
-			"Total number of files received using remote differential compression",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionRDCSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_rdc_size_of_received_files_bytes_total"),
-			"Total size of received Remote Differential Compression files, in bytes.",
-			[]string{"name"},
-			nil,
-		),
-
-		ConnectionSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_files_received_bytes_total"),
-			"Total size of files received, in bytes",
-			[]string{"name"},
-			nil,
-		),
-
-		// Folder
-		FolderBandwidthSavingsUsingDFSReplicationTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_bandwidth_savings_using_dfs_replication_bytes_total"),
-			"Total bytes of bandwidth saved using DFS Replication for this folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderCompressedSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_compressed_size_of_received_files_bytes_total"),
-			"Total compressed size of files received on the folder, in bytes",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderConflictBytesCleanedupTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_conflict_cleaned_up_bytes_total"),
-			"Total size of conflict loser files and folders deleted from the Conflict and Deleted folder, in bytes",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderConflictBytesGeneratedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_conflict_generated_bytes_total"),
-			"Total size of conflict loser files and folders moved to the Conflict and Deleted folder, in bytes",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderConflictFilesCleanedUpTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_conflict_cleaned_up_files_total"),
-			"Number of conflict loser files deleted from the Conflict and Deleted folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderConflictFilesGeneratedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_conflict_generated_files_total"),
-			"Number of files and folders moved to the Conflict and Deleted folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderConflictFolderCleanupsCompletedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_conflict_folder_cleanups_total"),
-			"Number of deletions of conflict loser files and folders in the Conflict and Deleted",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderConflictSpaceInUse: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_conflict_space_in_use_bytes"),
-			"Total size of the conflict loser files and folders currently in the Conflict and Deleted folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderDeletedSpaceInUse: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_deleted_space_in_use_bytes"),
-			"Total size (in bytes) of the deleted files and folders currently in the Conflict and Deleted folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderDeletedBytesCleanedUpTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_deleted_cleaned_up_bytes_total"),
-			"Total size (in bytes) of replicating deleted files and folders that were cleaned up from the Conflict and Deleted folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderDeletedBytesGeneratedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_deleted_generated_bytes_total"),
-			"Total size (in bytes) of replicated deleted files and folders that were moved to the Conflict and Deleted folder after they were deleted from a replicated folder on a sending member",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderDeletedFilesCleanedUpTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_deleted_cleaned_up_files_total"),
-			"Number of files and folders that were cleaned up from the Conflict and Deleted folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderDeletedFilesGeneratedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_deleted_generated_files_total"),
-			"Number of deleted files and folders that were moved to the Conflict and Deleted folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderFileInstallsRetriedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_file_installs_retried_total"),
-			"Total number of file installs that are being retried due to sharing violations or other errors encountered when installing the files",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderFileInstallsSucceededTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_file_installs_succeeded_total"),
-			"Total number of files that were successfully received from sending members and installed locally on this server",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_received_files_total"),
-			"Total number of files received",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderRDCBytesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_rdc_received_bytes_total"),
-			"Total number of bytes received in replicating files using Remote Differential Compression",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderRDCCompressedSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_rdc_compressed_size_of_received_files_bytes_total"),
-			"Total compressed size (in bytes) of the files received with Remote Differential Compression",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderRDCNumberofFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_rdc_received_files_total"),
-			"Total number of files received with Remote Differential Compression",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderRDCSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_rdc_files_received_bytes_total"),
-			"Total uncompressed size (in bytes) of the files received with Remote Differential Compression",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderSizeOfFilesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_files_received_bytes_total"),
-			"Total uncompressed size (in bytes) of the files received",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderStagingSpaceInUse: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_staging_space_in_use_bytes"),
-			"Total size of files and folders currently in the staging folder.",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderStagingBytesCleanedUpTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_staging_cleaned_up_bytes_total"),
-			"Total size (in bytes) of the files and folders that have been cleaned up from the staging folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderStagingBytesGeneratedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_staging_generated_bytes_total"),
-			"Total size (in bytes) of replicated files and folders in the staging folder created by the DFS Replication service since last restart",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderStagingFilesCleanedUpTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_staging_cleaned_up_files_total"),
-			"Total number of files and folders that have been cleaned up from the staging folder",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderStagingFilesGeneratedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_staging_generated_files_total"),
-			"Total number of times replicated files and folders have been staged by the DFS Replication service",
-			[]string{"name"},
-			nil,
-		),
-
-		FolderUpdatesDroppedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "folder_dropped_updates_total"),
-			"Total number of redundant file replication update records that have been ignored by the DFS Replication service because they did not change the replicated file or folder",
-			[]string{"name"},
-			nil,
-		),
-
-		// Volume
-		VolumeDatabaseCommitsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "volume_database_commits_total"),
-			"Total number of DFSR Volume database commits",
-			[]string{"name"},
-			nil,
-		),
-
-		VolumeDatabaseLookupsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "volume_database_lookups_total"),
-			"Total number of DFSR Volume database lookups",
-			[]string{"name"},
-			nil,
-		),
-
-		VolumeUSNJournalUnreadPercentage: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "volume_usn_journal_unread_percentage"),
-			"Percentage of DFSR Volume USN journal records that are unread",
-			[]string{"name"},
-			nil,
-		),
-
-		VolumeUSNJournalRecordsAcceptedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "volume_usn_journal_accepted_records_total"),
-			"Total number of USN journal records accepted",
-			[]string{"name"},
-			nil,
-		),
-
-		VolumeUSNJournalRecordsReadTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "volume_usn_journal_read_records_total"),
-			"Total number of DFSR Volume USN journal records read",
-			[]string{"name"},
-			nil,
-		),
-	}
-
-	dfsrCollector.dfsrChildCollectors = dfsrCollector.getDFSRChildCollectors(enabled)
-
-	return &dfsrCollector, nil
-}
-
-// Maps enabled child collectors names to their relevant collection function,
-// for use in DFSRCollector.Collect()
-func (c *DFSRCollector) getDFSRChildCollectors(enabledCollectors []string) []dfsrCollectorFunc {
-	var dfsrCollectors []dfsrCollectorFunc
-	for _, collector := range enabledCollectors {
-		switch collector {
-		case "connection":
-			dfsrCollectors = append(dfsrCollectors, c.collectConnection)
-		case "folder":
-			dfsrCollectors = append(dfsrCollectors, c.collectFolder)
-		case "volume":
-			dfsrCollectors = append(dfsrCollectors, c.collectVolume)
-		}
-	}
-
-	return dfsrCollectors
-}
-
-// Collect implements the Collector interface.
-// Sends metric values for each metric to the provided prometheus Metric channel.
-func (c *DFSRCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	for _, fn := range c.dfsrChildCollectors {
-		err := fn(ctx, ch)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Perflib: "DFS Replication Service Connections"
-type PerflibDFSRConnection struct {
-	Name string
-
-	BandwidthSavingsUsingDFSReplicationTotal float64 `perflib:"Bandwidth Savings Using DFS Replication"`
-	BytesReceivedTotal                       float64 `perflib:"Total Bytes Received"`
-	CompressedSizeOfFilesReceivedTotal       float64 `perflib:"Compressed Size of Files Received"`
-	FilesReceivedTotal                       float64 `perflib:"Total Files Received"`
-	RDCBytesReceivedTotal                    float64 `perflib:"RDC Bytes Received"`
-	RDCCompressedSizeOfFilesReceivedTotal    float64 `perflib:"RDC Compressed Size of Files Received"`
-	RDCNumberofFilesReceivedTotal            float64 `perflib:"RDC Number of Files Received"`
-	RDCSizeOfFilesReceivedTotal              float64 `perflib:"RDC Size of Files Received"`
-	SizeOfFilesReceivedTotal                 float64 `perflib:"Size of Files Received"`
-}
-
-func (c *DFSRCollector) collectConnection(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []PerflibDFSRConnection
-	if err := unmarshalObject(ctx.perfObjects["DFS Replication Connections"], &dst); err != nil {
-		return err
-	}
-
-	for _, connection := range dst {
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionBandwidthSavingsUsingDFSReplicationTotal,
-			prometheus.CounterValue,
-			connection.BandwidthSavingsUsingDFSReplicationTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionBytesReceivedTotal,
-			prometheus.CounterValue,
-			connection.BytesReceivedTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionCompressedSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			connection.CompressedSizeOfFilesReceivedTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionFilesReceivedTotal,
-			prometheus.CounterValue,
-			connection.FilesReceivedTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCBytesReceivedTotal,
-			prometheus.CounterValue,
-			connection.RDCBytesReceivedTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCCompressedSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			connection.RDCCompressedSizeOfFilesReceivedTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			connection.RDCSizeOfFilesReceivedTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCNumberofFilesReceivedTotal,
-			prometheus.CounterValue,
-			connection.RDCNumberofFilesReceivedTotal,
-			connection.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			connection.SizeOfFilesReceivedTotal,
-			connection.Name,
-		)
-
-	}
-	return nil
-}
-
-// Perflib: "DFS Replicated Folder"
-type PerflibDFSRFolder struct {
-	Name string
-
-	BandwidthSavingsUsingDFSReplicationTotal float64 `perflib:"Bandwidth Savings Using DFS Replication"`
-	CompressedSizeOfFilesReceivedTotal       float64 `perflib:"Compressed Size of Files Received"`
-	ConflictBytesCleanedupTotal              float64 `perflib:"Conflict Bytes Cleaned Up"`
-	ConflictBytesGeneratedTotal              float64 `perflib:"Conflict Bytes Generated"`
-	ConflictFilesCleanedUpTotal              float64 `perflib:"Conflict Files Cleaned Up"`
-	ConflictFilesGeneratedTotal              float64 `perflib:"Conflict Files Generated"`
-	ConflictFolderCleanupsCompletedTotal     float64 `perflib:"Conflict Folder Cleanups Completed"`
-	ConflictSpaceInUse                       float64 `perflib:"Conflict Space In Use"`
-	DeletedSpaceInUse                        float64 `perflib:"Deleted Space In Use"`
-	DeletedBytesCleanedUpTotal               float64 `perflib:"Deleted Bytes Cleaned Up"`
-	DeletedBytesGeneratedTotal               float64 `perflib:"Deleted Bytes Generated"`
-	DeletedFilesCleanedUpTotal               float64 `perflib:"Deleted Files Cleaned Up"`
-	DeletedFilesGeneratedTotal               float64 `perflib:"Deleted Files Generated"`
-	FileInstallsRetriedTotal                 float64 `perflib:"File Installs Retried"`
-	FileInstallsSucceededTotal               float64 `perflib:"File Installs Succeeded"`
-	FilesReceivedTotal                       float64 `perflib:"Total Files Received"`
-	RDCBytesReceivedTotal                    float64 `perflib:"RDC Bytes Received"`
-	RDCCompressedSizeOfFilesReceivedTotal    float64 `perflib:"RDC Compressed Size of Files Received"`
-	RDCNumberofFilesReceivedTotal            float64 `perflib:"RDC Number of Files Received"`
-	RDCSizeOfFilesReceivedTotal              float64 `perflib:"RDC Size of Files Received"`
-	SizeOfFilesReceivedTotal                 float64 `perflib:"Size of Files Received"`
-	StagingSpaceInUse                        float64 `perflib:"Staging Space In Use"`
-	StagingBytesCleanedUpTotal               float64 `perflib:"Staging Bytes Cleaned Up"`
-	StagingBytesGeneratedTotal               float64 `perflib:"Staging Bytes Generated"`
-	StagingFilesCleanedUpTotal               float64 `perflib:"Staging Files Cleaned Up"`
-	StagingFilesGeneratedTotal               float64 `perflib:"Staging Files Generated"`
-	UpdatesDroppedTotal                      float64 `perflib:"Updates Dropped"`
-}
-
-func (c *DFSRCollector) collectFolder(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []PerflibDFSRFolder
-	if err := unmarshalObject(ctx.perfObjects["DFS Replicated Folders"], &dst); err != nil {
-		return err
-	}
-
-	for _, folder := range dst {
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderBandwidthSavingsUsingDFSReplicationTotal,
-			prometheus.CounterValue,
-			folder.BandwidthSavingsUsingDFSReplicationTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderCompressedSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			folder.CompressedSizeOfFilesReceivedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictBytesCleanedupTotal,
-			prometheus.CounterValue,
-			folder.ConflictBytesCleanedupTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictBytesGeneratedTotal,
-			prometheus.CounterValue,
-			folder.ConflictBytesGeneratedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictFilesCleanedUpTotal,
-			prometheus.CounterValue,
-			folder.ConflictFilesCleanedUpTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictFilesGeneratedTotal,
-			prometheus.CounterValue,
-			folder.ConflictFilesGeneratedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictFolderCleanupsCompletedTotal,
-			prometheus.CounterValue,
-			folder.ConflictFolderCleanupsCompletedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictSpaceInUse,
-			prometheus.GaugeValue,
-			folder.ConflictSpaceInUse,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedSpaceInUse,
-			prometheus.GaugeValue,
-			folder.DeletedSpaceInUse,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedBytesCleanedUpTotal,
-			prometheus.CounterValue,
-			folder.DeletedBytesCleanedUpTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedBytesGeneratedTotal,
-			prometheus.CounterValue,
-			folder.DeletedBytesGeneratedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedFilesCleanedUpTotal,
-			prometheus.CounterValue,
-			folder.DeletedFilesCleanedUpTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedFilesGeneratedTotal,
-			prometheus.CounterValue,
-			folder.DeletedFilesGeneratedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderFileInstallsRetriedTotal,
-			prometheus.CounterValue,
-			folder.FileInstallsRetriedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderFileInstallsSucceededTotal,
-			prometheus.CounterValue,
-			folder.FileInstallsSucceededTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderFilesReceivedTotal,
-			prometheus.CounterValue,
-			folder.FilesReceivedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCBytesReceivedTotal,
-			prometheus.CounterValue,
-			folder.RDCBytesReceivedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCCompressedSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			folder.RDCCompressedSizeOfFilesReceivedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCNumberofFilesReceivedTotal,
-			prometheus.CounterValue,
-			folder.RDCNumberofFilesReceivedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			folder.RDCSizeOfFilesReceivedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderSizeOfFilesReceivedTotal,
-			prometheus.CounterValue,
-			folder.SizeOfFilesReceivedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingSpaceInUse,
-			prometheus.GaugeValue,
-			folder.StagingSpaceInUse,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingBytesCleanedUpTotal,
-			prometheus.CounterValue,
-			folder.StagingBytesCleanedUpTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingBytesGeneratedTotal,
-			prometheus.CounterValue,
-			folder.StagingBytesGeneratedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingFilesCleanedUpTotal,
-			prometheus.CounterValue,
-			folder.StagingFilesCleanedUpTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingFilesGeneratedTotal,
-			prometheus.CounterValue,
-			folder.StagingFilesGeneratedTotal,
-			folder.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.FolderUpdatesDroppedTotal,
-			prometheus.CounterValue,
-			folder.UpdatesDroppedTotal,
-			folder.Name,
-		)
-	}
-	return nil
-}
-
-// Perflib: "DFS Replication Service Volumes"
-type PerflibDFSRVolume struct {
-	Name string
-
-	DatabaseCommitsTotal           float64 `perflib:"Database Commits"`
-	DatabaseLookupsTotal           float64 `perflib:"Database Lookups"`
-	USNJournalRecordsReadTotal     float64 `perflib:"USN Journal Records Read"`
-	USNJournalRecordsAcceptedTotal float64 `perflib:"USN Journal Records Accepted"`
-	USNJournalUnreadPercentage     float64 `perflib:"USN Journal Records Unread Percentage"`
-}
-
-func (c *DFSRCollector) collectVolume(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []PerflibDFSRVolume
-	if err := unmarshalObject(ctx.perfObjects["DFS Replication Service Volumes"], &dst); err != nil {
-		return err
-	}
-
-	for _, volume := range dst {
-		ch <- prometheus.MustNewConstMetric(
-			c.VolumeDatabaseLookupsTotal,
-			prometheus.CounterValue,
-			volume.DatabaseLookupsTotal,
-			volume.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.VolumeDatabaseCommitsTotal,
-			prometheus.CounterValue,
-			volume.DatabaseCommitsTotal,
-			volume.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.VolumeUSNJournalRecordsAcceptedTotal,
-			prometheus.CounterValue,
-			volume.USNJournalRecordsAcceptedTotal,
-			volume.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.VolumeUSNJournalRecordsReadTotal,
-			prometheus.CounterValue,
-			volume.USNJournalRecordsReadTotal,
-			volume.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.VolumeUSNJournalUnreadPercentage,
-			prometheus.GaugeValue,
-			volume.USNJournalUnreadPercentage,
-			volume.Name,
-		)
-
-	}
-	return nil
-}

collector/dfsr_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkDFSRCollector(b *testing.B) {
-	benchmarkCollector(b, "dfsr", NewDFSRCollector)
-}

collector/dhcp.go

@@ -1,388 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-func init() {
-	registerCollector("dhcp", NewDhcpCollector, "DHCP Server")
-}
-
-// A DhcpCollector is a Prometheus collector perflib DHCP metrics
-type DhcpCollector struct {
-	PacketsReceivedTotal                             *prometheus.Desc
-	DuplicatesDroppedTotal                           *prometheus.Desc
-	PacketsExpiredTotal                              *prometheus.Desc
-	ActiveQueueLength                                *prometheus.Desc
-	ConflictCheckQueueLength                         *prometheus.Desc
-	DiscoversTotal                                   *prometheus.Desc
-	OffersTotal                                      *prometheus.Desc
-	RequestsTotal                                    *prometheus.Desc
-	InformsTotal                                     *prometheus.Desc
-	AcksTotal                                        *prometheus.Desc
-	NacksTotal                                       *prometheus.Desc
-	DeclinesTotal                                    *prometheus.Desc
-	ReleasesTotal                                    *prometheus.Desc
-	OfferQueueLength                                 *prometheus.Desc
-	DeniedDueToMatch                                 *prometheus.Desc
-	DeniedDueToNonMatch                              *prometheus.Desc
-	FailoverBndupdSentTotal                          *prometheus.Desc
-	FailoverBndupdReceivedTotal                      *prometheus.Desc
-	FailoverBndackSentTotal                          *prometheus.Desc
-	FailoverBndackReceivedTotal                      *prometheus.Desc
-	FailoverBndupdPendingOutboundQueue               *prometheus.Desc
-	FailoverTransitionsCommunicationinterruptedState *prometheus.Desc
-	FailoverTransitionsPartnerdownState              *prometheus.Desc
-	FailoverTransitionsRecoverState                  *prometheus.Desc
-	FailoverBndupdDropped                            *prometheus.Desc
-}
-
-func NewDhcpCollector() (Collector, error) {
-	const subsystem = "dhcp"
-
-	return &DhcpCollector{
-		PacketsReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_received_total"),
-			"Total number of packets received by the DHCP server (PacketsReceivedTotal)",
-			nil,
-			nil,
-		),
-		DuplicatesDroppedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "duplicates_dropped_total"),
-			"Total number of duplicate packets received by the DHCP server (DuplicatesDroppedTotal)",
-			nil,
-			nil,
-		),
-		PacketsExpiredTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_expired_total"),
-			"Total number of packets expired in the DHCP server message queue (PacketsExpiredTotal)",
-			nil,
-			nil,
-		),
-		ActiveQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "active_queue_length"),
-			"Number of packets in the processing queue of the DHCP server (ActiveQueueLength)",
-			nil,
-			nil,
-		),
-		ConflictCheckQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "conflict_check_queue_length"),
-			"Number of packets in the DHCP server queue waiting on conflict detection (ping). (ConflictCheckQueueLength)",
-			nil,
-			nil,
-		),
-		DiscoversTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "discovers_total"),
-			"Total DHCP Discovers received by the DHCP server (DiscoversTotal)",
-			nil,
-			nil,
-		),
-		OffersTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "offers_total"),
-			"Total DHCP Offers sent by the DHCP server (OffersTotal)",
-			nil,
-			nil,
-		),
-		RequestsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "requests_total"),
-			"Total DHCP Requests received by the DHCP server (RequestsTotal)",
-			nil,
-			nil,
-		),
-		InformsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "informs_total"),
-			"Total DHCP Informs received by the DHCP server (InformsTotal)",
-			nil,
-			nil,
-		),
-		AcksTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "acks_total"),
-			"Total DHCP Acks sent by the DHCP server (AcksTotal)",
-			nil,
-			nil,
-		),
-		NacksTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "nacks_total"),
-			"Total DHCP Nacks sent by the DHCP server (NacksTotal)",
-			nil,
-			nil,
-		),
-		DeclinesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "declines_total"),
-			"Total DHCP Declines received by the DHCP server (DeclinesTotal)",
-			nil,
-			nil,
-		),
-		ReleasesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "releases_total"),
-			"Total DHCP Releases received by the DHCP server (ReleasesTotal)",
-			nil,
-			nil,
-		),
-		OfferQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "offer_queue_length"),
-			"Number of packets in the offer queue of the DHCP server (OfferQueueLength)",
-			nil,
-			nil,
-		),
-		DeniedDueToMatch: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "denied_due_to_match_total"),
-			"Total number of DHCP requests denied, based on matches from the Deny list (DeniedDueToMatch)",
-			nil,
-			nil,
-		),
-		DeniedDueToNonMatch: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "denied_due_to_nonmatch_total"),
-			"Total number of DHCP requests denied, based on non-matches from the Allow list (DeniedDueToNonMatch)",
-			nil,
-			nil,
-		),
-		FailoverBndupdSentTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_bndupd_sent_total"),
-			"Number of DHCP failover Binding Update messages sent (FailoverBndupdSentTotal)",
-			nil,
-			nil,
-		),
-		FailoverBndupdReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_bndupd_received_total"),
-			"Number of DHCP failover Binding Update messages received (FailoverBndupdReceivedTotal)",
-			nil,
-			nil,
-		),
-		FailoverBndackSentTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_bndack_sent_total"),
-			"Number of DHCP failover Binding Ack messages sent (FailoverBndackSentTotal)",
-			nil,
-			nil,
-		),
-		FailoverBndackReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_bndack_received_total"),
-			"Number of DHCP failover Binding Ack messages received (FailoverBndackReceivedTotal)",
-			nil,
-			nil,
-		),
-		FailoverBndupdPendingOutboundQueue: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_bndupd_pending_in_outbound_queue"),
-			"Number of pending outbound DHCP failover Binding Update messages (FailoverBndupdPendingOutboundQueue)",
-			nil,
-			nil,
-		),
-		FailoverTransitionsCommunicationinterruptedState: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_transitions_communicationinterrupted_state_total"),
-			"Total number of transitions into COMMUNICATION INTERRUPTED state (FailoverTransitionsCommunicationinterruptedState)",
-			nil,
-			nil,
-		),
-		FailoverTransitionsPartnerdownState: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_transitions_partnerdown_state_total"),
-			"Total number of transitions into PARTNER DOWN state (FailoverTransitionsPartnerdownState)",
-			nil,
-			nil,
-		),
-		FailoverTransitionsRecoverState: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_transitions_recover_total"),
-			"Total number of transitions into RECOVER state (FailoverTransitionsRecoverState)",
-			nil,
-			nil,
-		),
-		FailoverBndupdDropped: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "failover_bndupd_dropped_total"),
-			"Total number of DHCP faileover Binding Updates dropped (FailoverBndupdDropped)",
-			nil,
-			nil,
-		),
-	}, nil
-}
-
-// represents perflib metrics from the DHCP Server class.
-// While the name of a number of perflib metrics would indicate a rate is being returned (E.G. Packets Received/sec),
-// perflib instead returns a counter, hence the "Total" suffix in some of the variable names.
-type dhcpPerf struct {
-	PacketsReceivedTotal                             float64 `perflib:"Packets Received/sec"`
-	DuplicatesDroppedTotal                           float64 `perflib:"Duplicates Dropped/sec"`
-	PacketsExpiredTotal                              float64 `perflib:"Packets Expired/sec"`
-	ActiveQueueLength                                float64 `perflib:"Active Queue Length"`
-	ConflictCheckQueueLength                         float64 `perflib:"Conflict Check Queue Length"`
-	DiscoversTotal                                   float64 `perflib:"Discovers/sec"`
-	OffersTotal                                      float64 `perflib:"Offers/sec"`
-	RequestsTotal                                    float64 `perflib:"Requests/sec"`
-	InformsTotal                                     float64 `perflib:"Informs/sec"`
-	AcksTotal                                        float64 `perflib:"Acks/sec"`
-	NacksTotal                                       float64 `perflib:"Nacks/sec"`
-	DeclinesTotal                                    float64 `perflib:"Declines/sec"`
-	ReleasesTotal                                    float64 `perflib:"Releases/sec"`
-	DeniedDueToMatch                                 float64 `perflib:"Denied due to match."`
-	DeniedDueToNonMatch                              float64 `perflib:"Denied due to match."`
-	OfferQueueLength                                 float64 `perflib:"Offer Queue Length"`
-	FailoverBndupdSentTotal                          float64 `perflib:"Failover: BndUpd sent/sec."`
-	FailoverBndupdReceivedTotal                      float64 `perflib:"Failover: BndUpd received/sec."`
-	FailoverBndackSentTotal                          float64 `perflib:"Failover: BndAck sent/sec."`
-	FailoverBndackReceivedTotal                      float64 `perflib:"Failover: BndAck received/sec."`
-	FailoverBndupdPendingOutboundQueue               float64 `perflib:"Failover: BndUpd pending in outbound queue."`
-	FailoverTransitionsCommunicationinterruptedState float64 `perflib:"Failover: Transitions to COMMUNICATION-INTERRUPTED state."`
-	FailoverTransitionsPartnerdownState              float64 `perflib:"Failover: Transitions to PARTNER-DOWN state."`
-	FailoverTransitionsRecoverState                  float64 `perflib:"Failover: Transitions to RECOVER state."`
-	FailoverBndupdDropped                            float64 `perflib:"Failover: BndUpd Dropped."`
-}
-
-func (c *DhcpCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var perflib []dhcpPerf
-	if err := unmarshalObject(ctx.perfObjects["DHCP Server"], &perflib); err != nil {
-		return err
-	}
-
-	ch <- prometheus.MustNewConstMetric(
-		c.PacketsReceivedTotal,
-		prometheus.CounterValue,
-		perflib[0].PacketsReceivedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DuplicatesDroppedTotal,
-		prometheus.CounterValue,
-		perflib[0].DuplicatesDroppedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.PacketsExpiredTotal,
-		prometheus.CounterValue,
-		perflib[0].PacketsExpiredTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ActiveQueueLength,
-		prometheus.GaugeValue,
-		perflib[0].ActiveQueueLength,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ConflictCheckQueueLength,
-		prometheus.GaugeValue,
-		perflib[0].ConflictCheckQueueLength,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DiscoversTotal,
-		prometheus.CounterValue,
-		perflib[0].DiscoversTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.OffersTotal,
-		prometheus.CounterValue,
-		perflib[0].OffersTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.RequestsTotal,
-		prometheus.CounterValue,
-		perflib[0].RequestsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.InformsTotal,
-		prometheus.CounterValue,
-		perflib[0].InformsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.AcksTotal,
-		prometheus.CounterValue,
-		perflib[0].AcksTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.NacksTotal,
-		prometheus.CounterValue,
-		perflib[0].NacksTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DeclinesTotal,
-		prometheus.CounterValue,
-		perflib[0].DeclinesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ReleasesTotal,
-		prometheus.CounterValue,
-		perflib[0].ReleasesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.OfferQueueLength,
-		prometheus.GaugeValue,
-		perflib[0].OfferQueueLength,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DeniedDueToMatch,
-		prometheus.CounterValue,
-		perflib[0].DeniedDueToMatch,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DeniedDueToNonMatch,
-		prometheus.CounterValue,
-		perflib[0].DeniedDueToNonMatch,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdSentTotal,
-		prometheus.CounterValue,
-		perflib[0].FailoverBndupdSentTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdReceivedTotal,
-		prometheus.CounterValue,
-		perflib[0].FailoverBndupdReceivedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndackSentTotal,
-		prometheus.CounterValue,
-		perflib[0].FailoverBndackSentTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndackReceivedTotal,
-		prometheus.CounterValue,
-		perflib[0].FailoverBndackReceivedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdPendingOutboundQueue,
-		prometheus.GaugeValue,
-		perflib[0].FailoverBndupdPendingOutboundQueue,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverTransitionsCommunicationinterruptedState,
-		prometheus.CounterValue,
-		perflib[0].FailoverTransitionsCommunicationinterruptedState,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverTransitionsPartnerdownState,
-		prometheus.CounterValue,
-		perflib[0].FailoverTransitionsPartnerdownState,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverTransitionsRecoverState,
-		prometheus.CounterValue,
-		perflib[0].FailoverTransitionsRecoverState,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdDropped,
-		prometheus.CounterValue,
-		perflib[0].FailoverBndupdDropped,
-	)
-
-	return nil
-}

collector/dhcp_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkDHCPCollector(b *testing.B) {
-	benchmarkCollector(b, "dhcp", NewDhcpCollector)
-}

collector/dns.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"errors"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -82,8 +81,8 @@ func NewDNSCollector() (Collector, error) {
 			nil,
 		),
 		MemoryUsedBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "memory_used_bytes"),
-			"Current memory used by DNS server",
+			prometheus.BuildFQName(Namespace, subsystem, "memory_used_bytes_total"),
+			"Total memory used by DNS server",
 			[]string{"area"},
 			nil,
 		),
@@ -137,7 +136,7 @@ func NewDNSCollector() (Collector, error) {
 		),
 		Responses: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "responses_total"),
-			"Number of responses sent by DNS server",
+			"Number of reponses sent by DNS server",
 			[]string{"protocol"},
 			nil,
 		),

collector/dns_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkDNSCollector(b *testing.B) {
-	benchmarkCollector(b, "dns", NewDNSCollector)
-}

collector/exchange.go

@@ -1,634 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-	"gopkg.in/alecthomas/kingpin.v2"
-)
-
-func init() {
-	registerCollector("exchange", newExchangeCollector,
-		"MSExchange ADAccess Processes",
-		"MSExchangeTransport Queues",
-		"MSExchange HttpProxy",
-		"MSExchange ActiveSync",
-		"MSExchange Availability Service",
-		"MSExchange OWA",
-		"MSExchangeAutodiscover",
-		"MSExchange WorkloadManagement Workloads",
-		"MSExchange RpcClientAccess",
-	)
-}
-
-type exchangeCollector struct {
-	LDAPReadTime                            *prometheus.Desc
-	LDAPSearchTime                          *prometheus.Desc
-	LDAPWriteTime                           *prometheus.Desc
-	LDAPTimeoutErrorsPerSec                 *prometheus.Desc
-	LongRunningLDAPOperationsPerMin         *prometheus.Desc
-	ExternalActiveRemoteDeliveryQueueLength *prometheus.Desc
-	InternalActiveRemoteDeliveryQueueLength *prometheus.Desc
-	ActiveMailboxDeliveryQueueLength        *prometheus.Desc
-	RetryMailboxDeliveryQueueLength         *prometheus.Desc
-	UnreachableQueueLength                  *prometheus.Desc
-	ExternalLargestDeliveryQueueLength      *prometheus.Desc
-	InternalLargestDeliveryQueueLength      *prometheus.Desc
-	PoisonQueueLength                       *prometheus.Desc
-	MailboxServerLocatorAverageLatency      *prometheus.Desc
-	AverageAuthenticationLatency            *prometheus.Desc
-	AverageCASProcessingLatency             *prometheus.Desc
-	MailboxServerProxyFailureRate           *prometheus.Desc
-	OutstandingProxyRequests                *prometheus.Desc
-	ProxyRequestsPerSec                     *prometheus.Desc
-	ActiveSyncRequestsPerSec                *prometheus.Desc
-	PingCommandsPending                     *prometheus.Desc
-	SyncCommandsPerSec                      *prometheus.Desc
-	AvailabilityRequestsSec                 *prometheus.Desc
-	CurrentUniqueUsers                      *prometheus.Desc
-	OWARequestsPerSec                       *prometheus.Desc
-	AutodiscoverRequestsPerSec              *prometheus.Desc
-	ActiveTasks                             *prometheus.Desc
-	CompletedTasks                          *prometheus.Desc
-	QueuedTasks                             *prometheus.Desc
-	YieldedTasks                            *prometheus.Desc
-	IsActive                                *prometheus.Desc
-	RPCAveragedLatency                      *prometheus.Desc
-	RPCRequests                             *prometheus.Desc
-	ActiveUserCount                         *prometheus.Desc
-	ConnectionCount                         *prometheus.Desc
-	RPCOperationsPerSec                     *prometheus.Desc
-	UserCount                               *prometheus.Desc
-
-	enabledCollectors []string
-}
-
-var (
-	// All available collector functions
-	exchangeAllCollectorNames = []string{
-		"ADAccessProcesses",
-		"TransportQueues",
-		"HttpProxy",
-		"ActiveSync",
-		"AvailabilityService",
-		"OutlookWebAccess",
-		"Autodiscover",
-		"WorkloadManagement",
-		"RpcClientAccess",
-	}
-
-	argExchangeListAllCollectors = kingpin.Flag(
-		"collectors.exchange.list",
-		"List the collectors along with their perflib object name/ids",
-	).Bool()
-
-	argExchangeCollectorsEnabled = kingpin.Flag(
-		"collectors.exchange.enabled",
-		"Comma-separated list of collectors to use. Defaults to all, if not specified.",
-	).Default("").String()
-)
-
-// newExchangeCollector returns a new Collector
-func newExchangeCollector() (Collector, error) {
-
-	// desc creates a new prometheus description
-	desc := func(metricName string, description string, labels ...string) *prometheus.Desc {
-		return prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, "exchange", metricName),
-			description,
-			labels,
-			nil,
-		)
-	}
-
-	c := exchangeCollector{
-		RPCAveragedLatency:                      desc("rpc_avg_latency_sec", "The latency (sec), averaged for the past 1024 packets"),
-		RPCRequests:                             desc("rpc_requests", "Number of client requests currently being processed by  the RPC Client Access service"),
-		ActiveUserCount:                         desc("rpc_active_user_count", "Number of unique users that have shown some kind of activity in the last 2 minutes"),
-		ConnectionCount:                         desc("rpc_connection_count", "Total number of client connections maintained"),
-		RPCOperationsPerSec:                     desc("rpc_operations_total", "The rate at which RPC operations occur"),
-		UserCount:                               desc("rpc_user_count", "Number of users"),
-		LDAPReadTime:                            desc("ldap_read_time_sec", "Time (sec) to send an LDAP read request and receive a response", "name"),
-		LDAPSearchTime:                          desc("ldap_search_time_sec", "Time (sec) to send an LDAP search request and receive a response", "name"),
-		LDAPWriteTime:                           desc("ldap_write_time_sec", "Time (sec) to send an LDAP Add/Modify/Delete request and receive a response", "name"),
-		LDAPTimeoutErrorsPerSec:                 desc("ldap_timeout_errors_total", "Total number of LDAP timeout errors", "name"),
-		LongRunningLDAPOperationsPerMin:         desc("ldap_long_running_ops_per_sec", "Long Running LDAP operations per second", "name"),
-		ExternalActiveRemoteDeliveryQueueLength: desc("transport_queues_external_active_remote_delivery", "External Active Remote Delivery Queue length", "name"),
-		InternalActiveRemoteDeliveryQueueLength: desc("transport_queues_internal_active_remote_delivery", "Internal Active Remote Delivery Queue length", "name"),
-		ActiveMailboxDeliveryQueueLength:        desc("transport_queues_active_mailbox_delivery", "Active Mailbox Delivery Queue length", "name"),
-		RetryMailboxDeliveryQueueLength:         desc("transport_queues_retry_mailbox_delivery", "Retry Mailbox Delivery Queue length", "name"),
-		UnreachableQueueLength:                  desc("transport_queues_unreachable", "Unreachable Queue length", "name"),
-		ExternalLargestDeliveryQueueLength:      desc("transport_queues_external_largest_delivery", "External Largest Delivery Queue length", "name"),
-		InternalLargestDeliveryQueueLength:      desc("transport_queues_internal_largest_delivery", "Internal Largest Delivery Queue length", "name"),
-		PoisonQueueLength:                       desc("transport_queues_poison", "Poison Queue length", "name"),
-		MailboxServerLocatorAverageLatency:      desc("http_proxy_mailbox_server_locator_avg_latency_sec", "Average latency (sec) of MailboxServerLocator web service calls", "name"),
-		AverageAuthenticationLatency:            desc("http_proxy_avg_auth_latency", "Average time spent authenticating CAS requests over the last 200 samples", "name"),
-		OutstandingProxyRequests:                desc("http_proxy_outstanding_proxy_requests", "Number of concurrent outstanding proxy requests", "name"),
-		ProxyRequestsPerSec:                     desc("http_proxy_requests_total", "Number of proxy requests processed each second", "name"),
-		AvailabilityRequestsSec:                 desc("avail_service_requests_per_sec", "Number of requests serviced per second"),
-		CurrentUniqueUsers:                      desc("owa_current_unique_users", "Number of unique users currently logged on to Outlook Web App"),
-		OWARequestsPerSec:                       desc("owa_requests_total", "Number of requests handled by Outlook Web App per second"),
-		AutodiscoverRequestsPerSec:              desc("autodiscover_requests_total", "Number of autodiscover service requests processed each second"),
-		ActiveTasks:                             desc("workload_active_tasks", "Number of active tasks currently running in the background for workload management", "name"),
-		CompletedTasks:                          desc("workload_completed_tasks", "Number of workload management tasks that have been completed", "name"),
-		QueuedTasks:                             desc("workload_queued_tasks", "Number of workload management tasks that are currently queued up waiting to be processed", "name"),
-		YieldedTasks:                            desc("workload_yielded_tasks", "The total number of tasks that have been yielded by a workload", "name"),
-		IsActive:                                desc("workload_is_active", "Active indicates whether the workload is in an active (1) or paused (0) state", "name"),
-		ActiveSyncRequestsPerSec:                desc("activesync_requests_total", "Num HTTP requests received from the client via ASP.NET per sec. Shows Current user load"),
-		AverageCASProcessingLatency:             desc("http_proxy_avg_cas_proccessing_latency_sec", "Average latency (sec) of CAS processing time over the last 200 reqs", "name"),
-		MailboxServerProxyFailureRate:           desc("http_proxy_mailbox_proxy_failure_rate", "% of failures between this CAS and MBX servers over the last 200 samples", "name"),
-		PingCommandsPending:                     desc("activesync_ping_cmds_pending", "Number of ping commands currently pending in the queue"),
-		SyncCommandsPerSec:                      desc("activesync_sync_cmds_total", "Number of sync commands processed per second. Clients use this command to synchronize items within a folder"),
-
-		enabledCollectors: make([]string, 0, len(exchangeAllCollectorNames)),
-	}
-
-	collectorDesc := map[string]string{
-		"ADAccessProcesses":   "[19108] MSExchange ADAccess Processes",
-		"TransportQueues":     "[20524] MSExchangeTransport Queues",
-		"HttpProxy":           "[36934] MSExchange HttpProxy",
-		"ActiveSync":          "[25138] MSExchange ActiveSync",
-		"AvailabilityService": "[24914] MSExchange Availability Service",
-		"OutlookWebAccess":    "[24618] MSExchange OWA",
-		"Autodiscover":        "[29240] MSExchange Autodiscover",
-		"WorkloadManagement":  "[19430] MSExchange WorkloadManagement Workloads",
-		"RpcClientAccess":     "[29336] MSExchange RpcClientAccess",
-	}
-
-	if *argExchangeListAllCollectors {
-		fmt.Printf("%-32s %-32s\n", "Collector Name", "[PerfID] Perflib Object")
-		for _, cname := range exchangeAllCollectorNames {
-			fmt.Printf("%-32s %-32s\n", cname, collectorDesc[cname])
-		}
-		os.Exit(0)
-	}
-
-	if *argExchangeCollectorsEnabled == "" {
-		for _, collectorName := range exchangeAllCollectorNames {
-			c.enabledCollectors = append(c.enabledCollectors, collectorName)
-		}
-	} else {
-		for _, collectorName := range strings.Split(*argExchangeCollectorsEnabled, ",") {
-			if find(exchangeAllCollectorNames, collectorName) {
-				c.enabledCollectors = append(c.enabledCollectors, collectorName)
-			} else {
-				return nil, fmt.Errorf("Unknown exchange collector: %s", collectorName)
-			}
-		}
-	}
-
-	return &c, nil
-}
-
-// Collect collects exchange metrics and sends them to prometheus
-func (c *exchangeCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-
-	collectorFuncs := map[string]func(ctx *ScrapeContext, ch chan<- prometheus.Metric) error{
-		"ADAccessProcesses":   c.collectADAccessProcesses,
-		"TransportQueues":     c.collectTransportQueues,
-		"HttpProxy":           c.collectHTTPProxy,
-		"ActiveSync":          c.collectActiveSync,
-		"AvailabilityService": c.collectAvailabilityService,
-		"OutlookWebAccess":    c.collectOWA,
-		"Autodiscover":        c.collectAutoDiscover,
-		"WorkloadManagement":  c.collectWorkloadManagementWorkloads,
-		"RpcClientAccess":     c.collectRPC,
-	}
-
-	for _, collectorName := range c.enabledCollectors {
-		if err := collectorFuncs[collectorName](ctx, ch); err != nil {
-			log.Errorf("Error in %s: %s", collectorName, err)
-			return err
-		}
-	}
-	return nil
-}
-
-// Perflib: [19108] MSExchange ADAccess Processes
-type perflibADAccessProcesses struct {
-	Name string
-
-	LDAPReadTime                    float64 `perflib:"LDAP Read Time"`
-	LDAPSearchTime                  float64 `perflib:"LDAP Search Time"`
-	LDAPWriteTime                   float64 `perflib:"LDAP Write Time"`
-	LDAPTimeoutErrorsPerSec         float64 `perflib:"LDAP Timeout Errors/sec"`
-	LongRunningLDAPOperationsPerMin float64 `perflib:"Long Running LDAP Operations/min"`
-}
-
-func (c *exchangeCollector) collectADAccessProcesses(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibADAccessProcesses
-	if err := unmarshalObject(ctx.perfObjects["MSExchange ADAccess Processes"], &data); err != nil {
-		return err
-	}
-
-	labelUseCount := make(map[string]int)
-	for _, proc := range data {
-		labelName := c.toLabelName(proc.Name)
-		if strings.HasSuffix(labelName, "_total") {
-			continue
-		}
-
-		// since we're not including the PID suffix from the instance names in the label names,
-		// we get an occasional duplicate. This seems to affect about 4 instances only on this object.
-		labelUseCount[labelName]++
-		if labelUseCount[labelName] > 1 {
-			labelName = fmt.Sprintf("%s_%d", labelName, labelUseCount[labelName])
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.LDAPReadTime,
-			prometheus.CounterValue,
-			c.msToSec(proc.LDAPReadTime),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.LDAPSearchTime,
-			prometheus.CounterValue,
-			c.msToSec(proc.LDAPSearchTime),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.LDAPWriteTime,
-			prometheus.CounterValue,
-			c.msToSec(proc.LDAPWriteTime),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.LDAPTimeoutErrorsPerSec,
-			prometheus.CounterValue,
-			proc.LDAPTimeoutErrorsPerSec,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.LongRunningLDAPOperationsPerMin,
-			prometheus.CounterValue,
-			proc.LongRunningLDAPOperationsPerMin*60,
-			labelName,
-		)
-	}
-	return nil
-}
-
-// Perflib: [24914] MSExchange Availability Service
-type perflibAvailabilityService struct {
-	RequestsSec float64 `perflib:"Availability Requests (sec)"`
-}
-
-func (c *exchangeCollector) collectAvailabilityService(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibAvailabilityService
-	if err := unmarshalObject(ctx.perfObjects["MSExchange Availability Service"], &data); err != nil {
-		return err
-	}
-
-	for _, availservice := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.AvailabilityRequestsSec,
-			prometheus.CounterValue,
-			availservice.RequestsSec,
-		)
-	}
-	return nil
-}
-
-// Perflib: [36934] MSExchange HttpProxy
-type perflibHTTPProxy struct {
-	Name string
-
-	MailboxServerLocatorAverageLatency float64 `perflib:"MailboxServerLocator Average Latency (Moving Average)"`
-	AverageAuthenticationLatency       float64 `perflib:"Average Authentication Latency"`
-	AverageCASProcessingLatency        float64 `perflib:"Average ClientAccess Server Processing Latency"`
-	MailboxServerProxyFailureRate      float64 `perflib:"Mailbox Server Proxy Failure Rate"`
-	OutstandingProxyRequests           float64 `perflib:"Outstanding Proxy Requests"`
-	ProxyRequestsPerSec                float64 `perflib:"Proxy Requests/Sec"`
-}
-
-func (c *exchangeCollector) collectHTTPProxy(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibHTTPProxy
-	if err := unmarshalObject(ctx.perfObjects["MSExchange HttpProxy"], &data); err != nil {
-		return err
-	}
-
-	for _, instance := range data {
-		labelName := c.toLabelName(instance.Name)
-		ch <- prometheus.MustNewConstMetric(
-			c.MailboxServerLocatorAverageLatency,
-			prometheus.GaugeValue,
-			c.msToSec(instance.MailboxServerLocatorAverageLatency),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.AverageAuthenticationLatency,
-			prometheus.GaugeValue,
-			instance.AverageAuthenticationLatency,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.AverageCASProcessingLatency,
-			prometheus.GaugeValue,
-			c.msToSec(instance.AverageCASProcessingLatency),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.MailboxServerProxyFailureRate,
-			prometheus.GaugeValue,
-			instance.MailboxServerProxyFailureRate,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.OutstandingProxyRequests,
-			prometheus.GaugeValue,
-			instance.OutstandingProxyRequests,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ProxyRequestsPerSec,
-			prometheus.CounterValue,
-			instance.ProxyRequestsPerSec,
-			labelName,
-		)
-	}
-	return nil
-}
-
-// Perflib: [24618] MSExchange OWA
-type perflibOWA struct {
-	CurrentUniqueUsers float64 `perflib:"Current Unique Users"`
-	RequestsPerSec     float64 `perflib:"Requests/sec"`
-}
-
-func (c *exchangeCollector) collectOWA(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibOWA
-	if err := unmarshalObject(ctx.perfObjects["MSExchange OWA"], &data); err != nil {
-		return err
-	}
-
-	for _, owa := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.CurrentUniqueUsers,
-			prometheus.GaugeValue,
-			owa.CurrentUniqueUsers,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.OWARequestsPerSec,
-			prometheus.CounterValue,
-			owa.RequestsPerSec,
-		)
-	}
-	return nil
-}
-
-// Perflib: [25138] MSExchange ActiveSync
-type perflibActiveSync struct {
-	RequestsPerSec      float64 `perflib:"Requests/sec"`
-	PingCommandsPending float64 `perflib:"Ping Commands Pending"`
-	SyncCommandsPerSec  float64 `perflib:"Sync Commands/sec"`
-}
-
-func (c *exchangeCollector) collectActiveSync(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibActiveSync
-	if err := unmarshalObject(ctx.perfObjects["MSExchange ActiveSync"], &data); err != nil {
-		return err
-	}
-
-	for _, instance := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.ActiveSyncRequestsPerSec,
-			prometheus.CounterValue,
-			instance.RequestsPerSec,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PingCommandsPending,
-			prometheus.GaugeValue,
-			instance.PingCommandsPending,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.SyncCommandsPerSec,
-			prometheus.CounterValue,
-			instance.SyncCommandsPerSec,
-		)
-	}
-	return nil
-}
-
-// Perflib: [29366] MSExchange RpcClientAccess
-type perflibRPCClientAccess struct {
-	RPCAveragedLatency  float64 `perflib:"RPC Averaged Latency"`
-	RPCRequests         float64 `perflib:"RPC Requests"`
-	ActiveUserCount     float64 `perflib:"Active User Count"`
-	ConnectionCount     float64 `perflib:"Connection Count"`
-	RPCOperationsPerSec float64 `perflib:"RPC Operations/sec"`
-	UserCount           float64 `perflib:"User Count"`
-}
-
-func (c *exchangeCollector) collectRPC(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibRPCClientAccess
-	if err := unmarshalObject(ctx.perfObjects["MSExchange RpcClientAccess"], &data); err != nil {
-		return err
-	}
-
-	for _, rpc := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.RPCAveragedLatency,
-			prometheus.GaugeValue,
-			c.msToSec(rpc.RPCAveragedLatency),
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RPCRequests,
-			prometheus.GaugeValue,
-			rpc.RPCRequests,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ActiveUserCount,
-			prometheus.GaugeValue,
-			rpc.ActiveUserCount,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionCount,
-			prometheus.GaugeValue,
-			rpc.ConnectionCount,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RPCOperationsPerSec,
-			prometheus.CounterValue,
-			rpc.RPCOperationsPerSec,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.UserCount,
-			prometheus.GaugeValue,
-			rpc.UserCount,
-		)
-	}
-
-	return nil
-}
-
-// Perflib: [20524] MSExchangeTransport Queues
-type perflibTransportQueues struct {
-	Name string
-
-	ExternalActiveRemoteDeliveryQueueLength float64 `perflib:"External Active Remote Delivery Queue Length"`
-	InternalActiveRemoteDeliveryQueueLength float64 `perflib:"Internal Active Remote Delivery Queue Length"`
-	ActiveMailboxDeliveryQueueLength        float64 `perflib:"Active Mailbox Delivery Queue Length"`
-	RetryMailboxDeliveryQueueLength         float64 `perflib:"Retry Mailbox Delivery Queue Length"`
-	UnreachableQueueLength                  float64 `perflib:"Unreachable Queue Length"`
-	ExternalLargestDeliveryQueueLength      float64 `perflib:"External Largest Delivery Queue Length"`
-	InternalLargestDeliveryQueueLength      float64 `perflib:"Internal Largest Delivery Queue Length"`
-	PoisonQueueLength                       float64 `perflib:"Poison Queue Length"`
-}
-
-func (c *exchangeCollector) collectTransportQueues(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibTransportQueues
-	if err := unmarshalObject(ctx.perfObjects["MSExchangeTransport Queues"], &data); err != nil {
-		return err
-	}
-
-	for _, queue := range data {
-		labelName := c.toLabelName(queue.Name)
-		if strings.HasSuffix(labelName, "_total") {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.ExternalActiveRemoteDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.ExternalActiveRemoteDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.InternalActiveRemoteDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.InternalActiveRemoteDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ActiveMailboxDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.ActiveMailboxDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.RetryMailboxDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.RetryMailboxDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.UnreachableQueueLength,
-			prometheus.GaugeValue,
-			queue.UnreachableQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ExternalLargestDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.ExternalLargestDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.InternalLargestDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.InternalLargestDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PoisonQueueLength,
-			prometheus.GaugeValue,
-			queue.PoisonQueueLength,
-			labelName,
-		)
-	}
-	return nil
-}
-
-// Perflib: [19430] MSExchange WorkloadManagement Workloads
-type perflibWorkloadManagementWorkloads struct {
-	Name string
-
-	ActiveTasks    float64 `perflib:"ActiveTasks"`
-	CompletedTasks float64 `perflib:"CompletedTasks"`
-	QueuedTasks    float64 `perflib:"QueuedTasks"`
-	YieldedTasks   float64 `perflib:"YieldedTasks"`
-	IsActive       float64 `perflib:"Active"`
-}
-
-func (c *exchangeCollector) collectWorkloadManagementWorkloads(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibWorkloadManagementWorkloads
-	if err := unmarshalObject(ctx.perfObjects["MSExchange WorkloadManagement Workloads"], &data); err != nil {
-		return err
-	}
-
-	for _, instance := range data {
-		labelName := c.toLabelName(instance.Name)
-		if strings.HasSuffix(labelName, "_total") {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.ActiveTasks,
-			prometheus.GaugeValue,
-			instance.ActiveTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.CompletedTasks,
-			prometheus.CounterValue,
-			instance.CompletedTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.QueuedTasks,
-			prometheus.CounterValue,
-			instance.QueuedTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.YieldedTasks,
-			prometheus.CounterValue,
-			instance.YieldedTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.IsActive,
-			prometheus.GaugeValue,
-			instance.IsActive,
-			labelName,
-		)
-	}
-
-	return nil
-}
-
-// [29240] MSExchangeAutodiscover
-type perflibAutodiscover struct {
-	RequestsPerSec float64 `perflib:"Requests/sec"`
-}
-
-func (c *exchangeCollector) collectAutoDiscover(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var data []perflibAutodiscover
-	if err := unmarshalObject(ctx.perfObjects["MSExchangeAutodiscover"], &data); err != nil {
-		return err
-	}
-	for _, autodisc := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.AutodiscoverRequestsPerSec,
-			prometheus.CounterValue,
-			autodisc.RequestsPerSec,
-		)
-	}
-	return nil
-}
-
-// toLabelName converts strings to lowercase and replaces all whitespace and dots with underscores
-func (c *exchangeCollector) toLabelName(name string) string {
-	s := strings.ReplaceAll(strings.Join(strings.Fields(strings.ToLower(name)), "_"), ".", "_")
-	s = strings.ReplaceAll(s, "__", "_")
-	return s
-}
-
-// msToSec converts from ms to seconds
-func (c *exchangeCollector) msToSec(t float64) float64 {
-	return t / 1000
-}

collector/exchange_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkExchangeCollector(b *testing.B) {
-	benchmarkCollector(b, "exchange", newExchangeCollector)
-}

collector/fsrmquota.go

@@ -1,187 +0,0 @@
-package collector
-
-import (
-	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-func init() {
-	registerCollector("fsrmquota", newFSRMQuotaCollector)
-}
-
-type FSRMQuotaCollector struct {
-	QuotasCount *prometheus.Desc
-	Path        *prometheus.Desc
-	PeakUsage   *prometheus.Desc
-	Size        *prometheus.Desc
-	Usage       *prometheus.Desc
-
-	Description     *prometheus.Desc
-	Disabled        *prometheus.Desc
-	MatchesTemplate *prometheus.Desc
-	SoftLimit       *prometheus.Desc
-	Template        *prometheus.Desc
-}
-
-func newFSRMQuotaCollector() (Collector, error) {
-	const subsystem = "fsrmquota"
-	return &FSRMQuotaCollector{
-		QuotasCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "count"),
-			"Number of Quotas",
-			nil,
-			nil,
-		),
-		PeakUsage: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "peak_usage_bytes"),
-			"The highest amount of disk space usage charged to this quota. (PeakUsage)",
-			[]string{"path", "template"},
-			nil,
-		),
-		Size: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "size_bytes"),
-			"The size of the quota. (Size)",
-			[]string{"path", "template"},
-			nil,
-		),
-		Usage: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "usage_bytes"),
-			"The current amount of disk space usage charged to this quota. (Usage)",
-			[]string{"path", "template"},
-			nil,
-		),
-		Description: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "description"),
-			"Description of the quota (Description)",
-			[]string{"path", "template", "description"},
-			nil,
-		),
-		Disabled: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "disabled"),
-			"If 1, the quota is disabled. The default value is 0. (Disabled)",
-			[]string{"path", "template"},
-			nil,
-		),
-		SoftLimit: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "softlimit"),
-			"If 1, the quota is a soft limit. If 0, the quota is a hard limit. The default value is 0. Optional (SoftLimit)",
-			[]string{"path", "template"},
-			nil,
-		),
-		Template: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "template"),
-			"Quota template name. (Template)",
-			[]string{"path", "template"},
-			nil,
-		),
-		MatchesTemplate: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "matchestemplate"),
-			"If 1, the property values of this quota match those values of the template from which it was derived. (MatchesTemplate)",
-			[]string{"path", "template"},
-			nil,
-		),
-	}, nil
-}
-
-// Collect sends the metric values for each metric
-// to the provided prometheus Metric channel.
-func (c *FSRMQuotaCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		log.Error("failed collecting fsrmquota metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-// MSFT_FSRMQuota docs:
-// https://docs.microsoft.com/en-us/previous-versions/windows/desktop/fsrm/msft-fsrmquota
-type MSFT_FSRMQuota struct {
-	Name string
-
-	Path        string
-	PeakUsage   uint64
-	Size        uint64
-	Usage       uint64
-	Description string
-	Template    string
-	//Threshold             string
-	Disabled        bool
-	MatchesTemplate bool
-	SoftLimit       bool
-}
-
-func (c *FSRMQuotaCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []MSFT_FSRMQuota
-	q := queryAll(&dst)
-
-	var count int
-
-	if err := wmi.QueryNamespace(q, &dst, "root/microsoft/windows/fsrm"); err != nil {
-		return nil, err
-	}
-
-	for _, quota := range dst {
-
-		count++
-		path := quota.Path
-		template := quota.Template
-		Description := quota.Description
-
-		ch <- prometheus.MustNewConstMetric(
-			c.PeakUsage,
-			prometheus.GaugeValue,
-			float64(quota.PeakUsage),
-			path,
-			template,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.Size,
-			prometheus.GaugeValue,
-			float64(quota.Size),
-			path,
-			template,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.Usage,
-			prometheus.GaugeValue,
-			float64(quota.Usage),
-			path,
-			template,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.Description,
-			prometheus.GaugeValue,
-			1.0,
-			path, template, Description,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.Disabled,
-			prometheus.GaugeValue,
-			boolToFloat(quota.Disabled),
-			path,
-			template,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.MatchesTemplate,
-			prometheus.GaugeValue,
-			boolToFloat(quota.MatchesTemplate),
-			path,
-			template,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.SoftLimit,
-			prometheus.GaugeValue,
-			boolToFloat(quota.SoftLimit),
-			path,
-			template,
-		)
-	}
-
-	ch <- prometheus.MustNewConstMetric(
-		c.QuotasCount,
-		prometheus.GaugeValue,
-		float64(count),
-	)
-	return nil, nil
-}

collector/fsrmquota_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkFsrmQuotaCollector(b *testing.B) {
-	benchmarkCollector(b, "fsrmquota", newFSRMQuotaCollector)
-}

collector/hyperv.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -1002,17 +1001,8 @@ func (c *HyperVCollector) collectVmCpuUsage(ch chan<- prometheus.Metric) (*prome
 		}
 		// The name format is <VM Name>:Hv VP <vcore id>
 		parts := strings.Split(obj.Name, ":")
-		if len(parts) != 2 {
-			log.Warnf("Unexpected format of Name in collectVmCpuUsage: %q, expected %q. Skipping.", obj.Name, "<VM Name>:Hv VP <vcore id>")
-			continue
-		}
-		coreParts := strings.Split(parts[1], " ")
-		if len(coreParts) != 3 {
-			log.Warnf("Unexpected format of core identifier in collectVmCpuUsage: %q, expected %q. Skipping.", parts[1], "Hv VP <vcore id>")
-			continue
-		}
 		vmName := parts[0]
-		coreId := coreParts[2]
+		coreId := strings.Split(parts[1], " ")[2]
 
 		ch <- prometheus.MustNewConstMetric(
 			c.VMGuestRunTime,

collector/hyperv_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkHypervCollector(b *testing.B) {
-	benchmarkCollector(b, "hyperv", NewHyperVCollector)
-}

collector/iis_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkIISCollector(b *testing.B) {
-	benchmarkCollector(b, "iis", NewIISCollector)
-}

collector/logical_disk.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -104,14 +103,14 @@ func NewLogicalDiskCollector() (Collector, error) {
 
 		FreeSpace: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "free_bytes"),
-			"Free space in bytes, updates every 10-15 min (LogicalDisk.PercentFreeSpace)",
+			"Free space in bytes (LogicalDisk.PercentFreeSpace)",
 			[]string{"volume"},
 			nil,
 		),
 
 		TotalSpace: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "size_bytes"),
-			"Total space in bytes, updates every 10-15 min (LogicalDisk.PercentFreeSpace_Base)",
+			"Total space in bytes (LogicalDisk.PercentFreeSpace_Base)",
 			[]string{"volume"},
 			nil,
 		),

collector/logical_disk_test.go

@@ -1,13 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkLogicalDiskCollector(b *testing.B) {
-	// Whitelist is not set in testing context (kingpin flags not parsed), causing the collector to skip all disks.
-	localVolumeWhitelist := ".+"
-	volumeWhitelist = &localVolumeWhitelist
-
-	benchmarkCollector(b, "logical_disk", NewLogicalDiskCollector)
-}

collector/logon.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"errors"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/logon_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkLogonCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewLogonCollector)
-}

collector/memory.go

@@ -1,14 +1,13 @@
 // returns data points from Win32_PerfRawData_PerfOS_Memory
 // <add link to documentation here> - Win32_PerfRawData_PerfOS_Memory class
 
-//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/memory_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkMemoryCollector(b *testing.B) {
-	benchmarkCollector(b, "memory", NewMemoryCollector)
-}

collector/msmq.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -94,27 +93,29 @@ func (c *Win32_PerfRawData_MSMQ_MSMQQueueCollector) collect(ch chan<- prometheus
 	}
 
 	for _, msmq := range dst {
+
+		if msmq.Name == "Computer Queues" {
+			continue
+		}
+
 		ch <- prometheus.MustNewConstMetric(
 			c.BytesinJournalQueue,
 			prometheus.GaugeValue,
 			float64(msmq.BytesinJournalQueue),
 			strings.ToLower(msmq.Name),
 		)
-
 		ch <- prometheus.MustNewConstMetric(
 			c.BytesinQueue,
 			prometheus.GaugeValue,
 			float64(msmq.BytesinQueue),
 			strings.ToLower(msmq.Name),
 		)
-
 		ch <- prometheus.MustNewConstMetric(
 			c.MessagesinJournalQueue,
 			prometheus.GaugeValue,
 			float64(msmq.MessagesinJournalQueue),
 			strings.ToLower(msmq.Name),
 		)
-
 		ch <- prometheus.MustNewConstMetric(
 			c.MessagesinQueue,
 			prometheus.GaugeValue,

collector/msmq_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkMsmqCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewMSMQCollector)
-}

collector/mssql_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkMSSQLCollector(b *testing.B) {
-	benchmarkCollector(b, "mssql", NewMSSQLCollector)
-}

collector/net.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -71,25 +70,25 @@ func NewNetworkCollector() (Collector, error) {
 			nil,
 		),
 		PacketsOutboundDiscarded: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_discarded_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_discarded"),
 			"(Network.PacketsOutboundDiscarded)",
 			[]string{"nic"},
 			nil,
 		),
 		PacketsOutboundErrors: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_errors_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_errors"),
 			"(Network.PacketsOutboundErrors)",
 			[]string{"nic"},
 			nil,
 		),
 		PacketsReceivedDiscarded: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_received_discarded_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_received_discarded"),
 			"(Network.PacketsReceivedDiscarded)",
 			[]string{"nic"},
 			nil,
 		),
 		PacketsReceivedErrors: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_received_errors_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_received_errors"),
 			"(Network.PacketsReceivedErrors)",
 			[]string{"nic"},
 			nil,
@@ -101,7 +100,7 @@ func NewNetworkCollector() (Collector, error) {
 			nil,
 		),
 		PacketsReceivedUnknown: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_received_unknown_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_received_unknown"),
 			"(Network.PacketsReceivedUnknown)",
 			[]string{"nic"},
 			nil,
@@ -119,7 +118,7 @@ func NewNetworkCollector() (Collector, error) {
 			nil,
 		),
 		CurrentBandwidth: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "current_bandwidth_bytes"),
+			prometheus.BuildFQName(Namespace, subsystem, "current_bandwidth"),
 			"(Network.CurrentBandwidth)",
 			[]string{"nic"},
 			nil,
@@ -252,7 +251,7 @@ func (c *NetworkCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.CurrentBandwidth,
 			prometheus.GaugeValue,
-			nic.CurrentBandwidth/8,
+			nic.CurrentBandwidth,
 			name,
 		)
 	}

collector/net_test.go

@@ -1,11 +1,8 @@
-//go:build windows
 // +build windows
 
 package collector
 
-import (
-	"testing"
-)
+import "testing"
 
 func TestNetworkToInstanceName(t *testing.T) {
 	data := map[string]string{
@@ -18,10 +15,3 @@ func TestNetworkToInstanceName(t *testing.T) {
 		}
 	}
 }
-
-func BenchmarkNetCollector(b *testing.B) {
-	// Whitelist is not set in testing context (kingpin flags not parsed), causing the collector to skip all interfaces.
-	localNicWhitelist := ".+"
-	nicWhitelist = &localNicWhitelist
-	benchmarkCollector(b, "net", NewNetworkCollector)
-}

collector/netframework_clrexceptions.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrexceptions_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNetFrameworkNETCLRExceptionsCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRExceptionsCollector)
-}

collector/netframework_clrinterop.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrinterop_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNETFrameworkNETCLRInteropCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRInteropCollector)
-}

collector/netframework_clrjit.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrjit_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNETFrameworkNETCLRJitCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRJitCollector)
-}

collector/netframework_clrloading.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrloading_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNETFrameworkNETCLRLoadingCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRLoadingCollector)
-}

collector/netframework_clrlocksandthreads.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrlocksandthreads_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNETFrameworkNETCLRLocksAndThreadsCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRLocksAndThreadsCollector)
-}

collector/netframework_clrmemory.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrmemory_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNETFrameworkNETCLRMemoryCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRMemoryCollector)
-}

collector/netframework_clrremoting.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrremoting_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNETFrameworkNETCLRRemotingCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRRemotingCollector)
-}

collector/netframework_clrsecurity.go

@@ -1,12 +1,11 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/netframework_clrsecurity_test.go

@@ -1,10 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkNETFrameworkNETCLRSecurityCollector(b *testing.B) {
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRSecurityCollector)
-}

collector/os.go

@@ -1,24 +1,18 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"fmt"
-	"os"
-	"strings"
+	"errors"
 	"time"
 
-	"github.com/prometheus-community/windows_exporter/headers/netapi32"
-	"github.com/prometheus-community/windows_exporter/headers/psapi"
-	"github.com/prometheus-community/windows_exporter/headers/sysinfoapi"
-	"github.com/prometheus-community/windows_exporter/log"
+	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/sys/windows/registry"
+	"github.com/prometheus/common/log"
 )
 
 func init() {
-	registerCollector("os", NewOSCollector, "Paging File")
+	registerCollector("os", NewOSCollector)
 }
 
 // A OSCollector is a Prometheus collector for WMI metrics
@@ -38,12 +32,6 @@ type OSCollector struct {
 	Timezone                *prometheus.Desc
 }
 
-type pagingFileCounter struct {
-	Name      string
-	Usage     float64 `perflib:"% Usage"`
-	UsagePeak float64 `perflib:"% Usage Peak"`
-}
-
 // NewOSCollector ...
 func NewOSCollector() (Collector, error) {
 	const subsystem = "os"
@@ -98,7 +86,7 @@ func NewOSCollector() (Collector, error) {
 			nil,
 		),
 		ProcessMemoryLimitBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "process_memory_limit_bytes"),
+			prometheus.BuildFQName(Namespace, subsystem, "process_memory_limix_bytes"),
 			"OperatingSystem.MaxProcessMemorySize",
 			nil,
 			nil,
@@ -133,7 +121,7 @@ func NewOSCollector() (Collector, error) {
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *OSCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
+	if desc, err := c.collect(ch); err != nil {
 		log.Error("failed collecting os metrics:", desc, err)
 		return err
 	}
@@ -158,102 +146,41 @@ type Win32_OperatingSystem struct {
 	Version                 string
 }
 
-func (c *OSCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	nwgi, err := netapi32.GetWorkstationInfo()
-	if err != nil {
+func (c *OSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_OperatingSystem
+	q := queryAll(&dst)
+	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
 
-	gmse, err := sysinfoapi.GlobalMemoryStatusEx()
-	if err != nil {
-		return nil, err
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
 	}
 
-	currentTime := time.Now()
-	timezoneName, _ := currentTime.Zone()
-
-	// Get total allocation of paging files across all disks.
-	memManKey, err := registry.OpenKey(registry.LOCAL_MACHINE, `SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management`, registry.QUERY_VALUE)
-	defer memManKey.Close()
-
-	if err != nil {
-		return nil, err
-	}
-	pagingFiles, _, err := memManKey.GetStringsValue("ExistingPageFiles")
-	if err != nil {
-		return nil, err
-	}
-
-	// Get build number and product name from registry
-	ntKey, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
-	defer ntKey.Close()
-
-	if err != nil {
-		return nil, err
-	}
-
-	pn, _, err := ntKey.GetStringValue("ProductName")
-	if err != nil {
-		return nil, err
-	}
-
-	bn, _, err := ntKey.GetStringValue("CurrentBuildNumber")
-	if err != nil {
-		return nil, err
-	}
-
-	var fsipf float64
-	for _, pagingFile := range pagingFiles {
-		fileString := strings.ReplaceAll(pagingFile, `\??\`, "")
-		file, err := os.Stat(fileString)
-		if err != nil {
-			return nil, err
-		}
-		fsipf += float64(file.Size())
-	}
-
-	gpi, err := psapi.GetPerformanceInfo()
-	if err != nil {
-		return nil, err
-	}
-
-	var pfc = make([]pagingFileCounter, 0)
-	if err := unmarshalObject(ctx.perfObjects["Paging File"], &pfc); err != nil {
-		return nil, err
-	}
-
-	// Get current page file usage.
-	var pfbRaw float64
-	for _, pageFile := range pfc {
-		if strings.Contains(strings.ToLower(pageFile.Name), "_total") {
-			continue
-		}
-		pfbRaw += pageFile.Usage
-	}
-
-	// Subtract from total page file allocation on disk.
-	pfb := fsipf - (pfbRaw * float64(gpi.PageSize))
-
 	ch <- prometheus.MustNewConstMetric(
 		c.OSInformation,
 		prometheus.GaugeValue,
 		1.0,
-		fmt.Sprintf("Microsoft %s", pn), // Caption
-		fmt.Sprintf("%d.%d.%s", nwgi.VersionMajor, nwgi.VersionMinor, bn), // Version
+		dst[0].Caption,
+		dst[0].Version,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PhysicalMemoryFreeBytes,
 		prometheus.GaugeValue,
-		float64(gmse.AvailPhys),
+		float64(dst[0].FreePhysicalMemory*1024), // KiB -> bytes
 	)
 
+	time := dst[0].LocalDateTime
+
 	ch <- prometheus.MustNewConstMetric(
 		c.Time,
 		prometheus.GaugeValue,
-		float64(currentTime.Unix()),
+		float64(time.Unix()),
 	)
 
+	timezoneName, _ := time.Zone()
+
 	ch <- prometheus.MustNewConstMetric(
 		c.Timezone,
 		prometheus.GaugeValue,
@@ -264,58 +191,55 @@ func (c *OSCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (
 	ch <- prometheus.MustNewConstMetric(
 		c.PagingFreeBytes,
 		prometheus.GaugeValue,
-		pfb,
+		float64(dst[0].FreeSpaceInPagingFiles*1024), // KiB -> bytes
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.VirtualMemoryFreeBytes,
 		prometheus.GaugeValue,
-		float64(gmse.AvailPageFile),
+		float64(dst[0].FreeVirtualMemory*1024), // KiB -> bytes
 	)
 
-	// Windows has no defined limit, and is based off available resources. This currently isn't calculated by WMI and is set to default value.
-	// https://techcommunity.microsoft.com/t5/windows-blog-archive/pushing-the-limits-of-windows-processes-and-threads/ba-p/723824
-	// https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/win32-operatingsystem
 	ch <- prometheus.MustNewConstMetric(
 		c.ProcessesLimit,
 		prometheus.GaugeValue,
-		float64(4294967295),
+		float64(dst[0].MaxNumberOfProcesses),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ProcessMemoryLimitBytes,
 		prometheus.GaugeValue,
-		float64(gmse.TotalVirtual),
+		float64(dst[0].MaxProcessMemorySize*1024), // KiB -> bytes
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.Processes,
 		prometheus.GaugeValue,
-		float64(gpi.ProcessCount),
+		float64(dst[0].NumberOfProcesses),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.Users,
 		prometheus.GaugeValue,
-		float64(nwgi.LoggedOnUsers),
+		float64(dst[0].NumberOfUsers),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PagingLimitBytes,
 		prometheus.GaugeValue,
-		fsipf,
+		float64(dst[0].SizeStoredInPagingFiles*1024), // KiB -> bytes
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.VirtualMemoryBytes,
 		prometheus.GaugeValue,
-		float64(gmse.TotalPageFile),
+		float64(dst[0].TotalVirtualMemorySize*1024), // KiB -> bytes
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.VisibleMemoryBytes,
 		prometheus.GaugeValue,
-		float64(gmse.TotalPhys),
+		float64(dst[0].TotalVisibleMemorySize*1024), // KiB -> bytes
 	)
 
 	return nil, nil

collector/os_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkOSCollector(b *testing.B) {
-	benchmarkCollector(b, "os", NewOSCollector)
-}

collector/perflib.go

@@ -7,7 +7,7 @@ import (
 
 	perflibCollector "github.com/leoluk/perflib_exporter/collector"
 	"github.com/leoluk/perflib_exporter/perflib"
-	"github.com/prometheus-community/windows_exporter/log"
+	"github.com/prometheus/common/log"
 )
 
 var nametable = perflib.QueryNameTable("Counter 009") // Reads the names in English TODO: validate that the English names are always present

collector/process.go

@@ -1,36 +1,30 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"fmt"
-	"regexp"
 	"strconv"
 	"strings"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func init() {
-	registerCollector("process", newProcessCollector, "Process")
+	registerCollector("process", NewProcessCollector)
 }
 
 var (
-	processWhitelist = kingpin.Flag(
-		"collector.process.whitelist",
-		"Regexp of processes to include. Process name must both match whitelist and not match blacklist to be included.",
-	).Default(".*").String()
-	processBlacklist = kingpin.Flag(
-		"collector.process.blacklist",
-		"Regexp of processes to exclude. Process name must both match whitelist and not match blacklist to be included.",
+	processWhereClause = kingpin.Flag(
+		"collector.process.processes-where",
+		"WQL 'where' clause to use in WMI metrics query. Limits the response to the processes you specify and reduces the size of the response.",
 	).Default("").String()
 )
 
-type processCollector struct {
+// A ProcessCollector is a Prometheus collector for WMI Win32_PerfRawData_PerfProc_Process metrics
+type ProcessCollector struct {
 	StartTime         *prometheus.Desc
 	CPUTimeTotal      *prometheus.Desc
 	HandleCount       *prometheus.Desc
@@ -43,23 +37,20 @@ type processCollector struct {
 	PrivateBytes      *prometheus.Desc
 	ThreadCount       *prometheus.Desc
 	VirtualBytes      *prometheus.Desc
-	WorkingSetPrivate *prometheus.Desc
-	WorkingSetPeak    *prometheus.Desc
 	WorkingSet        *prometheus.Desc
 
-	processWhitelistPattern *regexp.Regexp
-	processBlacklistPattern *regexp.Regexp
+	queryWhereClause string
 }
 
 // NewProcessCollector ...
-func newProcessCollector() (Collector, error) {
+func NewProcessCollector() (Collector, error) {
 	const subsystem = "process"
 
-	if *processWhitelist == ".*" && *processBlacklist == "" {
-		log.Warn("No filters specified for process collector. This will generate a very large number of metrics!")
+	if *processWhereClause == "" {
+		log.Warn("No where-clause specified for process collector. This will generate a very large number of metrics!")
 	}
 
-	return &processCollector{
+	return &ProcessCollector{
 		StartTime: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "start_time"),
 			"Time of process start.",
@@ -68,43 +59,43 @@ func newProcessCollector() (Collector, error) {
 		),
 		CPUTimeTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "cpu_time_total"),
-			"Returns elapsed time that all of the threads of this process used the processor to execute instructions by mode (privileged, user).",
+			"Returns elapsed time that all of the threads of this process used the processor to execute instructions by mode (privileged, user). An instruction is the basic unit of execution in a computer, a thread is the object that executes instructions, and a process is the object created when a program is run. Code executed to handle some hardware interrupts and trap conditions is included in this count.",
 			[]string{"process", "process_id", "creating_process_id", "mode"},
 			nil,
 		),
 		HandleCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "handles"),
+			prometheus.BuildFQName(Namespace, subsystem, "handle_count"),
 			"Total number of handles the process has open. This number is the sum of the handles currently open by each thread in the process.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
 		IOBytesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "io_bytes_total"),
-			"Bytes issued to I/O operations in different modes (read, write, other).",
+			"Bytes issued to I/O operations in different modes (read, write, other). This property counts all I/O activity generated by the process to include file, network, and device I/Os. Read and write mode includes data operations; other mode includes those that do not involve data, such as control operations. ",
 			[]string{"process", "process_id", "creating_process_id", "mode"},
 			nil,
 		),
 		IOOperationsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "io_operations_total"),
-			"I/O operations issued in different modes (read, write, other).",
+			"I/O operations issued in different modes (read, write, other). This property counts all I/O activity generated by the process to include file, network, and device I/Os. Read and write mode includes data operations; other mode includes those that do not involve data, such as control operations. ",
 			[]string{"process", "process_id", "creating_process_id", "mode"},
 			nil,
 		),
 		PageFaultsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "page_faults_total"),
-			"Page faults by the threads executing in this process.",
+			"Page faults by the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. This can cause the page not to be fetched from disk if it is on the standby list and hence already in main memory, or if it is in use by another process with which the page is shared.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
 		PageFileBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "page_file_bytes"),
-			"Current number of bytes this process has used in the paging file(s).",
+			"Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
 		PoolBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "pool_bytes"),
-			"Pool Bytes is the last observed number of bytes in the paged or nonpaged pool.",
+			"Pool Bytes is the last observed number of bytes in the paged or nonpaged pool. The nonpaged pool is an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. The paged pool is an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. Nonpaged pool bytes is calculated differently than paged pool bytes, so it might not equal the total of paged pool bytes.",
 			[]string{"process", "process_id", "creating_process_id", "pool"},
 			nil,
 		),
@@ -121,82 +112,83 @@ func newProcessCollector() (Collector, error) {
 			nil,
 		),
 		ThreadCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "threads"),
-			"Number of threads currently active in this process.",
+			prometheus.BuildFQName(Namespace, subsystem, "thread_count"),
+			"Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
 		VirtualBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "virtual_bytes"),
-			"Current size, in bytes, of the virtual address space that the process is using.",
-			[]string{"process", "process_id", "creating_process_id"},
-			nil,
-		),
-		WorkingSetPrivate: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "working_set_private_bytes"),
-			"Size of the working set, in bytes, that is use for this process only and not shared nor shareable by other processes.",
-			[]string{"process", "process_id", "creating_process_id"},
-			nil,
-		),
-		WorkingSetPeak: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "working_set_peak_bytes"),
-			"Maximum size, in bytes, of the Working Set of this process at any point in time. The Working Set is the set of memory pages touched recently by the threads in the process.",
+			"Current size, in bytes, of the virtual address space that the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
 		WorkingSet: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "working_set_bytes"),
-			"Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process.",
+			prometheus.BuildFQName(Namespace, subsystem, "working_set"),
+			"Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
-		processWhitelistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *processWhitelist)),
-		processBlacklistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *processBlacklist)),
+		queryWhereClause: *processWhereClause,
 	}, nil
 }
 
-type perflibProcess struct {
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *ProcessCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
+	if desc, err := c.collect(ch); err != nil {
+		log.Error("failed collecting process metrics:", desc, err)
+		return err
+	}
+	return nil
+}
+
+// Win32_PerfRawData_PerfProc_Process docs:
+// - https://msdn.microsoft.com/en-us/library/aa394323(v=vs.85).aspx
+type Win32_PerfRawData_PerfProc_Process struct {
 	Name                    string
-	PercentProcessorTime    float64 `perflib:"% Processor Time"`
-	PercentPrivilegedTime   float64 `perflib:"% Privileged Time"`
-	PercentUserTime         float64 `perflib:"% User Time"`
-	CreatingProcessID       float64 `perflib:"Creating Process ID"`
-	ElapsedTime             float64 `perflib:"Elapsed Time"`
-	HandleCount             float64 `perflib:"Handle Count"`
-	IDProcess               float64 `perflib:"ID Process"`
-	IODataBytesPerSec       float64 `perflib:"IO Data Bytes/sec"`
-	IODataOperationsPerSec  float64 `perflib:"IO Data Operations/sec"`
-	IOOtherBytesPerSec      float64 `perflib:"IO Other Bytes/sec"`
-	IOOtherOperationsPerSec float64 `perflib:"IO Other Operations/sec"`
-	IOReadBytesPerSec       float64 `perflib:"IO Read Bytes/sec"`
-	IOReadOperationsPerSec  float64 `perflib:"IO Read Operations/sec"`
-	IOWriteBytesPerSec      float64 `perflib:"IO Write Bytes/sec"`
-	IOWriteOperationsPerSec float64 `perflib:"IO Write Operations/sec"`
-	PageFaultsPerSec        float64 `perflib:"Page Faults/sec"`
-	PageFileBytesPeak       float64 `perflib:"Page File Bytes Peak"`
-	PageFileBytes           float64 `perflib:"Page File Bytes"`
-	PoolNonpagedBytes       float64 `perflib:"Pool Nonpaged Bytes"`
-	PoolPagedBytes          float64 `perflib:"Pool Paged Bytes"`
-	PriorityBase            float64 `perflib:"Priority Base"`
-	PrivateBytes            float64 `perflib:"Private Bytes"`
-	ThreadCount             float64 `perflib:"Thread Count"`
-	VirtualBytesPeak        float64 `perflib:"Virtual Bytes Peak"`
-	VirtualBytes            float64 `perflib:"Virtual Bytes"`
-	WorkingSetPrivate       float64 `perflib:"Working Set - Private"`
-	WorkingSetPeak          float64 `perflib:"Working Set Peak"`
-	WorkingSet              float64 `perflib:"Working Set"`
+	CreatingProcessID       uint32
+	ElapsedTime             uint64
+	Frequency_Object        uint64
+	HandleCount             uint32
+	IDProcess               uint32
+	IODataBytesPersec       uint64
+	IODataOperationsPersec  uint64
+	IOOtherBytesPersec      uint64
+	IOOtherOperationsPersec uint64
+	IOReadBytesPersec       uint64
+	IOReadOperationsPersec  uint64
+	IOWriteBytesPersec      uint64
+	IOWriteOperationsPersec uint64
+	PageFaultsPersec        uint32
+	PageFileBytes           uint64
+	PageFileBytesPeak       uint64
+	PercentPrivilegedTime   uint64
+	PercentProcessorTime    uint64
+	PercentUserTime         uint64
+	PoolNonpagedBytes       uint32
+	PoolPagedBytes          uint32
+	PriorityBase            uint32
+	PrivateBytes            uint64
+	ThreadCount             uint32
+	Timestamp_Object        uint64
+	VirtualBytes            uint64
+	VirtualBytesPeak        uint64
+	WorkingSet              uint64
+	WorkingSetPeak          uint64
+	WorkingSetPrivate       uint64
 }
 
 type WorkerProcess struct {
 	AppPoolName string
-	ProcessId   uint64
+	ProcessId   uint32
 }
 
-func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	data := make([]perflibProcess, 0)
-	err := unmarshalObject(ctx.perfObjects["Process"], &data)
-	if err != nil {
-		return err
+func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_PerfRawData_PerfProc_Process
+	q := queryAllWhere(&dst, c.queryWhereClause)
+	if err := wmi.Query(q, &dst); err != nil {
+		return nil, err
 	}
 
 	var dst_wp []WorkerProcess
@@ -205,10 +197,9 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		log.Debugf("Could not query WebAdministration namespace for IIS worker processes: %v. Skipping", err)
 	}
 
-	for _, process := range data {
-		if process.Name == "_Total" ||
-			c.processBlacklistPattern.MatchString(process.Name) ||
-			!c.processWhitelistPattern.MatchString(process.Name) {
+	for _, process := range dst {
+
+		if process.Name == "_Total" {
 			continue
 		}
 		// Duplicate processes are suffixed # and an index number. Remove those.
@@ -217,7 +208,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		cpid := strconv.FormatUint(uint64(process.CreatingProcessID), 10)
 
 		for _, wp := range dst_wp {
-			if wp.ProcessId == uint64(process.IDProcess) {
+			if wp.ProcessId == process.IDProcess {
 				processName = strings.Join([]string{processName, wp.AppPoolName}, "_")
 				break
 			}
@@ -226,7 +217,8 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.StartTime,
 			prometheus.GaugeValue,
-			process.ElapsedTime,
+			// convert from Windows timestamp (1 jan 1601) to unix timestamp (1 jan 1970)
+			float64(process.ElapsedTime-116444736000000000)/float64(process.Frequency_Object),
 			processName,
 			pid,
 			cpid,
@@ -235,7 +227,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.HandleCount,
 			prometheus.GaugeValue,
-			process.HandleCount,
+			float64(process.HandleCount),
 			processName,
 			pid,
 			cpid,
@@ -244,7 +236,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.CPUTimeTotal,
 			prometheus.CounterValue,
-			process.PercentPrivilegedTime,
+			float64(process.PercentPrivilegedTime)*ticksToSecondsScaleFactor,
 			processName,
 			pid,
 			cpid,
@@ -254,7 +246,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.CPUTimeTotal,
 			prometheus.CounterValue,
-			process.PercentUserTime,
+			float64(process.PercentUserTime)*ticksToSecondsScaleFactor,
 			processName,
 			pid,
 			cpid,
@@ -264,7 +256,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.IOBytesTotal,
 			prometheus.CounterValue,
-			process.IOOtherBytesPerSec,
+			float64(process.IOOtherBytesPersec),
 			processName,
 			pid,
 			cpid,
@@ -274,7 +266,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.IOOperationsTotal,
 			prometheus.CounterValue,
-			process.IOOtherOperationsPerSec,
+			float64(process.IOOtherOperationsPersec),
 			processName,
 			pid,
 			cpid,
@@ -284,7 +276,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.IOBytesTotal,
 			prometheus.CounterValue,
-			process.IOReadBytesPerSec,
+			float64(process.IOReadBytesPersec),
 			processName,
 			pid,
 			cpid,
@@ -294,7 +286,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.IOOperationsTotal,
 			prometheus.CounterValue,
-			process.IOReadOperationsPerSec,
+			float64(process.IOReadOperationsPersec),
 			processName,
 			pid,
 			cpid,
@@ -304,7 +296,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.IOBytesTotal,
 			prometheus.CounterValue,
-			process.IOWriteBytesPerSec,
+			float64(process.IOWriteBytesPersec),
 			processName,
 			pid,
 			cpid,
@@ -314,7 +306,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.IOOperationsTotal,
 			prometheus.CounterValue,
-			process.IOWriteOperationsPerSec,
+			float64(process.IOWriteOperationsPersec),
 			processName,
 			pid,
 			cpid,
@@ -324,7 +316,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.PageFaultsTotal,
 			prometheus.CounterValue,
-			process.PageFaultsPerSec,
+			float64(process.PageFaultsPersec),
 			processName,
 			pid,
 			cpid,
@@ -333,7 +325,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.PageFileBytes,
 			prometheus.GaugeValue,
-			process.PageFileBytes,
+			float64(process.PageFileBytes),
 			processName,
 			pid,
 			cpid,
@@ -342,7 +334,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.PoolBytes,
 			prometheus.GaugeValue,
-			process.PoolNonpagedBytes,
+			float64(process.PoolNonpagedBytes),
 			processName,
 			pid,
 			cpid,
@@ -352,7 +344,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.PoolBytes,
 			prometheus.GaugeValue,
-			process.PoolPagedBytes,
+			float64(process.PoolPagedBytes),
 			processName,
 			pid,
 			cpid,
@@ -362,7 +354,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.PriorityBase,
 			prometheus.GaugeValue,
-			process.PriorityBase,
+			float64(process.PriorityBase),
 			processName,
 			pid,
 			cpid,
@@ -371,7 +363,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.PrivateBytes,
 			prometheus.GaugeValue,
-			process.PrivateBytes,
+			float64(process.PrivateBytes),
 			processName,
 			pid,
 			cpid,
@@ -380,7 +372,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.ThreadCount,
 			prometheus.GaugeValue,
-			process.ThreadCount,
+			float64(process.ThreadCount),
 			processName,
 			pid,
 			cpid,
@@ -389,25 +381,7 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.VirtualBytes,
 			prometheus.GaugeValue,
-			process.VirtualBytes,
-			processName,
-			pid,
-			cpid,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.WorkingSetPrivate,
-			prometheus.GaugeValue,
-			process.WorkingSetPrivate,
-			processName,
-			pid,
-			cpid,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.WorkingSetPeak,
-			prometheus.GaugeValue,
-			process.WorkingSetPeak,
+			float64(process.VirtualBytes),
 			processName,
 			pid,
 			cpid,
@@ -416,12 +390,12 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.WorkingSet,
 			prometheus.GaugeValue,
-			process.WorkingSet,
+			float64(process.WorkingSet),
 			processName,
 			pid,
 			cpid,
 		)
 	}
 
-	return nil
+	return nil, nil
 }

collector/process_test.go

@@ -1,14 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkProcessCollector(b *testing.B) {
-	// Whitelist is not set in testing context (kingpin flags not parsed), causing the collector to skip all processes.
-	localProcessWhitelist := ".+"
-	processWhitelist = &localProcessWhitelist
-
-	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", newProcessCollector)
-}

collector/remote_fx.go

@@ -1,348 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"strings"
-
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-func init() {
-	registerCollector("remote_fx", NewRemoteFx, "RemoteFX Network", "RemoteFX Graphics")
-}
-
-// A RemoteFxNetworkCollector is a Prometheus collector for
-// WMI Win32_PerfRawData_Counters_RemoteFXNetwork & Win32_PerfRawData_Counters_RemoteFXGraphics metrics
-// https://wutils.com/wmi/root/cimv2/win32_perfrawdata_counters_remotefxnetwork/
-// https://wutils.com/wmi/root/cimv2/win32_perfrawdata_counters_remotefxgraphics/
-
-type RemoteFxCollector struct {
-	// net
-	BaseTCPRTT               *prometheus.Desc
-	BaseUDPRTT               *prometheus.Desc
-	CurrentTCPBandwidth      *prometheus.Desc
-	CurrentTCPRTT            *prometheus.Desc
-	CurrentUDPBandwidth      *prometheus.Desc
-	CurrentUDPRTT            *prometheus.Desc
-	TotalReceivedBytes       *prometheus.Desc
-	TotalSentBytes           *prometheus.Desc
-	UDPPacketsReceivedPersec *prometheus.Desc
-	UDPPacketsSentPersec     *prometheus.Desc
-
-	//gfx
-	AverageEncodingTime                         *prometheus.Desc
-	FrameQuality                                *prometheus.Desc
-	FramesSkippedPerSecondInsufficientResources *prometheus.Desc
-	GraphicsCompressionratio                    *prometheus.Desc
-	InputFramesPerSecond                        *prometheus.Desc
-	OutputFramesPerSecond                       *prometheus.Desc
-	SourceFramesPerSecond                       *prometheus.Desc
-}
-
-// NewRemoteFx ...
-func NewRemoteFx() (Collector, error) {
-	const subsystem = "remote_fx"
-	return &RemoteFxCollector{
-		// net
-		BaseTCPRTT: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_base_tcp_rtt_seconds"),
-			"Base TCP round-trip time (RTT) detected in seconds",
-			[]string{"session_name"},
-			nil,
-		),
-		BaseUDPRTT: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_base_udp_rtt_seconds"),
-			"Base UDP round-trip time (RTT) detected in seconds.",
-			[]string{"session_name"},
-			nil,
-		),
-		CurrentTCPBandwidth: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_current_tcp_bandwidth"),
-			"TCP Bandwidth detected in bytes per second.",
-			[]string{"session_name"},
-			nil,
-		),
-		CurrentTCPRTT: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_current_tcp_rtt_seconds"),
-			"Average TCP round-trip time (RTT) detected in seconds.",
-			[]string{"session_name"},
-			nil,
-		),
-		CurrentUDPBandwidth: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_current_udp_bandwidth"),
-			"UDP Bandwidth detected in bytes per second.",
-			[]string{"session_name"},
-			nil,
-		),
-		CurrentUDPRTT: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_current_udp_rtt_seconds"),
-			"Average UDP round-trip time (RTT) detected in seconds.",
-			[]string{"session_name"},
-			nil,
-		),
-		TotalReceivedBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_received_bytes_total"),
-			"(TotalReceivedBytes)",
-			[]string{"session_name"},
-			nil,
-		),
-		TotalSentBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_sent_bytes_total"),
-			"(TotalSentBytes)",
-			[]string{"session_name"},
-			nil,
-		),
-		UDPPacketsReceivedPersec: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_udp_packets_received_total"),
-			"Rate in packets per second at which packets are received over UDP.",
-			[]string{"session_name"},
-			nil,
-		),
-		UDPPacketsSentPersec: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "net_udp_packets_sent_total"),
-			"Rate in packets per second at which packets are sent over UDP.",
-			[]string{"session_name"},
-			nil,
-		),
-
-		//gfx
-		AverageEncodingTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "gfx_average_encoding_time_seconds"),
-			"Average frame encoding time in seconds",
-			[]string{"session_name"},
-			nil,
-		),
-		FrameQuality: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "gfx_frame_quality"),
-			"Quality of the output frame expressed as a percentage of the quality of the source frame.",
-			[]string{"session_name"},
-			nil,
-		),
-		FramesSkippedPerSecondInsufficientResources: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "gfx_frames_skipped_insufficient_resource_total"),
-			"Number of frames skipped per second due to insufficient client resources.",
-			[]string{"session_name", "resource"},
-			nil,
-		),
-		GraphicsCompressionratio: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "gfx_graphics_compression_ratio"),
-			"Ratio of the number of bytes encoded to the number of bytes input.",
-			[]string{"session_name"},
-			nil,
-		),
-		InputFramesPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "gfx_input_frames_total"),
-			"Number of sources frames provided as input to RemoteFX graphics per second.",
-			[]string{"session_name"},
-			nil,
-		),
-		OutputFramesPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "gfx_output_frames_total"),
-			"Number of frames sent to the client per second.",
-			[]string{"session_name"},
-			nil,
-		),
-		SourceFramesPerSecond: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "gfx_source_frames_total"),
-			"Number of frames composed by the source (DWM) per second.",
-			[]string{"session_name"},
-			nil,
-		),
-	}, nil
-}
-
-// Collect sends the metric values for each metric
-// to the provided prometheus Metric channel.
-func (c *RemoteFxCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collectRemoteFXNetworkCount(ctx, ch); err != nil {
-		log.Error("failed collecting terminal services session count metrics:", desc, err)
-		return err
-	}
-	if desc, err := c.collectRemoteFXGraphicsCounters(ctx, ch); err != nil {
-		log.Error("failed collecting terminal services session count metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-type perflibRemoteFxNetwork struct {
-	Name                     string
-	BaseTCPRTT               float64 `perflib:"Base TCP RTT"`
-	BaseUDPRTT               float64 `perflib:"Base UDP RTT"`
-	CurrentTCPBandwidth      float64 `perflib:"Current TCP Bandwidth"`
-	CurrentTCPRTT            float64 `perflib:"Current TCP RTT"`
-	CurrentUDPBandwidth      float64 `perflib:"Current UDP Bandwidth"`
-	CurrentUDPRTT            float64 `perflib:"Current UDP RTT"`
-	TotalReceivedBytes       float64 `perflib:"Total Received Bytes"`
-	TotalSentBytes           float64 `perflib:"Total Sent Bytes"`
-	UDPPacketsReceivedPersec float64 `perflib:"UDP Packets Received/sec"`
-	UDPPacketsSentPersec     float64 `perflib:"UDP Packets Sent/sec"`
-}
-
-func (c *RemoteFxCollector) collectRemoteFXNetworkCount(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	dst := make([]perflibRemoteFxNetwork, 0)
-	err := unmarshalObject(ctx.perfObjects["RemoteFX Network"], &dst)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, d := range dst {
-		// only connect metrics for remote named sessions
-		n := strings.ToLower(d.Name)
-		if n == "" || n == "services" || n == "console" {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.BaseTCPRTT,
-			prometheus.GaugeValue,
-			milliSecToSec(d.BaseTCPRTT),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.BaseUDPRTT,
-			prometheus.GaugeValue,
-			milliSecToSec(d.BaseUDPRTT),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.CurrentTCPBandwidth,
-			prometheus.GaugeValue,
-			(d.CurrentTCPBandwidth*1000)/8,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.CurrentTCPRTT,
-			prometheus.GaugeValue,
-			milliSecToSec(d.CurrentTCPRTT),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.CurrentUDPBandwidth,
-			prometheus.GaugeValue,
-			(d.CurrentUDPBandwidth*1000)/8,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.CurrentUDPRTT,
-			prometheus.GaugeValue,
-			milliSecToSec(d.CurrentUDPRTT),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.TotalReceivedBytes,
-			prometheus.CounterValue,
-			d.TotalReceivedBytes,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.TotalSentBytes,
-			prometheus.CounterValue,
-			d.TotalSentBytes,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.UDPPacketsReceivedPersec,
-			prometheus.CounterValue,
-			d.UDPPacketsReceivedPersec,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.UDPPacketsSentPersec,
-			prometheus.CounterValue,
-			d.UDPPacketsSentPersec,
-			d.Name,
-		)
-	}
-	return nil, nil
-}
-
-type perflibRemoteFxGraphics struct {
-	Name                                               string
-	AverageEncodingTime                                float64 `perflib:"Average Encoding Time"`
-	FrameQuality                                       float64 `perflib:"Frame Quality"`
-	FramesSkippedPerSecondInsufficientClientResources  float64 `perflib:"Frames Skipped/Second - Insufficient Server Resources"`
-	FramesSkippedPerSecondInsufficientNetworkResources float64 `perflib:"Frames Skipped/Second - Insufficient Network Resources"`
-	FramesSkippedPerSecondInsufficientServerResources  float64 `perflib:"Frames Skipped/Second - Insufficient Client Resources"`
-	GraphicsCompressionratio                           float64 `perflib:"Graphics Compression ratio"`
-	InputFramesPerSecond                               float64 `perflib:"Input Frames/Second"`
-	OutputFramesPerSecond                              float64 `perflib:"Output Frames/Second"`
-	SourceFramesPerSecond                              float64 `perflib:"Source Frames/Second"`
-}
-
-func (c *RemoteFxCollector) collectRemoteFXGraphicsCounters(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	dst := make([]perflibRemoteFxGraphics, 0)
-	err := unmarshalObject(ctx.perfObjects["RemoteFX Graphics"], &dst)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, d := range dst {
-		// only connect metrics for remote named sessions
-		n := strings.ToLower(d.Name)
-		if n == "" || n == "services" || n == "console" {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.AverageEncodingTime,
-			prometheus.GaugeValue,
-			milliSecToSec(d.AverageEncodingTime),
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.FrameQuality,
-			prometheus.GaugeValue,
-			d.FrameQuality,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.FramesSkippedPerSecondInsufficientResources,
-			prometheus.CounterValue,
-			d.FramesSkippedPerSecondInsufficientClientResources,
-			d.Name,
-			"client",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.FramesSkippedPerSecondInsufficientResources,
-			prometheus.CounterValue,
-			d.FramesSkippedPerSecondInsufficientNetworkResources,
-			d.Name,
-			"network",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.FramesSkippedPerSecondInsufficientResources,
-			prometheus.CounterValue,
-			d.FramesSkippedPerSecondInsufficientServerResources,
-			d.Name,
-			"server",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.GraphicsCompressionratio,
-			prometheus.GaugeValue,
-			d.GraphicsCompressionratio,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.InputFramesPerSecond,
-			prometheus.CounterValue,
-			d.InputFramesPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.OutputFramesPerSecond,
-			prometheus.CounterValue,
-			d.OutputFramesPerSecond,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.SourceFramesPerSecond,
-			prometheus.CounterValue,
-			d.SourceFramesPerSecond,
-			d.Name,
-		)
-	}
-
-	return nil, nil
-}

collector/remote_fx_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkRemoteFXCollector(b *testing.B) {
-	benchmarkCollector(b, "remote_fx", NewRemoteFx)
-}

collector/service.go

@@ -1,17 +1,13 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/sys/windows"
-	"golang.org/x/sys/windows/svc/mgr"
+	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -24,18 +20,13 @@ var (
 		"collector.service.services-where",
 		"WQL 'where' clause to use in WMI metrics query. Limits the response to the services you specify and reduces the size of the response.",
 	).Default("").String()
-	useAPI = kingpin.Flag(
-		"collector.service.use-api",
-		"Use API calls to collect service data instead of WMI. Flag 'collector.service.services-where' won't be effective.",
-	).Default("false").Bool()
 )
 
 // A serviceCollector is a Prometheus collector for WMI Win32_Service metrics
 type serviceCollector struct {
-	Information *prometheus.Desc
-	State       *prometheus.Desc
-	StartMode   *prometheus.Desc
-	Status      *prometheus.Desc
+	State     *prometheus.Desc
+	StartMode *prometheus.Desc
+	Status    *prometheus.Desc
 
 	queryWhereClause string
 }
@@ -47,17 +38,8 @@ func NewserviceCollector() (Collector, error) {
 	if *serviceWhereClause == "" {
 		log.Warn("No where-clause specified for service collector. This will generate a very large number of metrics!")
 	}
-	if *useAPI {
-		log.Warn("API collection is enabled.")
-	}
 
 	return &serviceCollector{
-		Information: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "info"),
-			"A metric with a constant '1' value labeled with service information",
-			[]string{"name", "display_name", "process_id", "run_as"},
-			nil,
-		),
 		State: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "state"),
 			"The state of the service (State)",
@@ -83,16 +65,9 @@ func NewserviceCollector() (Collector, error) {
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *serviceCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if *useAPI {
-		if err := c.collectAPI(ch); err != nil {
-			log.Error("failed collecting API service metrics:", err)
-			return err
-		}
-	} else {
-		if err := c.collectWMI(ch); err != nil {
-			log.Error("failed collecting WMI service metrics:", err)
-			return err
-		}
+	if desc, err := c.collect(ch); err != nil {
+		log.Error("failed collecting service metrics:", desc, err)
+		return err
 	}
 	return nil
 }
@@ -100,13 +75,10 @@ func (c *serviceCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 // Win32_Service docs:
 // - https://msdn.microsoft.com/en-us/library/aa394418(v=vs.85).aspx
 type Win32_Service struct {
-	DisplayName string
-	Name        string
-	ProcessId   uint32
-	State       string
-	Status      string
-	StartMode   string
-	StartName   *string
+	Name      string
+	State     string
+	Status    string
+	StartMode string
 }
 
 var (
@@ -120,15 +92,6 @@ var (
 		"paused",
 		"unknown",
 	}
-	apiStateValues = map[uint]string{
-		windows.SERVICE_CONTINUE_PENDING: "continue pending",
-		windows.SERVICE_PAUSE_PENDING:    "pause pending",
-		windows.SERVICE_PAUSED:           "paused",
-		windows.SERVICE_RUNNING:          "running",
-		windows.SERVICE_START_PENDING:    "start pending",
-		windows.SERVICE_STOP_PENDING:     "stop pending",
-		windows.SERVICE_STOPPED:          "stopped",
-	}
 	allStartModes = []string{
 		"boot",
 		"system",
@@ -136,13 +99,6 @@ var (
 		"manual",
 		"disabled",
 	}
-	apiStartModeValues = map[uint32]string{
-		windows.SERVICE_AUTO_START:   "auto",
-		windows.SERVICE_BOOT_START:   "boot",
-		windows.SERVICE_DEMAND_START: "manual",
-		windows.SERVICE_DISABLED:     "disabled",
-		windows.SERVICE_SYSTEM_START: "system",
-	}
 	allStatuses = []string{
 		"ok",
 		"error",
@@ -159,29 +115,14 @@ var (
 	}
 )
 
-func (c *serviceCollector) collectWMI(ch chan<- prometheus.Metric) error {
+func (c *serviceCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
 	var dst []Win32_Service
 	q := queryAllWhere(&dst, c.queryWhereClause)
 	if err := wmi.Query(q, &dst); err != nil {
-		return err
+		return nil, err
 	}
+
 	for _, service := range dst {
-		pid := fmt.Sprintf("%d", uint64(service.ProcessId))
-
-		runAs := ""
-		if service.StartName != nil {
-			runAs = *service.StartName
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.Information,
-			prometheus.GaugeValue,
-			1.0,
-			strings.ToLower(service.Name),
-			service.DisplayName,
-			pid,
-			runAs,
-		)
-
 		for _, state := range allStates {
 			isCurrentState := 0.0
 			if state == strings.ToLower(service.State) {
@@ -224,82 +165,5 @@ func (c *serviceCollector) collectWMI(ch chan<- prometheus.Metric) error {
 			)
 		}
 	}
-	return nil
-}
-
-func (c *serviceCollector) collectAPI(ch chan<- prometheus.Metric) error {
-	svcmgrConnection, err := mgr.Connect()
-	if err != nil {
-		return err
-	}
-	defer svcmgrConnection.Disconnect() //nolint:errcheck
-
-	// List All Services from the Services Manager
-	serviceList, err := svcmgrConnection.ListServices()
-	if err != nil {
-		return err
-	}
-
-	// Iterate through the Services List
-	for _, service := range serviceList {
-		// Retrieve handle for each service
-		serviceHandle, err := svcmgrConnection.OpenService(service)
-		if err != nil {
-			continue
-		}
-		defer serviceHandle.Close()
-
-		// Get Service Configuration
-		serviceConfig, err := serviceHandle.Config()
-		if err != nil {
-			continue
-		}
-
-		// Get Service Current Status
-		serviceStatus, err := serviceHandle.Query()
-		if err != nil {
-			continue
-		}
-
-		pid := fmt.Sprintf("%d", uint64(serviceStatus.ProcessId))
-
-		ch <- prometheus.MustNewConstMetric(
-			c.Information,
-			prometheus.GaugeValue,
-			1.0,
-			strings.ToLower(service),
-			serviceConfig.DisplayName,
-			pid,
-			serviceConfig.ServiceStartName,
-		)
-
-		for _, state := range apiStateValues {
-			isCurrentState := 0.0
-			if state == apiStateValues[uint(serviceStatus.State)] {
-				isCurrentState = 1.0
-			}
-			ch <- prometheus.MustNewConstMetric(
-				c.State,
-				prometheus.GaugeValue,
-				isCurrentState,
-				strings.ToLower(service),
-				state,
-			)
-		}
-
-		for _, startMode := range apiStartModeValues {
-			isCurrentStartMode := 0.0
-			if startMode == apiStartModeValues[serviceConfig.StartType] {
-				isCurrentStartMode = 1.0
-			}
-			ch <- prometheus.MustNewConstMetric(
-				c.StartMode,
-				prometheus.GaugeValue,
-				isCurrentStartMode,
-				strings.ToLower(service),
-				startMode,
-			)
-		}
-	}
-	return nil
+	return nil, nil
 }

collector/service_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkServiceCollector(b *testing.B) {
-	benchmarkCollector(b, "service", NewserviceCollector)
-}

collector/smtp.go

@@ -1,694 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"fmt"
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-	"gopkg.in/alecthomas/kingpin.v2"
-	"regexp"
-)
-
-func init() {
-	registerCollector("smtp", NewSMTPCollector, "SMTP Server")
-}
-
-var (
-	serverWhitelist = kingpin.Flag("collector.smtp.server-whitelist", "Regexp of virtual servers to whitelist. Server name must both match whitelist and not match blacklist to be included.").Default(".+").String()
-	serverBlacklist = kingpin.Flag("collector.smtp.server-blacklist", "Regexp of virtual servers to blacklist. Server name must both match whitelist and not match blacklist to be included.").String()
-)
-
-type SMTPCollector struct {
-	BadmailedMessagesBadPickupFileTotal     *prometheus.Desc
-	BadmailedMessagesGeneralFailureTotal    *prometheus.Desc
-	BadmailedMessagesHopCountExceededTotal  *prometheus.Desc
-	BadmailedMessagesNDROfDSNTotal          *prometheus.Desc
-	BadmailedMessagesNoRecipientsTotal      *prometheus.Desc
-	BadmailedMessagesTriggeredViaEventTotal *prometheus.Desc
-	BytesSentTotal                          *prometheus.Desc
-	BytesReceivedTotal                      *prometheus.Desc
-	CategorizerQueueLength                  *prometheus.Desc
-	ConnectionErrorsTotal                   *prometheus.Desc
-	CurrentMessagesInLocalDelivery          *prometheus.Desc
-	DirectoryDropsTotal                     *prometheus.Desc
-	DNSQueriesTotal                         *prometheus.Desc
-	DSNFailuresTotal                        *prometheus.Desc
-	ETRNMessagesTotal                       *prometheus.Desc
-	InboundConnectionsCurrent               *prometheus.Desc
-	InboundConnectionsTotal                 *prometheus.Desc
-	LocalQueueLength                        *prometheus.Desc
-	LocalRetryQueueLength                   *prometheus.Desc
-	MailFilesOpen                           *prometheus.Desc
-	MessageBytesReceivedTotal               *prometheus.Desc
-	MessageBytesSentTotal                   *prometheus.Desc
-	MessageDeliveryRetriesTotal             *prometheus.Desc
-	MessageSendRetriesTotal                 *prometheus.Desc
-	MessagesCurrentlyUndeliverable          *prometheus.Desc
-	MessagesDeliveredTotal                  *prometheus.Desc
-	MessagesPendingRouting                  *prometheus.Desc
-	MessagesReceivedTotal                   *prometheus.Desc
-	MessagesRefusedForAddressObjectsTotal   *prometheus.Desc
-	MessagesRefusedForMailObjectsTotal      *prometheus.Desc
-	MessagesRefusedForSizeTotal             *prometheus.Desc
-	MessagesSentTotal                       *prometheus.Desc
-	MessagesSubmittedTotal                  *prometheus.Desc
-	NDRsGeneratedTotal                      *prometheus.Desc
-	OutboundConnectionsCurrent              *prometheus.Desc
-	OutboundConnectionsRefusedTotal         *prometheus.Desc
-	OutboundConnectionsTotal                *prometheus.Desc
-	QueueFilesOpen                          *prometheus.Desc
-	PickupDirectoryMessagesRetrievedTotal   *prometheus.Desc
-	RemoteQueueLength                       *prometheus.Desc
-	RemoteRetryQueueLength                  *prometheus.Desc
-	RoutingTableLookupsTotal                *prometheus.Desc
-
-	serverWhitelistPattern *regexp.Regexp
-	serverBlacklistPattern *regexp.Regexp
-}
-
-func NewSMTPCollector() (Collector, error) {
-	log.Info("smtp collector is in an experimental state! Metrics for this collector have not been tested.")
-	const subsystem = "smtp"
-
-	return &SMTPCollector{
-		BadmailedMessagesBadPickupFileTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "badmailed_messages_bad_pickup_file_total"),
-			"Total number of malformed pickup messages sent to badmail",
-			[]string{"site"},
-			nil,
-		),
-		BadmailedMessagesGeneralFailureTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "badmailed_messages_general_failure_total"),
-			"Total number of messages sent to badmail for reasons not associated with a specific counter",
-			[]string{"site"},
-			nil,
-		),
-		BadmailedMessagesHopCountExceededTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "badmailed_messages_hop_count_exceeded_total"),
-			"Total number of messages sent to badmail because they had exceeded the maximum hop count",
-			[]string{"site"},
-			nil,
-		),
-		BadmailedMessagesNDROfDSNTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "badmailed_messages_ndr_of_dns_total"),
-			"Total number of Delivery Status Notifications sent to badmail because they could not be delivered",
-			[]string{"site"},
-			nil,
-		),
-		BadmailedMessagesNoRecipientsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "badmailed_messages_no_recipients_total"),
-			"Total number of messages sent to badmail because they had no recipients",
-			[]string{"site"},
-			nil,
-		),
-		BadmailedMessagesTriggeredViaEventTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "badmailed_messages_triggered_via_event_total"),
-			"Total number of messages sent to badmail at the request of a server event sink",
-			[]string{"site"},
-			nil,
-		),
-		BytesSentTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "bytes_sent_total"),
-			"Total number of bytes sent",
-			[]string{"site"},
-			nil,
-		),
-		BytesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "bytes_received_total"),
-			"Total number of bytes received",
-			[]string{"site"},
-			nil,
-		),
-		CategorizerQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "categorizer_queue_length"),
-			"Number of messages in the categorizer queue",
-			[]string{"site"},
-			nil,
-		),
-		ConnectionErrorsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_errors_total"),
-			"Total number of connection errors",
-			[]string{"site"},
-			nil,
-		),
-		CurrentMessagesInLocalDelivery: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "current_messages_in_local_delivery"),
-			"Number of messages that are currently being processed by a server event sink for local delivery",
-			[]string{"site"},
-			nil,
-		),
-		DirectoryDropsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "directory_drops_total"),
-			"Total number of messages placed in a drop directory",
-			[]string{"site"},
-			nil,
-		),
-		DSNFailuresTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "dsn_failures_total"),
-			"Total number of failed DSN generation attempts",
-			[]string{"site"},
-			nil,
-		),
-		DNSQueriesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "dns_queries_total"),
-			"Total number of DNS lookups",
-			[]string{"site"},
-			nil,
-		),
-		ETRNMessagesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "etrn_messages_total"),
-			"Total number of ETRN messages received by the server",
-			[]string{"site"},
-			nil,
-		),
-		InboundConnectionsCurrent: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "inbound_connections_current"),
-			"Total number of connections currently inbound",
-			[]string{"site"},
-			nil,
-		),
-		InboundConnectionsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "inbound_connections_total"),
-			"Total number of inbound connections received",
-			[]string{"site"},
-			nil,
-		),
-		LocalQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "local_queue_length"),
-			"Number of messages in the local queue",
-			[]string{"site"},
-			nil,
-		),
-		LocalRetryQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "local_retry_queue_length"),
-			"Number of messages in the local retry queue",
-			[]string{"site"},
-			nil,
-		),
-		MailFilesOpen: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "mail_files_open"),
-			"Number of handles to open mail files",
-			[]string{"site"},
-			nil,
-		),
-		MessageBytesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "message_bytes_received_total"),
-			"Total number of bytes received in messages",
-			[]string{"site"},
-			nil,
-		),
-		MessageBytesSentTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "message_bytes_sent_total"),
-			"Total number of bytes sent in messages",
-			[]string{"site"},
-			nil,
-		),
-		MessageDeliveryRetriesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "message_delivery_retries_total"),
-			"Total number of local deliveries that were retried",
-			[]string{"site"},
-			nil,
-		),
-		MessageSendRetriesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "message_send_retries_total"),
-			"Total number of outbound message sends that were retried",
-			[]string{"site"},
-			nil,
-		),
-		MessagesCurrentlyUndeliverable: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_currently_undeliverable"),
-			"Number of messages that have been reported as currently undeliverable by routing",
-			[]string{"site"},
-			nil,
-		),
-		MessagesDeliveredTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_delivered_total"),
-			"Total number of messages delivered to local mailboxes",
-			[]string{"site"},
-			nil,
-		),
-		MessagesPendingRouting: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_pending_routing"),
-			"Number of messages that have been categorized but not routed",
-			[]string{"site"},
-			nil,
-		),
-		MessagesReceivedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_received_total"),
-			"Total number of inbound messages accepted",
-			[]string{"site"},
-			nil,
-		),
-		MessagesRefusedForAddressObjectsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_refused_for_address_objects_total"),
-			"Total number of messages refused due to no address objects",
-			[]string{"site"},
-			nil,
-		),
-		MessagesRefusedForMailObjectsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_refused_for_mail_objects_total"),
-			"Total number of messages refused due to no mail objects",
-			[]string{"site"},
-			nil,
-		),
-		MessagesRefusedForSizeTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_refused_for_size_total"),
-			"Total number of messages rejected because they were too big",
-			[]string{"site"},
-			nil,
-		),
-		MessagesSentTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_sent_total"),
-			"Total number of outbound messages sent",
-			[]string{"site"},
-			nil,
-		),
-		MessagesSubmittedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "messages_submitted_total"),
-			"Total number of messages submitted to queuing for delivery",
-			[]string{"site"},
-			nil,
-		),
-		NDRsGeneratedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ndrs_generated_total"),
-			"Total number of non-delivery reports that have been generated",
-			[]string{"site"},
-			nil,
-		),
-		OutboundConnectionsCurrent: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "outbound_connections_current"),
-			"Number of connections currently outbound",
-			[]string{"site"},
-			nil,
-		),
-		OutboundConnectionsRefusedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "outbound_connections_refused_total"),
-			"Total number of connection attempts refused by remote sites",
-			[]string{"site"},
-			nil,
-		),
-		OutboundConnectionsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "outbound_connections_total"),
-			"Total number of outbound connections attempted",
-			[]string{"site"},
-			nil,
-		),
-		PickupDirectoryMessagesRetrievedTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "pickup_directory_messages_retrieved_total"),
-			"Total number of messages retrieved from the mail pick-up directory",
-			[]string{"site"},
-			nil,
-		),
-		QueueFilesOpen: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "queue_files_open"),
-			"Number of handles to open queue files",
-			[]string{"site"},
-			nil,
-		),
-		RemoteQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "remote_queue_length"),
-			"Number of messages in the remote queue",
-			[]string{"site"},
-			nil,
-		),
-		RemoteRetryQueueLength: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "remote_retry_queue_length"),
-			"Number of messages in the retry queue for remote delivery",
-			[]string{"site"},
-			nil,
-		),
-		RoutingTableLookupsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "routing_table_lookups_total"),
-			"Total number of routing table lookups",
-			[]string{"site"},
-			nil,
-		),
-
-		serverWhitelistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *serverWhitelist)),
-		serverBlacklistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *serverBlacklist)),
-	}, nil
-}
-
-// Collect sends the metric values for each metric
-// to the provided prometheus Metric channel.
-func (c *SMTPCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		log.Error("failed collecting smtp metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-// Perflib: "SMTP Server"
-type PerflibSMTPServer struct {
-	Name string
-
-	BadmailedMessagesBadPickupFileTotal     float64 `perflib:"Badmailed Messages (Bad Pickup File)"`
-	BadmailedMessagesGeneralFailureTotal    float64 `perflib:"Badmailed Messages (General Failure)"`
-	BadmailedMessagesHopCountExceededTotal  float64 `perflib:"Badmailed Messages (Hop Count Exceeded)"`
-	BadmailedMessagesNDROfDSNTotal          float64 `perflib:"Badmailed Messages (NDR of DSN)"`
-	BadmailedMessagesNoRecipientsTotal      float64 `perflib:"Badmailed Messages (No Recipients)"`
-	BadmailedMessagesTriggeredViaEventTotal float64 `perflib:"Badmailed Messages (Triggered via Event)"`
-	BytesSentTotal                          float64 `perflib:"Bytes Sent Total"`
-	BytesReceivedTotal                      float64 `perflib:"Bytes Received Total"`
-	CategorizerQueueLength                  float64 `perflib:"Categorizer Queue Length"`
-	ConnectionErrorsTotal                   float64 `perflib:"Total Connection Errors"`
-	CurrentMessagesInLocalDelivery          float64 `perflib:"Current Messages in Local Delivery"`
-	DirectoryDropsTotal                     float64 `perflib:"Directory Drops Total"`
-	DNSQueriesTotal                         float64 `perflib:"DNS Queries Total"`
-	DSNFailuresTotal                        float64 `perflib:"Total DSN Failures"`
-	ETRNMessagesTotal                       float64 `perflib:"ETRN Messages Total"`
-	InboundConnectionsCurrent               float64 `perflib:"Inbound Connections Current"`
-	InboundConnectionsTotal                 float64 `perflib:"Inbound Connections Total"`
-	LocalQueueLength                        float64 `perflib:"Local Queue Length"`
-	LocalRetryQueueLength                   float64 `perflib:"Local Retry Queue Length"`
-	MailFilesOpen                           float64 `perflib:"Number of MailFiles Open"`
-	MessageBytesReceivedTotal               float64 `perflib:"Message Bytes Received Total"`
-	MessageBytesSentTotal                   float64 `perflib:"Message Bytes Sent Total"`
-	MessageDeliveryRetriesTotal             float64 `perflib:"Message Delivery Retries"`
-	MessageSendRetriesTotal                 float64 `perflib:"Message Send Retries"`
-	MessagesCurrentlyUndeliverable          float64 `perflib:"Messages Currently Undeliverable"`
-	MessagesDeliveredTotal                  float64 `perflib:"Messages Delivered Total"`
-	MessagesPendingRouting                  float64 `perflib:"Messages Pending Routing"`
-	MessagesReceivedTotal                   float64 `perflib:"Messages Received Total"`
-	MessagesRefusedForAddressObjectsTotal   float64 `perflib:"Messages Refused for Address Objects"`
-	MessagesRefusedForMailObjectsTotal      float64 `perflib:"Messages Refused for Mail Objects"`
-	MessagesRefusedForSizeTotal             float64 `perflib:"Messages Refused for Size"`
-	MessagesSentTotal                       float64 `perflib:"Messages Sent Total"`
-	MessagesSubmittedTotal                  float64 `perflib:"Total messages submitted"`
-	NDRsGeneratedTotal                      float64 `perflib:"NDRs Generated"`
-	OutboundConnectionsCurrent              float64 `perflib:"Outbound Connections Current"`
-	OutboundConnectionsRefusedTotal         float64 `perflib:"Outbound Connections Refused"`
-	OutboundConnectionsTotal                float64 `perflib:"Outbound Connections Total"`
-	QueueFilesOpen                          float64 `perflib:"Number of QueueFiles Open"`
-	PickupDirectoryMessagesRetrievedTotal   float64 `perflib:"Pickup Directory Messages Retrieved Total"`
-	RemoteQueueLength                       float64 `perflib:"Remote Queue Length"`
-	RemoteRetryQueueLength                  float64 `perflib:"Remote Retry Queue Length"`
-	RoutingTableLookupsTotal                float64 `perflib:"Routing Table Lookups Total"`
-}
-
-func (c *SMTPCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []PerflibSMTPServer
-	if err := unmarshalObject(ctx.perfObjects["SMTP Server"], &dst); err != nil {
-		return nil, err
-	}
-
-	for _, server := range dst {
-		if server.Name == "_Total" ||
-			c.serverBlacklistPattern.MatchString(server.Name) ||
-			!c.serverWhitelistPattern.MatchString(server.Name) {
-			continue
-		}
-
-		ch <- prometheus.MustNewConstMetric(
-			c.BadmailedMessagesBadPickupFileTotal,
-			prometheus.CounterValue,
-			server.BadmailedMessagesBadPickupFileTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.BadmailedMessagesHopCountExceededTotal,
-			prometheus.CounterValue,
-			server.BadmailedMessagesHopCountExceededTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.BadmailedMessagesNDROfDSNTotal,
-			prometheus.CounterValue,
-			server.BadmailedMessagesNDROfDSNTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.BadmailedMessagesNoRecipientsTotal,
-			prometheus.CounterValue,
-			server.BadmailedMessagesNoRecipientsTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.BadmailedMessagesTriggeredViaEventTotal,
-			prometheus.CounterValue,
-			server.BadmailedMessagesTriggeredViaEventTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.BytesSentTotal,
-			prometheus.CounterValue,
-			server.BytesSentTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.BytesReceivedTotal,
-			prometheus.CounterValue,
-			server.BytesReceivedTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.CategorizerQueueLength,
-			prometheus.GaugeValue,
-			server.CategorizerQueueLength,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionErrorsTotal,
-			prometheus.CounterValue,
-			server.ConnectionErrorsTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.CurrentMessagesInLocalDelivery,
-			prometheus.GaugeValue,
-			server.CurrentMessagesInLocalDelivery,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.DirectoryDropsTotal,
-			prometheus.CounterValue,
-			server.DirectoryDropsTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.DSNFailuresTotal,
-			prometheus.CounterValue,
-			server.DSNFailuresTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.DNSQueriesTotal,
-			prometheus.CounterValue,
-			server.DNSQueriesTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ETRNMessagesTotal,
-			prometheus.CounterValue,
-			server.ETRNMessagesTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.InboundConnectionsTotal,
-			prometheus.CounterValue,
-			server.InboundConnectionsTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.InboundConnectionsCurrent,
-			prometheus.GaugeValue,
-			server.InboundConnectionsCurrent,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.LocalQueueLength,
-			prometheus.GaugeValue,
-			server.LocalQueueLength,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.LocalRetryQueueLength,
-			prometheus.GaugeValue,
-			server.LocalRetryQueueLength,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MailFilesOpen,
-			prometheus.GaugeValue,
-			server.MailFilesOpen,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessageBytesReceivedTotal,
-			prometheus.CounterValue,
-			server.MessageBytesReceivedTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessageBytesSentTotal,
-			prometheus.CounterValue,
-			server.MessageBytesSentTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessageDeliveryRetriesTotal,
-			prometheus.CounterValue,
-			server.MessageDeliveryRetriesTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessageSendRetriesTotal,
-			prometheus.CounterValue,
-			server.MessageSendRetriesTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesCurrentlyUndeliverable,
-			prometheus.GaugeValue,
-			server.MessagesCurrentlyUndeliverable,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesDeliveredTotal,
-			prometheus.CounterValue,
-			server.MessagesDeliveredTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesPendingRouting,
-			prometheus.GaugeValue,
-			server.MessagesPendingRouting,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesReceivedTotal,
-			prometheus.CounterValue,
-			server.MessagesReceivedTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesRefusedForAddressObjectsTotal,
-			prometheus.CounterValue,
-			server.MessagesRefusedForAddressObjectsTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesRefusedForMailObjectsTotal,
-			prometheus.CounterValue,
-			server.MessagesRefusedForMailObjectsTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesRefusedForSizeTotal,
-			prometheus.CounterValue,
-			server.MessagesRefusedForSizeTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesSentTotal,
-			prometheus.CounterValue,
-			server.MessagesSentTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MessagesSubmittedTotal,
-			prometheus.CounterValue,
-			server.MessagesSubmittedTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.NDRsGeneratedTotal,
-			prometheus.CounterValue,
-			server.NDRsGeneratedTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.OutboundConnectionsCurrent,
-			prometheus.GaugeValue,
-			server.OutboundConnectionsCurrent,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.OutboundConnectionsRefusedTotal,
-			prometheus.CounterValue,
-			server.OutboundConnectionsRefusedTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.OutboundConnectionsTotal,
-			prometheus.CounterValue,
-			server.OutboundConnectionsTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.QueueFilesOpen,
-			prometheus.GaugeValue,
-			server.QueueFilesOpen,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.PickupDirectoryMessagesRetrievedTotal,
-			prometheus.CounterValue,
-			server.PickupDirectoryMessagesRetrievedTotal,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.RemoteQueueLength,
-			prometheus.GaugeValue,
-			server.RemoteQueueLength,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.RemoteRetryQueueLength,
-			prometheus.GaugeValue,
-			server.RemoteRetryQueueLength,
-			server.Name,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.RoutingTableLookupsTotal,
-			prometheus.CounterValue,
-			server.RoutingTableLookupsTotal,
-			server.Name,
-		)
-
-	}
-	return nil, nil
-}

collector/smtp_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkSmtpCollector(b *testing.B) {
-	benchmarkCollector(b, "smtp", NewSMTPCollector)
-}

collector/system.go

@@ -1,11 +1,10 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/system_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkSystemCollector(b *testing.B) {
-	benchmarkCollector(b, "system", NewSystemCollector)
-}

collector/tcp.go

@@ -1,18 +1,19 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"github.com/prometheus-community/windows_exporter/log"
+	"errors"
+	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {
-	registerCollector("tcp", NewTCPCollector, "TCPv4", "TCPv6")
+	registerCollector("tcp", NewTCPCollector)
 }
 
-// A TCPCollector is a Prometheus collector for WMI Win32_PerfRawData_Tcpip_TCPv{4,6} metrics
+// A TCPCollector is a Prometheus collector for WMI Win32_PerfRawData_Tcpip_TCPv4 metrics
 type TCPCollector struct {
 	ConnectionFailures         *prometheus.Desc
 	ConnectionsActive          *prometheus.Desc
@@ -31,57 +32,57 @@ func NewTCPCollector() (Collector, error) {
 
 	return &TCPCollector{
 		ConnectionFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_failures_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "connection_failures"),
 			"(TCP.ConnectionFailures)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		ConnectionsActive: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connections_active_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "connections_active"),
 			"(TCP.ConnectionsActive)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		ConnectionsEstablished: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "connections_established"),
 			"(TCP.ConnectionsEstablished)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		ConnectionsPassive: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connections_passive_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "connections_passive"),
 			"(TCP.ConnectionsPassive)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		ConnectionsReset: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connections_reset_total"),
+			prometheus.BuildFQName(Namespace, subsystem, "connections_reset"),
 			"(TCP.ConnectionsReset)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		SegmentsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "segments_total"),
 			"(TCP.SegmentsTotal)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		SegmentsReceivedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "segments_received_total"),
 			"(TCP.SegmentsReceivedTotal)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		SegmentsRetransmittedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "segments_retransmitted_total"),
 			"(TCP.SegmentsRetransmittedTotal)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 		SegmentsSentTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "segments_sent_total"),
 			"(TCP.SegmentsSentTotal)",
-			[]string{"af"},
+			nil,
 			nil,
 		),
 	}, nil
@@ -90,7 +91,7 @@ func NewTCPCollector() (Collector, error) {
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *TCPCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
+	if desc, err := c.collect(ch); err != nil {
 		log.Error("failed collecting tcp metrics:", desc, err)
 		return err
 	}
@@ -99,94 +100,75 @@ func (c *TCPCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric)
 
 // Win32_PerfRawData_Tcpip_TCPv4 docs
 // - https://msdn.microsoft.com/en-us/library/aa394341(v=vs.85).aspx
-// The TCPv6 performance object uses the same fields.
-type tcp struct {
-	ConnectionFailures          float64 `perflib:"Connection Failures"`
-	ConnectionsActive           float64 `perflib:"Connections Active"`
-	ConnectionsEstablished      float64 `perflib:"Connections Established"`
-	ConnectionsPassive          float64 `perflib:"Connections Passive"`
-	ConnectionsReset            float64 `perflib:"Connections Reset"`
-	SegmentsPersec              float64 `perflib:"Segments/sec"`
-	SegmentsReceivedPersec      float64 `perflib:"Segments Received/sec"`
-	SegmentsRetransmittedPersec float64 `perflib:"Segments Retransmitted/sec"`
-	SegmentsSentPersec          float64 `perflib:"Segments Sent/sec"`
+type Win32_PerfRawData_Tcpip_TCPv4 struct {
+	ConnectionFailures          uint64
+	ConnectionsActive           uint64
+	ConnectionsEstablished      uint64
+	ConnectionsPassive          uint64
+	ConnectionsReset            uint64
+	SegmentsPersec              uint64
+	SegmentsReceivedPersec      uint64
+	SegmentsRetransmittedPersec uint64
+	SegmentsSentPersec          uint64
 }
 
-func writeTCPCounters(metrics tcp, labels []string, c *TCPCollector, ch chan<- prometheus.Metric) {
+func (c *TCPCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_PerfRawData_Tcpip_TCPv4
+
+	q := queryAll(&dst)
+	if err := wmi.Query(q, &dst); err != nil {
+		return nil, err
+	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
+
+	// Counters
 	ch <- prometheus.MustNewConstMetric(
 		c.ConnectionFailures,
 		prometheus.CounterValue,
-		metrics.ConnectionFailures,
-		labels...,
+		float64(dst[0].ConnectionFailures),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.ConnectionsActive,
 		prometheus.CounterValue,
-		metrics.ConnectionsActive,
-		labels...,
+		float64(dst[0].ConnectionsActive),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.ConnectionsEstablished,
 		prometheus.GaugeValue,
-		metrics.ConnectionsEstablished,
-		labels...,
+		float64(dst[0].ConnectionsEstablished),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.ConnectionsPassive,
 		prometheus.CounterValue,
-		metrics.ConnectionsPassive,
-		labels...,
+		float64(dst[0].ConnectionsPassive),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.ConnectionsReset,
 		prometheus.CounterValue,
-		metrics.ConnectionsReset,
-		labels...,
+		float64(dst[0].ConnectionsReset),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.SegmentsTotal,
 		prometheus.CounterValue,
-		metrics.SegmentsPersec,
-		labels...,
+		float64(dst[0].SegmentsPersec),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.SegmentsReceivedTotal,
 		prometheus.CounterValue,
-		metrics.SegmentsReceivedPersec,
-		labels...,
+		float64(dst[0].SegmentsReceivedPersec),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.SegmentsRetransmittedTotal,
 		prometheus.CounterValue,
-		metrics.SegmentsRetransmittedPersec,
-		labels...,
+		float64(dst[0].SegmentsRetransmittedPersec),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.SegmentsSentTotal,
 		prometheus.CounterValue,
-		metrics.SegmentsSentPersec,
-		labels...,
+		float64(dst[0].SegmentsSentPersec),
 	)
-}
-
-func (c *TCPCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []tcp
-
-	// TCPv4 counters
-	if err := unmarshalObject(ctx.perfObjects["TCPv4"], &dst); err != nil {
-		return nil, err
-	}
-	if len(dst) != 0 {
-		writeTCPCounters(dst[0], []string{"ipv4"}, c, ch)
-	}
-
-	// TCPv6 counters
-	if err := unmarshalObject(ctx.perfObjects["TCPv6"], &dst); err != nil {
-		return nil, err
-	}
-	if len(dst) != 0 {
-		writeTCPCounters(dst[0], []string{"ipv6"}, c, ch)
-	}
 
 	return nil, nil
 }

collector/tcp_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkTCPCollector(b *testing.B) {
-	benchmarkCollector(b, "tcp", NewTCPCollector)
-}

collector/terminal_services.go

@@ -1,211 +1,58 @@
-//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"errors"
-	"strings"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
-const ConnectionBrokerFeatureID uint32 = 133
-
 func init() {
-	registerCollector("terminal_services", NewTerminalServicesCollector, "Terminal Services", "Terminal Services Session", "Remote Desktop Connection Broker Counterset")
-}
-
-var (
-	connectionBrokerEnabled = isConnectionBrokerServer()
-)
-
-type Win32_ServerFeature struct {
-	ID uint32
-}
-
-func isConnectionBrokerServer() bool {
-	var dst []Win32_ServerFeature
-	q := queryAll(&dst)
-	if err := wmi.Query(q, &dst); err != nil {
-		return false
-	}
-	for _, d := range dst {
-		if d.ID == ConnectionBrokerFeatureID {
-			return true
-		}
-	}
-	log.Debug("host is not a connection broker skipping Connection Broker performance metrics.")
-	return false
+	registerCollector("terminal_services", NewTerminalServicesCollector)
 }
 
 // A TerminalServicesCollector is a Prometheus collector for WMI
 // Win32_PerfRawData_LocalSessionManager_TerminalServices &  Win32_PerfRawData_TermService_TerminalServicesSession  metrics
-// https://docs.microsoft.com/en-us/previous-versions/aa394344(v%3Dvs.85)
-// https://wutils.com/wmi/root/cimv2/win32_perfrawdata_localsessionmanager_terminalservices/
 type TerminalServicesCollector struct {
-	LocalSessionCount           *prometheus.Desc
-	ConnectionBrokerPerformance *prometheus.Desc
-	HandleCount                 *prometheus.Desc
-	PageFaultsPersec            *prometheus.Desc
-	PageFileBytes               *prometheus.Desc
-	PageFileBytesPeak           *prometheus.Desc
-	PercentPrivilegedTime       *prometheus.Desc
-	PercentProcessorTime        *prometheus.Desc
-	PercentUserTime             *prometheus.Desc
-	PoolNonpagedBytes           *prometheus.Desc
-	PoolPagedBytes              *prometheus.Desc
-	PrivateBytes                *prometheus.Desc
-	ThreadCount                 *prometheus.Desc
-	VirtualBytes                *prometheus.Desc
-	VirtualBytesPeak            *prometheus.Desc
-	WorkingSet                  *prometheus.Desc
-	WorkingSetPeak              *prometheus.Desc
+	Local_session_count *prometheus.Desc
 }
 
 // NewTerminalServicesCollector ...
 func NewTerminalServicesCollector() (Collector, error) {
 	const subsystem = "terminal_services"
 	return &TerminalServicesCollector{
-		LocalSessionCount: prometheus.NewDesc(
+		Local_session_count: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "local_session_count"),
 			"Number of Terminal Services sessions",
 			[]string{"session"},
 			nil,
 		),
-		ConnectionBrokerPerformance: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_broker_performance_total"),
-			"The total number of connections handled by the Connection Brokers since the service started.",
-			[]string{"connection"},
-			nil,
-		),
-		HandleCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "handles"),
-			"Total number of handles currently opened by this process. This number is the sum of the handles currently opened by each thread in this process.",
-			[]string{"session_name"},
-			nil,
-		),
-		PageFaultsPersec: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "page_fault_total"),
-			"Rate at which page faults occur in the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. The page may not be retrieved from disk if it is on the standby list and therefore already in main memory. The page also may not be retrieved if it is in use by another process which shares the page.",
-			[]string{"session_name"},
-			nil,
-		),
-		PageFileBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "page_file_bytes"),
-			"Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.",
-			[]string{"session_name"},
-			nil,
-		),
-		PageFileBytesPeak: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "page_file_bytes_peak"),
-			"Maximum number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.",
-			[]string{"session_name"},
-			nil,
-		),
-		PercentPrivilegedTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "privileged_time_seconds_total"),
-			"Total elapsed time that the threads of the process have spent executing code in privileged mode.",
-			[]string{"session_name"},
-			nil,
-		),
-		PercentProcessorTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "processor_time_seconds_total"),
-			"Total elapsed time that all of the threads of this process used the processor to execute instructions.",
-			[]string{"session_name"},
-			nil,
-		),
-		PercentUserTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "user_time_seconds_total"),
-			"Total elapsed time that this process's threads have spent executing code in user mode. Applications, environment subsystems, and integral subsystems execute in user mode.",
-			[]string{"session_name"},
-			nil,
-		),
-		PoolNonpagedBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "pool_non_paged_bytes"),
-			"Number of bytes in the non-paged pool, an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. This property displays the last observed value only; it is not an average.",
-			[]string{"session_name"},
-			nil,
-		),
-		PoolPagedBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "pool_paged_bytes"),
-			"Number of bytes in the paged pool, an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. This property displays the last observed value only; it is not an average.",
-			[]string{"session_name"},
-			nil,
-		),
-		PrivateBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "private_bytes"),
-			"Current number of bytes this process has allocated that cannot be shared with other processes.",
-			[]string{"session_name"},
-			nil,
-		),
-		ThreadCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "threads"),
-			"Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread.",
-			[]string{"session_name"},
-			nil,
-		),
-		VirtualBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "virtual_bytes"),
-			"Current size, in bytes, of the virtual address space the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries.",
-			[]string{"session_name"},
-			nil,
-		),
-		VirtualBytesPeak: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "virtual_bytes_peak"),
-			"Maximum number of bytes of virtual address space the process has used at any one time. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process might limit its ability to load libraries.",
-			[]string{"session_name"},
-			nil,
-		),
-		WorkingSet: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "working_set_bytes"),
-			"Current number of bytes in the working set of this process. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory.",
-			[]string{"session_name"},
-			nil,
-		),
-		WorkingSetPeak: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "working_set_bytes_peak"),
-			"Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory.",
-			[]string{"session_name"},
-			nil,
-		),
 	}, nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *TerminalServicesCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collectTSSessionCount(ctx, ch); err != nil {
+	if desc, err := c.collectTSSessionCount(ch); err != nil {
 		log.Error("failed collecting terminal services session count metrics:", desc, err)
 		return err
 	}
-	if desc, err := c.collectTSSessionCounters(ctx, ch); err != nil {
-		log.Error("failed collecting terminal services session count metrics:", desc, err)
-		return err
-	}
-
-	// only collect CollectionBrokerPerformance if host is a Connection Broker
-	if connectionBrokerEnabled {
-		if desc, err := c.collectCollectionBrokerPerformanceCounter(ctx, ch); err != nil {
-			log.Error("failed collecting Connection Broker performance metrics:", desc, err)
-			return err
-		}
-	}
 	return nil
 }
 
-type perflibTerminalServices struct {
-	ActiveSessions   float64 `perflib:"Active Sessions"`
-	InactiveSessions float64 `perflib:"Inactive Sessions"`
-	TotalSessions    float64 `perflib:"Total Sessions"`
+type Win32_PerfRawData_LocalSessionManager_TerminalServices struct {
+	ActiveSessions   uint32
+	InactiveSessions uint32
+	TotalSessions    uint32
 }
 
-func (c *TerminalServicesCollector) collectTSSessionCount(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	dst := make([]perflibTerminalServices, 0)
-	err := unmarshalObject(ctx.perfObjects["Terminal Services"], &dst)
-	if err != nil {
+func (c *TerminalServicesCollector) collectTSSessionCount(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_PerfRawData_LocalSessionManager_TerminalServices
+	q := queryAll(&dst)
+	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
 	if len(dst) == 0 {
@@ -213,192 +60,25 @@ func (c *TerminalServicesCollector) collectTSSessionCount(ctx *ScrapeContext, ch
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LocalSessionCount,
+		c.Local_session_count,
 		prometheus.GaugeValue,
-		dst[0].ActiveSessions,
+		float64(dst[0].ActiveSessions),
 		"active",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LocalSessionCount,
+		c.Local_session_count,
 		prometheus.GaugeValue,
-		dst[0].InactiveSessions,
+		float64(dst[0].InactiveSessions),
 		"inactive",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LocalSessionCount,
+		c.Local_session_count,
 		prometheus.GaugeValue,
-		dst[0].TotalSessions,
+		float64(dst[0].TotalSessions),
 		"total",
 	)
 
 	return nil, nil
 }
-
-type perflibTerminalServicesSession struct {
-	Name                  string
-	HandleCount           float64 `perflib:"Handle Count"`
-	PageFaultsPersec      float64 `perflib:"Page Faults/sec"`
-	PageFileBytes         float64 `perflib:"Page File Bytes"`
-	PageFileBytesPeak     float64 `perflib:"Page File Bytes Peak"`
-	PercentPrivilegedTime float64 `perflib:"% Privileged Time"`
-	PercentProcessorTime  float64 `perflib:"% Processor Time"`
-	PercentUserTime       float64 `perflib:"% User Time"`
-	PoolNonpagedBytes     float64 `perflib:"Pool Nonpaged Bytes"`
-	PoolPagedBytes        float64 `perflib:"Pool Paged Bytes"`
-	PrivateBytes          float64 `perflib:"Private Bytes"`
-	ThreadCount           float64 `perflib:"Thread Count"`
-	VirtualBytes          float64 `perflib:"Virtual Bytes"`
-	VirtualBytesPeak      float64 `perflib:"Virtual Bytes Peak"`
-	WorkingSet            float64 `perflib:"Working Set"`
-	WorkingSetPeak        float64 `perflib:"Working Set Peak"`
-}
-
-func (c *TerminalServicesCollector) collectTSSessionCounters(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	dst := make([]perflibTerminalServicesSession, 0)
-	err := unmarshalObject(ctx.perfObjects["Terminal Services Session"], &dst)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, d := range dst {
-		// only connect metrics for remote named sessions
-		n := strings.ToLower(d.Name)
-		if n == "" || n == "services" || n == "console" {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.HandleCount,
-			prometheus.GaugeValue,
-			d.HandleCount,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PageFaultsPersec,
-			prometheus.CounterValue,
-			d.PageFaultsPersec,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PageFileBytes,
-			prometheus.GaugeValue,
-			d.PageFileBytes,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PageFileBytesPeak,
-			prometheus.GaugeValue,
-			d.PageFileBytesPeak,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PercentPrivilegedTime,
-			prometheus.CounterValue,
-			d.PercentPrivilegedTime,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PercentProcessorTime,
-			prometheus.CounterValue,
-			d.PercentProcessorTime,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PercentUserTime,
-			prometheus.CounterValue,
-			d.PercentUserTime,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PoolNonpagedBytes,
-			prometheus.GaugeValue,
-			d.PoolNonpagedBytes,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PoolPagedBytes,
-			prometheus.GaugeValue,
-			d.PoolPagedBytes,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.PrivateBytes,
-			prometheus.GaugeValue,
-			d.PrivateBytes,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ThreadCount,
-			prometheus.GaugeValue,
-			d.ThreadCount,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.VirtualBytes,
-			prometheus.GaugeValue,
-			d.VirtualBytes,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.VirtualBytesPeak,
-			prometheus.GaugeValue,
-			d.VirtualBytesPeak,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.WorkingSet,
-			prometheus.GaugeValue,
-			d.WorkingSet,
-			d.Name,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.WorkingSetPeak,
-			prometheus.GaugeValue,
-			d.WorkingSetPeak,
-			d.Name,
-		)
-	}
-	return nil, nil
-}
-
-type perflibRemoteDesktopConnectionBrokerCounterset struct {
-	SuccessfulConnections float64 `perflib:"Successful Connections"`
-	PendingConnections    float64 `perflib:"Pending Connections"`
-	FailedConnections     float64 `perflib:"Failed Connections"`
-}
-
-func (c *TerminalServicesCollector) collectCollectionBrokerPerformanceCounter(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-
-	dst := make([]perflibRemoteDesktopConnectionBrokerCounterset, 0)
-	err := unmarshalObject(ctx.perfObjects["Remote Desktop Connection Broker Counterset"], &dst)
-	if err != nil {
-		return nil, err
-	}
-	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
-	}
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ConnectionBrokerPerformance,
-		prometheus.CounterValue,
-		dst[0].SuccessfulConnections,
-		"Successful",
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ConnectionBrokerPerformance,
-		prometheus.CounterValue,
-		dst[0].PendingConnections,
-		"Pending",
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ConnectionBrokerPerformance,
-		prometheus.CounterValue,
-		dst[0].FailedConnections,
-		"Failed",
-	)
-
-	return nil, nil
-}

collector/terminal_services_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkTerminalServicesCollector(b *testing.B) {
-	benchmarkCollector(b, "terminal_services", NewTerminalServicesCollector)
-}

collector/textfile.go

@@ -11,7 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build !notextfile
 // +build !notextfile
 
 package collector
@@ -22,16 +21,15 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"reflect"
 	"sort"
 	"strings"
 	"time"
 
 	"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"
+	"github.com/prometheus/common/log"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -39,10 +37,10 @@ var (
 	textFileDirectory = kingpin.Flag(
 		"collector.textfile.directory",
 		"Directory to read text files with metrics from.",
-	).Default(getDefaultPath()).String()
+	).Default("C:\\Program Files\\wmi_exporter\\textfile_inputs").String()
 
 	mtimeDesc = prometheus.NewDesc(
-		prometheus.BuildFQName(Namespace, "textfile", "mtime_seconds"),
+		"wmi_textfile_mtime_seconds",
 		"Unixtime mtime of textfiles successfully read.",
 		[]string{"file"},
 		nil,
@@ -67,31 +65,6 @@ func NewTextFileCollector() (Collector, error) {
 	}, nil
 }
 
-// Given a slice of metric families, determine if any two entries are duplicates.
-// Duplicates will be detected where the metric name, labels and label values are identical.
-func duplicateMetricEntry(metricFamilies []*dto.MetricFamily) bool {
-	uniqueMetrics := make(map[string]map[string]string)
-	for _, metricFamily := range metricFamilies {
-		metric_name := *metricFamily.Name
-		for _, metric := range metricFamily.Metric {
-			metric_labels := metric.GetLabel()
-			labels := make(map[string]string)
-			for _, label := range metric_labels {
-				labels[label.GetName()] = label.GetValue()
-			}
-			// Check if key is present before appending
-			_, mapContainsKey := uniqueMetrics[metric_name]
-
-			// Duplicate metric found with identical labels & label values
-			if mapContainsKey == true && reflect.DeepEqual(uniqueMetrics[metric_name], labels) {
-				return true
-			}
-			uniqueMetrics[metric_name] = labels
-		}
-	}
-	return false
-}
-
 func convertMetricFamily(metricFamily *dto.MetricFamily, ch chan<- prometheus.Metric) {
 	var valType prometheus.ValueType
 	var val float64
@@ -250,10 +223,6 @@ func (c *textFileCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Met
 		error = 1.0
 	}
 
-	// Create empty metricFamily slice here and append parsedFamilies to it inside the loop.
-	// Once loop is complete, raise error if any duplicates are present.
-	// This will ensure that duplicate metrics are correctly detected between multiple .prom files.
-	var metricFamilies = []*dto.MetricFamily{}
 fileLoop:
 	for _, f := range files {
 		if !strings.HasSuffix(f.Name(), ".prom") {
@@ -302,16 +271,7 @@ fileLoop:
 		// a failure does not appear fresh.
 		mtimes[f.Name()] = f.ModTime()
 
-		for _, metricFamily := range parsedFamilies {
-			metricFamilies = append(metricFamilies, metricFamily)
-		}
-	}
-
-	if duplicateMetricEntry(metricFamilies) {
-		log.Errorf("Duplicate metrics detected in files")
-		error = 1.0
-	} else {
-		for _, mf := range metricFamilies {
+		for _, mf := range parsedFamilies {
 			convertMetricFamily(mf, ch)
 		}
 	}
@@ -321,7 +281,7 @@ fileLoop:
 	// Export if there were errors.
 	ch <- prometheus.MustNewConstMetric(
 		prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, "textfile", "scrape_error"),
+			"wmi_textfile_scrape_error",
 			"1 if there was an error opening or reading a file, 0 otherwise",
 			nil, nil,
 		),
@@ -337,8 +297,3 @@ func checkBOM(encoding utfbom.Encoding) error {
 
 	return fmt.Errorf(encoding.String())
 }
-
-func getDefaultPath() string {
-	execPath, _ := os.Executable()
-	return filepath.Join(filepath.Dir(execPath), "textfile_inputs")
-}

collector/textfile_test.go

@@ -5,8 +5,6 @@ import (
 	"io/ioutil"
 	"strings"
 	"testing"
-
-	dto "github.com/prometheus/client_model/go"
 )
 
 func TestCRFilter(t *testing.T) {
@@ -47,108 +45,3 @@ func TestCheckBOM(t *testing.T) {
 		}
 	}
 }
-
-func TestDuplicateMetricEntry(t *testing.T) {
-	metric_name := "windows_sometest"
-	metric_help := "This is a Test."
-	metric_type := dto.MetricType_GAUGE
-
-	gauge_value := 1.0
-
-	gauge := dto.Gauge{
-		Value: &gauge_value,
-	}
-
-	label1_name := "display_name"
-	label1_value := "foobar"
-
-	label1 := dto.LabelPair{
-		Name:  &label1_name,
-		Value: &label1_value,
-	}
-
-	label2_name := "display_version"
-	label2_value := "13.4.0"
-
-	label2 := dto.LabelPair{
-		Name:  &label2_name,
-		Value: &label2_value,
-	}
-
-	metric1 := dto.Metric{
-		Label: []*dto.LabelPair{&label1, &label2},
-		Gauge: &gauge,
-	}
-
-	metric2 := dto.Metric{
-		Label: []*dto.LabelPair{&label1, &label2},
-		Gauge: &gauge,
-	}
-
-	duplicate := dto.MetricFamily{
-		Name:   &metric_name,
-		Help:   &metric_help,
-		Type:   &metric_type,
-		Metric: []*dto.Metric{&metric1, &metric2},
-	}
-
-	duplicateFamily := []*dto.MetricFamily{}
-	duplicateFamily = append(duplicateFamily, &duplicate)
-
-	// Ensure detection for duplicate metrics
-	if !duplicateMetricEntry(duplicateFamily) {
-		t.Errorf("Duplicate not found in duplicateFamily")
-	}
-
-	label3_name := "test"
-	label3_value := "1.0"
-
-	label3 := dto.LabelPair{
-		Name:  &label3_name,
-		Value: &label3_value,
-	}
-	metric3 := dto.Metric{
-		Label: []*dto.LabelPair{&label1, &label2, &label3},
-		Gauge: &gauge,
-	}
-
-	differentLabels := dto.MetricFamily{
-		Name:   &metric_name,
-		Help:   &metric_help,
-		Type:   &metric_type,
-		Metric: []*dto.Metric{&metric1, &metric3},
-	}
-
-	duplicateFamily = []*dto.MetricFamily{}
-	duplicateFamily = append(duplicateFamily, &differentLabels)
-
-	// Additional label on second metric should not be cause for duplicate detection
-	if duplicateMetricEntry(duplicateFamily) {
-		t.Errorf("Unexpected duplicate found in differentLabels")
-	}
-
-	label4_value := "2.0"
-
-	label4 := dto.LabelPair{
-		Name:  &label3_name,
-		Value: &label4_value,
-	}
-	metric4 := dto.Metric{
-		Label: []*dto.LabelPair{&label1, &label2, &label4},
-		Gauge: &gauge,
-	}
-
-	differentValues := dto.MetricFamily{
-		Name:   &metric_name,
-		Help:   &metric_help,
-		Type:   &metric_type,
-		Metric: []*dto.Metric{&metric3, &metric4},
-	}
-	duplicateFamily = []*dto.MetricFamily{}
-	duplicateFamily = append(duplicateFamily, &differentValues)
-
-	// Additional label with different values metric should not be cause for duplicate detection
-	if duplicateMetricEntry(duplicateFamily) {
-		t.Errorf("Unexpected duplicate found in differentValues")
-	}
-}

collector/thermalzone.go

@@ -1,11 +1,9 @@
 package collector
 
 import (
-	"errors"
-
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -77,11 +75,6 @@ func (c *thermalZoneCollector) collect(ch chan<- prometheus.Metric) (*prometheus
 		return nil, err
 	}
 
-	// ThermalZone collector has been known to 'successfully' return an empty result.
-	if len(dst) == 0 {
-		return nil, errors.New("Empty results set for collector")
-	}
-
 	for _, info := range dst {
 		//Divide by 10 and subtract 273.15 to convert decikelvin to celsius
 		ch <- prometheus.MustNewConstMetric(

collector/thermalzone_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkThermalZoneCollector(b *testing.B) {
-	benchmarkCollector(b, "thermalzone", NewThermalZoneCollector)
-}

collector/time.go

@@ -1,131 +0,0 @@
-//go:build windows
-// +build windows
-
-package collector
-
-import (
-	"errors"
-
-	"github.com/prometheus-community/windows_exporter/log"
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-func init() {
-	registerCollector("time", newTimeCollector, "Windows Time Service")
-}
-
-// TimeCollector is a Prometheus collector for Perflib counter metrics
-type TimeCollector struct {
-	ClockFrequencyAdjustmentPPBTotal *prometheus.Desc
-	ComputedTimeOffset               *prometheus.Desc
-	NTPClientTimeSourceCount         *prometheus.Desc
-	NTPRoundtripDelay                *prometheus.Desc
-	NTPServerIncomingRequestsTotal   *prometheus.Desc
-	NTPServerOutgoingResponsesTotal  *prometheus.Desc
-}
-
-func newTimeCollector() (Collector, error) {
-	if getWindowsVersion() <= 6.1 {
-		return nil, errors.New("Windows version older than Server 2016 detected. The time collector will not run and should be disabled via CLI flags or configuration file")
-
-	}
-	const subsystem = "time"
-
-	return &TimeCollector{
-		ClockFrequencyAdjustmentPPBTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "clock_frequency_adjustment_ppb_total"),
-			"Total adjustment made to the local system clock frequency by W32Time in Parts Per Billion (PPB) units.",
-			nil,
-			nil,
-		),
-		ComputedTimeOffset: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "computed_time_offset_seconds"),
-			"Absolute time offset between the system clock and the chosen time source, in seconds",
-			nil,
-			nil,
-		),
-		NTPClientTimeSourceCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ntp_client_time_sources"),
-			"Active number of NTP Time sources being used by the client",
-			nil,
-			nil,
-		),
-		NTPRoundtripDelay: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ntp_round_trip_delay_seconds"),
-			"Roundtrip delay experienced by the NTP client in receiving a response from the server for the most recent request, in seconds",
-			nil,
-			nil,
-		),
-		NTPServerOutgoingResponsesTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ntp_server_outgoing_responses_total"),
-			"Total number of requests responded to by NTP server",
-			nil,
-			nil,
-		),
-		NTPServerIncomingRequestsTotal: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ntp_server_incoming_requests_total"),
-			"Total number of requests received by NTP server",
-			nil,
-			nil,
-		),
-	}, nil
-}
-
-// Collect sends the metric values for each metric
-// to the provided prometheus Metric channel.
-func (c *TimeCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		log.Error("failed collecting time metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-// Perflib "Windows Time Service"
-type windowsTime struct {
-	ClockFrequencyAdjustmentPPBTotal float64 `perflib:"Clock Frequency Adjustment (ppb)"`
-	ComputedTimeOffset               float64 `perflib:"Computed Time Offset"`
-	NTPClientTimeSourceCount         float64 `perflib:"NTP Client Time Source Count"`
-	NTPRoundtripDelay                float64 `perflib:"NTP Roundtrip Delay"`
-	NTPServerIncomingRequestsTotal   float64 `perflib:"NTP Server Incoming Requests"`
-	NTPServerOutgoingResponsesTotal  float64 `perflib:"NTP Server Outgoing Responses"`
-}
-
-func (c *TimeCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []windowsTime // Single-instance class, array is required but will have single entry.
-	if err := unmarshalObject(ctx.perfObjects["Windows Time Service"], &dst); err != nil {
-		return nil, err
-	}
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ClockFrequencyAdjustmentPPBTotal,
-		prometheus.CounterValue,
-		dst[0].ClockFrequencyAdjustmentPPBTotal,
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.ComputedTimeOffset,
-		prometheus.GaugeValue,
-		dst[0].ComputedTimeOffset/1000000, // microseconds -> seconds
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.NTPClientTimeSourceCount,
-		prometheus.GaugeValue,
-		dst[0].NTPClientTimeSourceCount,
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.NTPRoundtripDelay,
-		prometheus.GaugeValue,
-		dst[0].NTPRoundtripDelay/1000000, // microseconds -> seconds
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.NTPServerIncomingRequestsTotal,
-		prometheus.CounterValue,
-		dst[0].NTPServerIncomingRequestsTotal,
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.NTPServerOutgoingResponsesTotal,
-		prometheus.CounterValue,
-		dst[0].NTPServerOutgoingResponsesTotal,
-	)
-	return nil, nil
-}

collector/time_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkTimeCollector(b *testing.B) {
-	benchmarkCollector(b, "time", newTimeCollector)
-}

collector/vmware.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +6,8 @@ import (
 	"errors"
 
 	"github.com/StackExchange/wmi"
-	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/log"
 )
 
 func init() {

collector/vmware_test.go

@@ -1,9 +0,0 @@
-package collector
-
-import (
-	"testing"
-)
-
-func BenchmarkVmwareCollector(b *testing.B) {
-	benchmarkCollector(b, "vmware", NewVmwareCollector)
-}

collector/wmi.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"reflect"
 
-	"github.com/prometheus-community/windows_exporter/log"
+	"github.com/prometheus/common/log"
 )
 
 func className(src interface{}) string {

config/config.go

@@ -1,84 +0,0 @@
-// Copyright 2018 Prometheus Team
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package config
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/prometheus-community/windows_exporter/log"
-	"gopkg.in/alecthomas/kingpin.v2"
-	"gopkg.in/yaml.v2"
-)
-
-type getFlagger interface {
-	GetFlag(name string) *kingpin.FlagClause
-}
-
-// Resolver represents a configuration file resolver for kingpin.
-type Resolver struct {
-	flags map[string]string
-}
-
-// NewResolver returns a Resolver structure.
-func NewResolver(file string) (*Resolver, error) {
-	flags := map[string]string{}
-	log.Infof("Loading configuration file: %v", file)
-	if _, err := os.Stat(file); err != nil {
-		return nil, err
-	}
-	b, err := ioutil.ReadFile(file)
-	if err != nil {
-		return nil, err
-	}
-
-	var rawValues map[string]interface{}
-	err = yaml.Unmarshal(b, &rawValues)
-	if err != nil {
-		return nil, err
-	}
-	// Flatten nested YAML values
-	flattenedValues := flatten(rawValues)
-	for k, v := range flattenedValues {
-		if _, ok := flags[k]; !ok {
-			flags[k] = v
-		}
-	}
-	return &Resolver{flags: flags}, nil
-}
-
-func (c *Resolver) setDefault(v getFlagger) {
-	for name, value := range c.flags {
-		f := v.GetFlag(name)
-		if f != nil {
-			f.Default(value)
-		}
-	}
-}
-
-// Bind sets active flags with their default values from the configuration file(s).
-func (c *Resolver) Bind(app *kingpin.Application, args []string) error {
-	// Parse the command line arguments to get the selected command.
-	pc, err := app.ParseContext(args)
-	if err != nil {
-		return err
-	}
-
-	c.setDefault(app)
-	if pc.SelectedCommand != nil {
-		c.setDefault(pc.SelectedCommand)
-	}
-
-	return nil
-}

config/flatten.go

@@ -1,61 +0,0 @@
-package config
-
-import "fmt"
-
-// flatten flattens the nested struct.
-//
-// All keys will be joined by dot
-// e.g. {"a": {"b":"c"}} => {"a.b":"c"}
-// or {"a": {"b":[1,2]}} => {"a.b.0":1, "a.b.1": 2}
-func flatten(data map[string]interface{}) map[string]string {
-	ret := make(map[string]string)
-	for k, v := range data {
-		switch typed := v.(type) {
-		case map[interface{}]interface{}:
-			for fk, fv := range flatten(convertMap(typed)) {
-				ret[fmt.Sprintf("%s.%s", k, fk)] = fv
-			}
-		case map[string]interface{}:
-			for fk, fv := range flatten(typed) {
-				ret[fmt.Sprintf("%s.%s", k, fk)] = fv
-			}
-		case []interface{}:
-			for fk, fv := range flattenSlice(typed) {
-				ret[fmt.Sprintf("%s.%s", k, fk)] = fv
-			}
-		default:
-			ret[k] = fmt.Sprint(typed)
-		}
-	}
-	return ret
-}
-func flattenSlice(data []interface{}) map[string]string {
-	ret := make(map[string]string)
-	for idx, v := range data {
-		switch typed := v.(type) {
-		case map[interface{}]interface{}:
-			for fk, fv := range flatten(convertMap(typed)) {
-				ret[fmt.Sprintf("%d,%s", idx, fk)] = fv
-			}
-		case map[string]interface{}:
-			for fk, fv := range flatten(typed) {
-				ret[fmt.Sprintf("%d,%s", idx, fk)] = fv
-			}
-		case []interface{}:
-			for fk, fv := range flattenSlice(typed) {
-				ret[fmt.Sprintf("%d,%s", idx, fk)] = fv
-			}
-		default:
-			ret[fmt.Sprint(idx)] = fmt.Sprint(typed)
-		}
-	}
-	return ret
-}
-
-func convertMap(originalMap map[interface{}]interface{}) map[string]interface{} {
-	convertedMap := map[string]interface{}{}
-	for key, value := range originalMap {
-		convertedMap[key.(string)] = value
-	}
-	return convertedMap
-}

config/flatten_test.go

@@ -1,33 +0,0 @@
-package config
-
-import (
-	"gopkg.in/yaml.v2"
-	"reflect"
-	"testing"
-)
-
-// Unmarshal good configuration file and confirm data is flattened correctly
-func TestConfigFlattening(t *testing.T) {
-	goodYamlConfig := []byte(`---
-
-    collectors:
-      enabled: cpu,net,service
-
-    log:
-      level: debug`)
-	var data map[string]interface{}
-	err := yaml.Unmarshal(goodYamlConfig, &data)
-	if err != nil {
-		t.Error(err)
-	}
-
-	expectedResult := map[string]string{
-		"collectors.enabled": "cpu,net,service",
-		"log.level":          "debug",
-	}
-	flattenedValues := flatten(data)
-
-	if !reflect.DeepEqual(expectedResult, flattenedValues) {
-		t.Errorf("Flattened values do not match!\nExpected result: %s\nActual result: %s", expectedResult, flattenedValues)
-	}
-}