Merge pull request #1118 from breed808/ci_fix

Fix CI release issues

.github/dependabot.yml

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

.github/workflows/lint.yml

@@ -0,0 +1,105 @@
+name: Linting
+
+# Trigger on pull requests and pushes to master branch where Go-related files
+# have been changed.
+on:
+  push:
+    paths:
+    - "go.mod"
+    - "go.sum"
+    - "**.go"
+    - ".github/workflows/lint.yml"
+    - "tools/e2e-output.txt"
+    branches:
+      - master
+  pull_request:
+    paths:
+    - "go.mod"
+    - "go.sum"
+    - "**.go"
+    - ".github/workflows/lint.yml"
+    - "tools/e2e-output.txt"
+    branches:
+      - master
+
+env:
+  PROMU_VER: '0.13.0'
+  PROMTOOL_VER: '2.32.1'
+
+jobs:
+  test:
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.17.5'
+
+      - name: Test
+        run: make test
+
+      - name: Install e2e deps
+        run: |
+          Invoke-WebRequest -Uri https://github.com/prometheus/promu/releases/download/v$($Env:PROMU_VER)/promu-$($Env:PROMU_VER).windows-amd64.zip -OutFile promu-$($Env:PROMU_VER).windows-amd64.zip
+          Expand-Archive -Path promu-$($Env:PROMU_VER).windows-amd64.zip -DestinationPath .
+          Copy-Item -Path promu-$($Env:PROMU_VER).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
+
+          go install 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
+
+  promtool:
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.17.5'
+
+      - name: Install promtool
+        run: |
+          Invoke-WebRequest -Uri https://github.com/prometheus/prometheus/releases/download/v$($Env:PROMTOOL_VER)/prometheus-$($Env:PROMTOOL_VER).windows-amd64.zip -OutFile prometheus-$($Env:PROMTOOL_VER).windows-amd64.zip
+          Expand-Archive -Path prometheus-$($Env:PROMTOOL_VER).windows-amd64.zip -DestinationPath .
+          Copy-Item -Path prometheus-$($Env:PROMTOOL_VER).windows-amd64\promtool.exe -Destination "$(go env GOPATH)\bin"
+
+          Invoke-WebRequest -Uri https://github.com/prometheus/promu/releases/download/v$($Env:PROMU_VER)/promu-$($Env:PROMU_VER).windows-amd64.zip -OutFile promu-$($Env:PROMU_VER).windows-amd64.zip
+          Expand-Archive -Path promu-$($Env:PROMU_VER).windows-amd64.zip -DestinationPath .
+          Copy-Item -Path promu-$($Env:PROMU_VER).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
+
+          # No binaries available so build from source
+          go install 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: Promtool
+        run: make promtool
+
+  lint:
+    runs-on: windows-2022
+    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@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.17.5'
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.45.2
+          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

.github/workflows/release.yml

@@ -0,0 +1,106 @@
+name: Releases
+
+# Trigger on releases.
+on:
+  release:
+    types:
+      - published
+      - edited
+
+permissions:
+  contents: write
+  packages: write
+
+env:
+  PROMU_VER: '0.13.0'
+
+jobs:
+  build:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          # fetch-depth required for gitversion in `Build` step
+          fetch-depth: 0
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '^1.17.5'
+
+      - name: Install Build deps
+        run: |
+          dotnet tool install --global GitVersion.Tool --version 5.*
+          Invoke-WebRequest -Uri https://github.com/prometheus/promu/releases/download/v$($Env:PROMU_VER)/promu-$($Env:PROMU_VER).windows-amd64.zip -OutFile promu-$($Env:PROMU_VER).windows-amd64.zip
+          Expand-Archive -Path promu-$($Env:PROMU_VER).windows-amd64.zip -DestinationPath .
+          Copy-Item -Path promu-$($Env:PROMU_VER).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
+
+          # No binaries available so build from source
+          go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.4.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"
+
+          dotnet-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
+          # '+' symbols are invalid characters in image tags
+          (Get-Content -Path VERSION) -replace '\+', '_' | Set-Content -Path VERSION
+          make build-all
+          # GH requires all files to have different names, so add version/arch to differentiate
+          foreach($Arch in "amd64", "arm64","386") {
+            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: Login to GitHub container registry
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push Latest image
+        if: ${{ github.event_name != 'pull_request' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          $Env:VERSION = 'latest'
+          make push-all
+
+      - 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 $_}
+          make push-all

.github/workflows/spelling.yml

@@ -0,0 +1,26 @@
+name: Spell checking
+
+# Trigger on pull requests, and pushes to master branch.
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+env:
+  PROMU_VER: 'v0.13.0'
+
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - 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,go.mod,go.sum
+          ignore_words_list: calle

.golangci.yaml

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

Dockerfile

@@ -0,0 +1,9 @@
+# Note this image doesn't really matter for hostprocess but it is good to build per OS version
+# the files in the image are copied to $env:CONTAINER_SANDBOX_MOUNT_POINT on the host
+# but the file system is the Host NOT the container
+ARG BASE="mcr.microsoft.com/windows/nanoserver:1809"
+FROM $BASE
+
+ENV PATH="C:\Windows\system32;C:\Windows;"
+COPY output/amd64/windows_exporter.exe /windows_exporter.exe
+ENTRYPOINT ["windows_exporter.exe"]

MAINTAINERS.md

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

Makefile

@@ -1,14 +1,38 @@
 export GOOS=windows
+export DOCKER_IMAGE_NAME ?= windows-exporter
+export DOCKER_REPO ?= ghcr.io/prometheus-community
 
-build:
+VERSION?=$(shell cat VERSION)
+DOCKER?=docker
+
+# Image Variables for Hostprocess Container
+# Windows image build is heavily influenced by https://github.com/kubernetes/kubernetes/blob/master/cluster/images/etcd/Makefile
+OS=1809
+ALL_OS:= 1809 ltsc2022
+BASE_IMAGE=mcr.microsoft.com/windows/nanoserver
+
+.PHONY: build
+build: windows_exporter.exe
+windows_exporter.exe: **/*.go
 	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
+
+.PHONY: promtool
+promtool: windows_exporter.exe
+	pwsh -NonInteractive -ExecutionPolicy Bypass -File .\tools\promtool.ps1
+
 fmt:
 	gofmt -l -w -s .
 
@@ -16,4 +40,25 @@ crossbuild:
 	# The prometheus/golang-builder image for promu crossbuild doesn't exist
 	# on Windows, so for now, we'll just build twice
 	GOARCH=amd64 promu build --prefix=output/amd64
+	GOARCH=arm64 promu build --prefix=output/arm64
 	GOARCH=386   promu build --prefix=output/386
+
+build-image: crossbuild
+	$(DOCKER) build --build-arg=BASE=$(BASE_IMAGE):$(OS) -f Dockerfile -t $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$(OS) .
+
+sub-build-%:
+	$(MAKE) OS=$* build-image
+
+build-all: $(addprefix sub-build-,$(ALL_OS))
+
+push:
+	set -x; \
+	for osversion in ${ALL_OS}; do \
+		$(DOCKER) push $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+		$(DOCKER) manifest create --amend $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION) $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+		full_version=`$(DOCKER) manifest inspect $(BASE_IMAGE):$${osversion} | grep "os.version" | head -n 1 | awk -F\" '{print $$4}'` || true; \
+		$(DOCKER) manifest annotate --os windows --arch amd64 --os-version $${full_version} $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)  $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+	done
+	$(DOCKER) manifest push --purge $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)
+
+push-all: build-all push

README.md

@@ -1,6 +1,6 @@
 # windows_exporter
 
-[![Build status](https://ci.appveyor.com/api/projects/status/xoym3fftr7giasiw/branch/master?svg=true)](https://ci.appveyor.com/project/prometheus-community/windows-exporter)
+![Build Status](https://github.com/prometheus-community/windows_exporter/workflows/windows_exporter%20CI/CD/badge.svg)
 
 A Prometheus exporter for Windows machines.
 
@@ -10,10 +10,14 @@ 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 |
@@ -23,6 +27,11 @@ Name     | Description | Enabled by default
 [logical_disk](docs/collector.logical_disk.md) | Logical disks, disk I/O | ✓
 [logon](docs/collector.logon.md) | User logon sessions |
 [memory](docs/collector.memory.md) | Memory usage metrics |
+[mscluster_cluster](docs/collector.mscluster_cluster.md) | MSCluster cluster metrics |
+[mscluster_network](docs/collector.mscluster_network.md) | MSCluster network metrics |
+[mscluster_node](docs/collector.mscluster_node.md) | MSCluster Node metrics |
+[mscluster_resource](docs/collector.mscluster_resource.md) | MSCluster Resource metrics |
+[mscluster_resourcegroup](docs/collector.mscluster_resourcegroup.md) | MSCluster ResourceGroup metrics |
 [msmq](docs/collector.msmq.md) | MSMQ queues |
 [mssql](docs/collector.mssql.md) | [SQL Server Performance Objects](https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/use-sql-server-objects#SQLServerPOs) metrics  |
 [netframework_clrexceptions](docs/collector.netframework_clrexceptions.md) | .NET Framework CLR Exceptions |
@@ -37,7 +46,9 @@ Name     | Description | Enabled by default
 [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 |
+[scheduled_task](docs/collector.scheduled_task.md) | Scheduled Tasks 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 |
@@ -72,9 +83,10 @@ 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 for all the collectors enabled by default." | `[defaults]`
-`--collectors.print` | If true, print available collectors and exit. | 
+`--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).
@@ -109,10 +121,14 @@ On some older versions of Windows you may need to surround parameter values with
 msiexec /i C:\Users\Administrator\Downloads\windows_exporter.msi ENABLED_COLLECTORS="ad,iis,logon,memory,process,tcp,thermalzone" TEXTFILE_DIR="C:\custom_metrics\"
 ```
 
-## Roadmap
 
-See [open issues](https://github.com/prometheus-community/windows_exporter/issues)
+## Kubernetes Implementation
 
+See detailed steps to install on Windows Kubernetes [here](./kubernetes/kubernetes.md).
+
+## Supported versions
+
+windows_exporter supports Windows Server versions 2008R2 and later, and desktop Windows version 7 and later.
 
 ## Usage
 
@@ -136,6 +152,14 @@ The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182
 
 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.
 
+### Using [defaults] with `--collectors.enabled` argument
+
+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`
@@ -168,3 +192,5 @@ CLI flags enjoy a higher priority over values specified in the configuration fil
 ## License
 
 Under [MIT](LICENSE)
+
+[web_config]: https://github.com/prometheus/exporter-toolkit/blob/master/docs/web-configuration.md

SECURITY.md

@@ -0,0 +1,6 @@
+# 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

@@ -1,83 +0,0 @@
-version: "{build}"
-
-os: Visual Studio 2019
-build: off
-
-environment:
-  GOPATH: c:\gopath
-  GO111MODULE: on
-
-clone_folder: c:\gopath\src\github.com\prometheus-community\windows_exporter
-
-install:
-  - mkdir %GOPATH%\bin
-  - set PATH=%GOPATH%\bin;%PATH%
-  - set PATH=%PATH%;C:\msys64\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
-      go get -u github.com/josephspurrier/goversioninfo/cmd/goversioninfo
-      $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
-      # 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") {
-        Rename-Item output\$Arch\windows_exporter.exe -NewName windows_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 windows_exporter $MSIVersion msi for $Arch"
-        .\installer\build.ps1 -PathToExecutable .\output\$Arch\windows_exporter-$BuildVersion-$Arch.exe -Version $MSIVersion -Arch "$Arch"
-        Move-Item installer\Output\windows_exporter-$MSIVersion-$Arch.msi output\$Arch\
-      }
-  - promu checksum output\
-
-artifacts:
-  - name: Artifacts
-    path: output\**\*
-
-deploy:
-  - provider: GitHub
-    description: windows_exporter version $(appveyor_build_version)
-    artifact: Artifacts
-    auth_token:
-      secure: 'hFR7Ymxt/Rb25p4BweFvMNhX03lHD9kXJXrRlC/KbThazHuLD5NTx2ibMI6LYRsr'
-    draft: false
-    prerelease: false
-    on:
-      appveyor_repo_tag: true

collector/ad.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -6,8 +7,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

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

collector/adcs.go

@@ -0,0 +1,242 @@
+//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

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

collector/adfs.go

@@ -1,9 +1,11 @@
+//go:build windows
 // +build windows
 
 package collector
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
+	"math"
 )
 
 func init() {
@@ -11,17 +13,49 @@ func init() {
 }
 
 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
+	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
 }
 
 // newADFSCollector constructs a new adfsCollector
@@ -30,86 +64,310 @@ func newADFSCollector() (Collector, error) {
 
 	return &adfsCollector{
 		adLoginConnectionFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ad_login_connection_failures"),
+			prometheus.BuildFQName(Namespace, subsystem, "ad_login_connection_failures_total"),
 			"Total number of connection failures to an Active Directory domain controller",
 			nil,
 			nil,
 		),
 		certificateAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "certificate_authentications"),
+			prometheus.BuildFQName(Namespace, subsystem, "certificate_authentications_total"),
 			"Total number of User Certificate authentications",
 			nil,
 			nil,
 		),
 		deviceAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "device_authentications"),
+			prometheus.BuildFQName(Namespace, subsystem, "device_authentications_total"),
 			"Total number of Device authentications",
 			nil,
 			nil,
 		),
 		extranetAccountLockouts: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "extranet_account_lockouts"),
+			prometheus.BuildFQName(Namespace, subsystem, "extranet_account_lockouts_total"),
 			"Total number of Extranet Account Lockouts",
 			nil,
 			nil,
 		),
 		federatedAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "federated_authentications"),
+			prometheus.BuildFQName(Namespace, subsystem, "federated_authentications_total"),
 			"Total number of authentications from a federated source",
 			nil,
 			nil,
 		),
 		passportAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "passport_authentications"),
+			prometheus.BuildFQName(Namespace, subsystem, "passport_authentications_total"),
 			"Total number of Microsoft Passport SSO authentications",
 			nil,
 			nil,
 		),
 		passiveRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "passive_requests"),
+			prometheus.BuildFQName(Namespace, subsystem, "passive_requests_total"),
 			"Total number of passive (browser-based) requests",
 			nil,
 			nil,
 		),
 		passwordChangeFailed: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "password_change_failed"),
+			prometheus.BuildFQName(Namespace, subsystem, "password_change_failed_total"),
 			"Total number of failed password changes",
 			nil,
 			nil,
 		),
 		passwordChangeSucceeded: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "password_change_succeeded"),
+			prometheus.BuildFQName(Namespace, subsystem, "password_change_succeeded_total"),
 			"Total number of successful password changes",
 			nil,
 			nil,
 		),
 		tokenRequests: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "token_requests"),
+			prometheus.BuildFQName(Namespace, subsystem, "token_requests_total"),
 			"Total number of token requests",
 			nil,
 			nil,
 		),
 		windowsIntegratedAuthentications: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "windows_integrated_authentications"),
+			prometheus.BuildFQName(Namespace, subsystem, "windows_integrated_authentications_total"),
 			"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"`
+	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"`
 }
 
 func (c *adfsCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
@@ -184,5 +442,197 @@ 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

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

collector/cache.go

@@ -0,0 +1,453 @@
+//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

@@ -2,12 +2,13 @@ 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"
 )
 
@@ -128,3 +129,26 @@ func find(slice []string, val string) bool {
 	}
 	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

@@ -0,0 +1,60 @@
+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,11 +1,12 @@
+//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() {
@@ -36,6 +37,12 @@ type ContainerMetricsCollector struct {
 	PacketsSent            *prometheus.Desc
 	DroppedPacketsIncoming *prometheus.Desc
 	DroppedPacketsOutgoing *prometheus.Desc
+
+	// Storage
+	ReadCountNormalized  *prometheus.Desc
+	ReadSizeBytes        *prometheus.Desc
+	WriteCountNormalized *prometheus.Desc
+	WriteSizeBytes       *prometheus.Desc
 }
 
 // NewContainerMetricsCollector constructs a new ContainerMetricsCollector
@@ -126,6 +133,30 @@ func NewContainerMetricsCollector() (Collector, error) {
 			[]string{"container_id", "interface"},
 			nil,
 		),
+		ReadCountNormalized: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "storage_read_count_normalized_total"),
+			"Read Count Normalized",
+			[]string{"container_id"},
+			nil,
+		),
+		ReadSizeBytes: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "storage_read_size_bytes_total"),
+			"Read Size Bytes",
+			[]string{"container_id"},
+			nil,
+		),
+		WriteCountNormalized: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "storage_write_count_normalized_total"),
+			"Write Count Normalized",
+			[]string{"container_id"},
+			nil,
+		),
+		WriteSizeBytes: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "storage_write_size_bytes_total"),
+			"Write Size Bytes",
+			[]string{"container_id"},
+			nil,
+		),
 	}, nil
 }
 
@@ -168,70 +199,67 @@ func (c *ContainerMetricsCollector) collect(ch chan<- prometheus.Metric) (*prome
 	}
 
 	for _, containerDetails := range containers {
-		containerId := containerDetails.ID
-
-		container, err := hcsshim.OpenContainer(containerId)
+		container, err := hcsshim.OpenContainer(containerDetails.ID)
 		if container != nil {
 			defer containerClose(container)
 		}
 		if err != nil {
-			log.Error("err in opening container: ", containerId, err)
+			log.Error("err in opening container: ", containerDetails.ID, err)
 			continue
 		}
 
 		cstats, err := container.Statistics()
 		if err != nil {
-			log.Error("err in fetching container Statistics: ", containerId, err)
+			log.Error("err in fetching container Statistics: ", containerDetails.ID, err)
 			continue
 		}
-		// HCS V1 is for docker runtime. Add the docker:// prefix on container_id
-		containerId = "docker://" + containerId
+		containerIdWithPrefix := getContainerIdWithPrefix(containerDetails)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.ContainerAvailable,
 			prometheus.CounterValue,
 			1,
-			containerId,
+			containerIdWithPrefix,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.UsageCommitBytes,
 			prometheus.GaugeValue,
 			float64(cstats.Memory.UsageCommitBytes),
-			containerId,
+			containerIdWithPrefix,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.UsageCommitPeakBytes,
 			prometheus.GaugeValue,
 			float64(cstats.Memory.UsageCommitPeakBytes),
-			containerId,
+			containerIdWithPrefix,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.UsagePrivateWorkingSetBytes,
 			prometheus.GaugeValue,
 			float64(cstats.Memory.UsagePrivateWorkingSetBytes),
-			containerId,
+			containerIdWithPrefix,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.RuntimeTotal,
 			prometheus.CounterValue,
 			float64(cstats.Processor.TotalRuntime100ns)*ticksToSecondsScaleFactor,
-			containerId,
+			containerIdWithPrefix,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.RuntimeUser,
 			prometheus.CounterValue,
 			float64(cstats.Processor.RuntimeUser100ns)*ticksToSecondsScaleFactor,
-			containerId,
+			containerIdWithPrefix,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.RuntimeKernel,
 			prometheus.CounterValue,
 			float64(cstats.Processor.RuntimeKernel100ns)*ticksToSecondsScaleFactor,
-			containerId,
+			containerIdWithPrefix,
 		)
 
 		if len(cstats.Network) == 0 {
-			log.Info("No Network Stats for container: ", containerId)
+			log.Info("No Network Stats for container: ", containerDetails.ID)
 			continue
 		}
 
@@ -242,41 +270,76 @@ func (c *ContainerMetricsCollector) collect(ch chan<- prometheus.Metric) (*prome
 				c.BytesReceived,
 				prometheus.CounterValue,
 				float64(networkInterface.BytesReceived),
-				containerId, networkInterface.EndpointId,
+				containerIdWithPrefix, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.BytesSent,
 				prometheus.CounterValue,
 				float64(networkInterface.BytesSent),
-				containerId, networkInterface.EndpointId,
+				containerIdWithPrefix, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.PacketsReceived,
 				prometheus.CounterValue,
 				float64(networkInterface.PacketsReceived),
-				containerId, networkInterface.EndpointId,
+				containerIdWithPrefix, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.PacketsSent,
 				prometheus.CounterValue,
 				float64(networkInterface.PacketsSent),
-				containerId, networkInterface.EndpointId,
+				containerIdWithPrefix, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.DroppedPacketsIncoming,
 				prometheus.CounterValue,
 				float64(networkInterface.DroppedPacketsIncoming),
-				containerId, networkInterface.EndpointId,
+				containerIdWithPrefix, networkInterface.EndpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.DroppedPacketsOutgoing,
 				prometheus.CounterValue,
 				float64(networkInterface.DroppedPacketsOutgoing),
-				containerId, networkInterface.EndpointId,
+				containerIdWithPrefix, networkInterface.EndpointId,
 			)
 			break
 		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.ReadCountNormalized,
+			prometheus.CounterValue,
+			float64(cstats.Storage.ReadCountNormalized),
+			containerIdWithPrefix,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.ReadSizeBytes,
+			prometheus.CounterValue,
+			float64(cstats.Storage.ReadSizeBytes),
+			containerIdWithPrefix,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.WriteCountNormalized,
+			prometheus.CounterValue,
+			float64(cstats.Storage.WriteCountNormalized),
+			containerIdWithPrefix,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.WriteSizeBytes,
+			prometheus.CounterValue,
+			float64(cstats.Storage.WriteSizeBytes),
+			containerIdWithPrefix,
+		)
 	}
 
 	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

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

collector/cpu.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -36,6 +37,10 @@ type cpuCollectorFull struct {
 	ProcessorFrequencyMHz    *prometheus.Desc
 	ProcessorMaxFrequencyMHz *prometheus.Desc
 	ProcessorPerformance     *prometheus.Desc
+	ProcessorMPerf           *prometheus.Desc
+	ProcessorRTC             *prometheus.Desc
+	ProcessorUtility         *prometheus.Desc
+	ProcessorPrivUtility     *prometheus.Desc
 }
 
 // newCPUCollector constructs a new cpuCollector, appropriate for the running OS
@@ -59,7 +64,7 @@ func newCPUCollector() (Collector, error) {
 			),
 			TimeTotal: prometheus.NewDesc(
 				prometheus.BuildFQName(Namespace, subsystem, "time_total"),
-				"Time that processor spent in different modes (idle, user, system, ...)",
+				"Time that processor spent in different modes (dpc, idle, interrupt, privileged, user)",
 				[]string{"core", "mode"},
 				nil,
 			),
@@ -87,7 +92,7 @@ func newCPUCollector() (Collector, error) {
 		),
 		TimeTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "time_total"),
-			"Time that processor spent in different modes (idle, user, system, ...)",
+			"Time that processor spent in different modes (dpc, idle, interrupt, privileged, user)",
 			[]string{"core", "mode"},
 			nil,
 		),
@@ -128,11 +133,35 @@ func newCPUCollector() (Collector, error) {
 			nil,
 		),
 		ProcessorPerformance: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "processor_performance"),
+			prometheus.BuildFQName(Namespace, subsystem, "processor_performance_total"),
 			"Processor Performance is the average performance of the processor while it is executing instructions, as a percentage of the nominal performance of the processor. On some processors, Processor Performance may exceed 100%",
 			[]string{"core"},
 			nil,
 		),
+		ProcessorMPerf: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "processor_mperf_total"),
+			"Processor MPerf is the number of TSC ticks incremented while executing instructions",
+			[]string{"core"},
+			nil,
+		),
+		ProcessorRTC: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "processor_rtc_total"),
+			"Processor RTC represents the number of RTC ticks made since the system booted. It should consistently be 64e6, and can be used to properly derive Processor Utility Rate",
+			[]string{"core"},
+			nil,
+		),
+		ProcessorUtility: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "processor_utility_total"),
+			"Processor Utility represents is the amount of time the core spends executing instructions",
+			[]string{"core"},
+			nil,
+		),
+		ProcessorPrivUtility: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "processor_privileged_utility_total"),
+			"Processor Privilieged Utility represents is the amount of time the core has spent executing instructions inside the kernel",
+			[]string{"core"},
+			nil,
+		),
 	}, nil
 }
 
@@ -257,8 +286,10 @@ type perflibProcessorInformation struct {
 	PrivilegedUtilitySeconds float64 `perflib:"% Privileged Utility"`
 	ProcessorFrequencyMHz    float64 `perflib:"Processor Frequency"`
 	ProcessorPerformance     float64 `perflib:"% Processor Performance"`
+	ProcessorMPerf           float64 `perflib:"% Processor Performance,secondvalue"`
 	ProcessorTimeSeconds     float64 `perflib:"% Processor Time"`
 	ProcessorUtilityRate     float64 `perflib:"% Processor Utility"`
+	ProcessorRTC             float64 `perflib:"% Processor Utility,secondvalue"`
 	UserTimeSeconds          float64 `perflib:"% User Time"`
 }
 
@@ -365,10 +396,34 @@ func (c *cpuCollectorFull) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.ProcessorPerformance,
-			prometheus.GaugeValue,
+			prometheus.CounterValue,
 			cpu.ProcessorPerformance,
 			core,
 		)
+		ch <- prometheus.MustNewConstMetric(
+			c.ProcessorMPerf,
+			prometheus.CounterValue,
+			cpu.ProcessorMPerf,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.ProcessorRTC,
+			prometheus.CounterValue,
+			cpu.ProcessorRTC,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.ProcessorUtility,
+			prometheus.CounterValue,
+			cpu.ProcessorUtilityRate,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.ProcessorPrivUtility,
+			prometheus.CounterValue,
+			cpu.PrivilegedUtilitySeconds,
+			core,
+		)
 	}
 
 	return nil

collector/cpu_info.go

@@ -0,0 +1,97 @@
+//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

@@ -0,0 +1,9 @@
+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 (
-	"errors"
+	"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"
-	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -60,51 +60,47 @@ func (c *CSCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) e
 	return nil
 }
 
-// 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
-}
-
 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 {
+	// Get systeminfo for number of processors
+	systemInfo := sysinfoapi.GetSystemInfo()
+
+	// Get memory status for physical memory
+	mem, err := sysinfoapi.GlobalMemoryStatusEx()
+	if 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(dst[0].NumberOfLogicalProcessors),
+		float64(systemInfo.NumberOfProcessors),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PhysicalMemoryBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].TotalPhysicalMemory),
+		float64(mem.TotalPhys),
 	)
 
-	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
+	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
 	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.Hostname,
 		prometheus.GaugeValue,
 		1.0,
-		dst[0].DNSHostname,
-		dst[0].Domain,
+		hostname,
+		domain,
 		fqdn,
 	)
 

collector/cs_test.go

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

collector/dfsr.go

@@ -0,0 +1,810 @@
+//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

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

collector/dhcp.go

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

collector/dhcp_test.go

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

collector/dns.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -6,8 +7,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() {
@@ -81,8 +82,8 @@ func NewDNSCollector() (Collector, error) {
 			nil,
 		),
 		MemoryUsedBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "memory_used_bytes_total"),
-			"Total memory used by DNS server",
+			prometheus.BuildFQName(Namespace, subsystem, "memory_used_bytes"),
+			"Current memory used by DNS server",
 			[]string{"area"},
 			nil,
 		),
@@ -136,7 +137,7 @@ func NewDNSCollector() (Collector, error) {
 		),
 		Responses: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "responses_total"),
-			"Number of reponses sent by DNS server",
+			"Number of responses sent by DNS server",
 			[]string{"protocol"},
 			nil,
 		),

collector/dns_test.go

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

collector/exchange.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +8,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -234,7 +235,7 @@ func (c *exchangeCollector) collectADAccessProcesses(ctx *ScrapeContext, ch chan
 		}
 
 		// since we're not including the PID suffix from the instance names in the label names,
-		// we get an occational duplicate. This seems to affect about 4 instances only on this object.
+		// 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])

collector/exchange_test.go

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

collector/fsrmquota.go

@@ -2,8 +2,8 @@ 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/fsrmquota_test.go

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

collector/hyperv.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -6,8 +7,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() {
@@ -52,6 +53,11 @@ type HyperVCollector struct {
 	LogicalProcessors *prometheus.Desc
 	VirtualProcessors *prometheus.Desc
 
+	// Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor
+	HostLPGuestRunTimePercent      *prometheus.Desc
+	HostLPHypervisorRunTimePercent *prometheus.Desc
+	HostLPTotalRunTimePercent      *prometheus.Desc
+
 	// Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor
 	HostGuestRunTime      *prometheus.Desc
 	HostHypervisorRunTime *prometheus.Desc
@@ -110,6 +116,18 @@ type HyperVCollector struct {
 	VMNetworkDroppedPacketsOutgoing *prometheus.Desc
 	VMNetworkPacketsReceived        *prometheus.Desc
 	VMNetworkPacketsSent            *prometheus.Desc
+
+	// Win32_PerfRawData_BalancerStats_HyperVDynamicMemoryVM
+	VMMemoryAddedMemory                *prometheus.Desc
+	VMMemoryAveragePressure            *prometheus.Desc
+	VMMemoryCurrentPressure            *prometheus.Desc
+	VMMemoryGuestVisiblePhysicalMemory *prometheus.Desc
+	VMMemoryMaximumPressure            *prometheus.Desc
+	VMMemoryMemoryAddOperations        *prometheus.Desc
+	VMMemoryMemoryRemoveOperations     *prometheus.Desc
+	VMMemoryMinimumPressure            *prometheus.Desc
+	VMMemoryPhysicalMemory             *prometheus.Desc
+	VMMemoryRemovedMemory              *prometheus.Desc
 }
 
 // NewHyperVCollector ...
@@ -296,6 +314,27 @@ func NewHyperVCollector() (Collector, error) {
 
 		//
 
+		HostLPGuestRunTimePercent: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("host_lp"), "guest_run_time_percent"),
+			"The percentage of time spent by the processor in guest code",
+			[]string{"core"},
+			nil,
+		),
+		HostLPHypervisorRunTimePercent: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("host_lp"), "hypervisor_run_time_percent"),
+			"The percentage of time spent by the processor in hypervisor code",
+			[]string{"core"},
+			nil,
+		),
+		HostLPTotalRunTimePercent: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("host_lp"), "total_run_time_percent"),
+			"The percentage of time spent by the processor in guest and hypervisor code",
+			[]string{"core"},
+			nil,
+		),
+
+		//
+
 		HostGuestRunTime: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, buildSubsystemName("host_cpu"), "guest_run_time"),
 			"The time spent by the virtual processor in guest code",
@@ -592,6 +631,69 @@ func NewHyperVCollector() (Collector, error) {
 			[]string{"vm_interface"},
 			nil,
 		),
+
+		//
+
+		VMMemoryAddedMemory: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "added_total"),
+			"This counter represents memory in MB added to the VM",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryAveragePressure: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "pressure_average"),
+			"This gauge represents the average pressure in the VM.",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryCurrentPressure: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "pressure_current"),
+			"This gauge represents the current pressure in the VM.",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryGuestVisiblePhysicalMemory: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "physical_guest_visible"),
+			"'This gauge represents the amount of memory in MB visible to the VM guest.'",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryMaximumPressure: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "pressure_maximum"),
+			"This gauge represents the maximum pressure band in the VM.",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryMemoryAddOperations: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "add_operations_total"),
+			"This counter represents the number of operations adding memory to the VM.",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryMemoryRemoveOperations: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "remove_operations_total"),
+			"This counter represents the number of operations removing memory from the VM.",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryMinimumPressure: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "pressure_minimum"),
+			"This gauge represents the minimum pressure band in the VM.",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryPhysicalMemory: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "physical"),
+			"This gauge represents the current amount of memory in MB assigned to the VM.",
+			[]string{"vm"},
+			nil,
+		),
+		VMMemoryRemovedMemory: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("vm_memory"), "removed_total"),
+			"This counter represents memory in MB removed from the VM",
+			[]string{"vm"},
+			nil,
+		),
 	}, nil
 }
 
@@ -618,6 +720,11 @@ func (c *HyperVCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 		return err
 	}
 
+	if desc, err := c.collectHostLPUsage(ch); err != nil {
+		log.Error("failed collecting hyperV host logical processors metrics:", desc, err)
+		return err
+	}
+
 	if desc, err := c.collectHostCpuUsage(ch); err != nil {
 		log.Error("failed collecting hyperV host CPU metrics:", desc, err)
 		return err
@@ -648,6 +755,11 @@ func (c *HyperVCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 		return err
 	}
 
+	if desc, err := c.collectVmMemory(ch); err != nil {
+		log.Error("failed collecting hyperV virtual memory metrics:", desc, err)
+		return err
+	}
+
 	return nil
 }
 
@@ -918,6 +1030,59 @@ func (c *HyperVCollector) collectVmProcessor(ch chan<- prometheus.Metric) (*prom
 	return nil, nil
 }
 
+// Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor ...
+type Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor struct {
+	Name                     string
+	PercentGuestRunTime      uint64
+	PercentHypervisorRunTime uint64
+	PercentTotalRunTime      uint
+}
+
+func (c *HyperVCollector) collectHostLPUsage(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor
+	q := queryAll(&dst)
+	if err := wmi.Query(q, &dst); err != nil {
+		return nil, err
+	}
+
+	for _, obj := range dst {
+		if strings.Contains(obj.Name, "_Total") {
+			continue
+		}
+		// The name format is Hv LP <core id>
+		parts := strings.Split(obj.Name, " ")
+		if len(parts) != 3 {
+			log.Warnf("Unexpected format of Name in collectHostLPUsage: %q", obj.Name)
+			continue
+		}
+		coreId := parts[2]
+
+		ch <- prometheus.MustNewConstMetric(
+			c.HostLPGuestRunTimePercent,
+			prometheus.GaugeValue,
+			float64(obj.PercentGuestRunTime),
+			coreId,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.HostLPHypervisorRunTimePercent,
+			prometheus.GaugeValue,
+			float64(obj.PercentHypervisorRunTime),
+			coreId,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.HostLPTotalRunTimePercent,
+			prometheus.GaugeValue,
+			float64(obj.PercentTotalRunTime),
+			coreId,
+		)
+
+	}
+
+	return nil, nil
+}
+
 // Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor ...
 type Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor struct {
 	Name                     string
@@ -1430,3 +1595,104 @@ func (c *HyperVCollector) collectVmNetwork(ch chan<- prometheus.Metric) (*promet
 
 	return nil, nil
 }
+
+// Win32_PerfRawData_BalancerStats_HyperVDynamicMemoryVM ...
+type Win32_PerfRawData_BalancerStats_HyperVDynamicMemoryVM struct {
+	Name                       string
+	AddedMemory                uint64
+	AveragePressure            uint64
+	CurrentPressure            uint64
+	GuestVisiblePhysicalMemory uint64
+	MaximumPressure            uint64
+	MemoryAddOperations        uint64
+	MemoryRemoveOperations     uint64
+	MinimumPressure            uint64
+	PhysicalMemory             uint64
+	RemovedMemory              uint64
+}
+
+func (c *HyperVCollector) collectVmMemory(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_PerfRawData_BalancerStats_HyperVDynamicMemoryVM
+	q := queryAll(&dst)
+	if err := wmi.Query(q, &dst); err != nil {
+		return nil, err
+	}
+
+	for _, obj := range dst {
+		if strings.Contains(obj.Name, "_Total") {
+			continue
+		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryAddedMemory,
+			prometheus.CounterValue,
+			float64(obj.AddedMemory),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryAveragePressure,
+			prometheus.GaugeValue,
+			float64(obj.AveragePressure),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryCurrentPressure,
+			prometheus.GaugeValue,
+			float64(obj.CurrentPressure),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryGuestVisiblePhysicalMemory,
+			prometheus.GaugeValue,
+			float64(obj.GuestVisiblePhysicalMemory),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryMaximumPressure,
+			prometheus.GaugeValue,
+			float64(obj.MaximumPressure),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryMemoryAddOperations,
+			prometheus.CounterValue,
+			float64(obj.MemoryAddOperations),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryMemoryRemoveOperations,
+			prometheus.CounterValue,
+			float64(obj.MemoryRemoveOperations),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryMinimumPressure,
+			prometheus.GaugeValue,
+			float64(obj.MinimumPressure),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryPhysicalMemory,
+			prometheus.GaugeValue,
+			float64(obj.PhysicalMemory),
+			obj.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.VMMemoryRemovedMemory,
+			prometheus.CounterValue,
+			float64(obj.RemovedMemory),
+			obj.Name,
+		)
+	}
+
+	return nil, nil
+}

collector/hyperv_test.go

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

collector/iis_test.go

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

collector/logical_disk.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -6,8 +7,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"
 )
 
@@ -29,6 +30,8 @@ var (
 // A LogicalDiskCollector is a Prometheus collector for perflib logicalDisk metrics
 type LogicalDiskCollector struct {
 	RequestsQueued   *prometheus.Desc
+	AvgReadQueue     *prometheus.Desc
+	AvgWriteQueue    *prometheus.Desc
 	ReadBytesTotal   *prometheus.Desc
 	ReadsTotal       *prometheus.Desc
 	WriteBytesTotal  *prometheus.Desc
@@ -59,6 +62,20 @@ func NewLogicalDiskCollector() (Collector, error) {
 			nil,
 		),
 
+		AvgReadQueue: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "avg_read_requests_queued"),
+			"Average number of read requests that were queued for the selected disk during the sample interval (LogicalDisk.AvgDiskReadQueueLength)",
+			[]string{"volume"},
+			nil,
+		),
+
+		AvgWriteQueue: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "avg_write_requests_queued"),
+			"Average number of write requests that were queued for the selected disk during the sample interval (LogicalDisk.AvgDiskWriteQueueLength)",
+			[]string{"volume"},
+			nil,
+		),
+
 		ReadBytesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "read_bytes_total"),
 			"The number of bytes transferred from the disk during read operations (LogicalDisk.DiskReadBytesPerSec)",
@@ -103,14 +120,14 @@ func NewLogicalDiskCollector() (Collector, error) {
 
 		FreeSpace: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "free_bytes"),
-			"Free space in bytes (LogicalDisk.PercentFreeSpace)",
+			"Free space in bytes, updates every 10-15 min (LogicalDisk.PercentFreeSpace)",
 			[]string{"volume"},
 			nil,
 		),
 
 		TotalSpace: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "size_bytes"),
-			"Total space in bytes (LogicalDisk.PercentFreeSpace_Base)",
+			"Total space in bytes, updates every 10-15 min (LogicalDisk.PercentFreeSpace_Base)",
 			[]string{"volume"},
 			nil,
 		),
@@ -169,21 +186,23 @@ func (c *LogicalDiskCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.
 // - https://msdn.microsoft.com/en-us/windows/hardware/aa394307(v=vs.71) - Win32_PerfRawData_PerfDisk_LogicalDisk class
 // - https://msdn.microsoft.com/en-us/library/ms803973.aspx - LogicalDisk object reference
 type logicalDisk struct {
-	Name                   string
-	CurrentDiskQueueLength float64 `perflib:"Current Disk Queue Length"`
-	DiskReadBytesPerSec    float64 `perflib:"Disk Read Bytes/sec"`
-	DiskReadsPerSec        float64 `perflib:"Disk Reads/sec"`
-	DiskWriteBytesPerSec   float64 `perflib:"Disk Write Bytes/sec"`
-	DiskWritesPerSec       float64 `perflib:"Disk Writes/sec"`
-	PercentDiskReadTime    float64 `perflib:"% Disk Read Time"`
-	PercentDiskWriteTime   float64 `perflib:"% Disk Write Time"`
-	PercentFreeSpace       float64 `perflib:"% Free Space_Base"`
-	PercentFreeSpace_Base  float64 `perflib:"Free Megabytes"`
-	PercentIdleTime        float64 `perflib:"% Idle Time"`
-	SplitIOPerSec          float64 `perflib:"Split IO/Sec"`
-	AvgDiskSecPerRead      float64 `perflib:"Avg. Disk sec/Read"`
-	AvgDiskSecPerWrite     float64 `perflib:"Avg. Disk sec/Write"`
-	AvgDiskSecPerTransfer  float64 `perflib:"Avg. Disk sec/Transfer"`
+	Name                    string
+	CurrentDiskQueueLength  float64 `perflib:"Current Disk Queue Length"`
+	AvgDiskReadQueueLength  float64 `perflib:"Avg. Disk Read Queue Length"`
+	AvgDiskWriteQueueLength float64 `perflib:"Avg. Disk Write Queue Length"`
+	DiskReadBytesPerSec     float64 `perflib:"Disk Read Bytes/sec"`
+	DiskReadsPerSec         float64 `perflib:"Disk Reads/sec"`
+	DiskWriteBytesPerSec    float64 `perflib:"Disk Write Bytes/sec"`
+	DiskWritesPerSec        float64 `perflib:"Disk Writes/sec"`
+	PercentDiskReadTime     float64 `perflib:"% Disk Read Time"`
+	PercentDiskWriteTime    float64 `perflib:"% Disk Write Time"`
+	PercentFreeSpace        float64 `perflib:"% Free Space_Base"`
+	PercentFreeSpace_Base   float64 `perflib:"Free Megabytes"`
+	PercentIdleTime         float64 `perflib:"% Idle Time"`
+	SplitIOPerSec           float64 `perflib:"Split IO/Sec"`
+	AvgDiskSecPerRead       float64 `perflib:"Avg. Disk sec/Read"`
+	AvgDiskSecPerWrite      float64 `perflib:"Avg. Disk sec/Write"`
+	AvgDiskSecPerTransfer   float64 `perflib:"Avg. Disk sec/Transfer"`
 }
 
 func (c *LogicalDiskCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
@@ -206,6 +225,20 @@ func (c *LogicalDiskCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.
 			volume.Name,
 		)
 
+		ch <- prometheus.MustNewConstMetric(
+			c.AvgReadQueue,
+			prometheus.GaugeValue,
+			volume.AvgDiskReadQueueLength*ticksToSecondsScaleFactor,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.AvgWriteQueue,
+			prometheus.GaugeValue,
+			volume.AvgDiskWriteQueueLength*ticksToSecondsScaleFactor,
+			volume.Name,
+		)
+
 		ch <- prometheus.MustNewConstMetric(
 			c.ReadBytesTotal,
 			prometheus.CounterValue,

collector/logical_disk_test.go

@@ -0,0 +1,13 @@
+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,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -6,8 +7,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

@@ -0,0 +1,10 @@
+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,13 +1,14 @@
 // 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() {
@@ -76,7 +77,8 @@ func NewMemoryCollector() (Collector, error) {
 		),
 		CacheFaultsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "cache_faults_total"),
-			"(CacheFaultsPersec)",
+			"Number of faults which occur when a page sought in the file system cache is not found there and must be retrieved from elsewhere in memory (soft fault) "+
+				"or from disk (hard fault) (Cache Faults/sec)",
 			nil,
 			nil,
 		),
@@ -95,13 +97,14 @@ func NewMemoryCollector() (Collector, error) {
 		DemandZeroFaultsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "demand_zero_faults_total"),
 			"The number of zeroed pages required to satisfy faults. Zeroed pages, pages emptied of previously stored data and filled with zeros, are a security"+
-				" feature of Windows that prevent processes from seeing data stored by earlier processes that used the memory space (DemandZeroFaults)",
+				" feature of Windows that prevent processes from seeing data stored by earlier processes that used the memory space (Demand Zero Faults/sec)",
 			nil,
 			nil,
 		),
 		FreeAndZeroPageListBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "free_and_zero_page_list_bytes"),
-			"(FreeAndZeroPageListBytes)",
+			"The amount of physical memory, in bytes, that is assigned to the free and zero page lists. This memory does not contain cached data. It is immediately"+
+				" available for allocation to a process or for system use (FreeAndZeroPageListBytes)",
 			nil,
 			nil,
 		),
@@ -113,13 +116,14 @@ func NewMemoryCollector() (Collector, error) {
 		),
 		ModifiedPageListBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "modified_page_list_bytes"),
-			"(ModifiedPageListBytes)",
+			"The amount of physical memory, in bytes, that is assigned to the modified page list. This memory contains cached data and code that is not actively in "+
+				"use by processes, the system and the system cache (ModifiedPageListBytes)",
 			nil,
 			nil,
 		),
 		PageFaultsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "page_faults_total"),
-			"(PageFaultsPersec)",
+			"Overall rate at which faulted pages are handled by the processor (Page Faults/sec)",
 			nil,
 			nil,
 		),
@@ -161,14 +165,15 @@ func NewMemoryCollector() (Collector, error) {
 			nil,
 		),
 		PoolNonpagedBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "pool_nonpaged_bytes_total"),
-			"(PoolNonpagedBytes)",
+			prometheus.BuildFQName(Namespace, subsystem, "pool_nonpaged_bytes"),
+			"Number of bytes in the non-paged pool, an area of the system virtual memory that is used for objects that cannot be written to disk, but must "+
+				"remain in physical memory as long as they are allocated (PoolNonpagedBytes)",
 			nil,
 			nil,
 		),
 		PoolPagedAllocsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "pool_paged_allocs_total"),
-			"(PoolPagedAllocs)",
+			"Number of calls to allocate space in the paged pool, regardless of the amount of space allocated in each call (PoolPagedAllocs)",
 			nil,
 			nil,
 		),
@@ -180,67 +185,72 @@ func NewMemoryCollector() (Collector, error) {
 		),
 		PoolPagedResidentBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "pool_paged_resident_bytes"),
-			"(PoolPagedResidentBytes)",
+			"The size, in bytes, of the portion of the paged pool that is currently resident and active in physical memory. The paged pool is an area of the "+
+				"system virtual memory that is used for objects that can be written to disk when they are not being used (PoolPagedResidentBytes)",
 			nil,
 			nil,
 		),
 		StandbyCacheCoreBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "standby_cache_core_bytes"),
-			"(StandbyCacheCoreBytes)",
+			"The amount of physical memory, in bytes, that is assigned to the core standby cache page lists. This memory contains cached data and code that is "+
+				"not actively in use by processes, the system and the system cache (StandbyCacheCoreBytes)",
 			nil,
 			nil,
 		),
 		StandbyCacheNormalPriorityBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "standby_cache_normal_priority_bytes"),
-			"(StandbyCacheNormalPriorityBytes)",
+			"The amount of physical memory, in bytes, that is assigned to the normal priority standby cache page lists. This memory contains cached data and "+
+				"code that is not actively in use by processes, the system and the system cache (StandbyCacheNormalPriorityBytes)",
 			nil,
 			nil,
 		),
 		StandbyCacheReserveBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "standby_cache_reserve_bytes"),
-			"(StandbyCacheReserveBytes)",
+			"The amount of physical memory, in bytes, that is assigned to the reserve standby cache page lists. This memory contains cached data and code "+
+				"that is not actively in use by processes, the system and the system cache (StandbyCacheReserveBytes)",
 			nil,
 			nil,
 		),
 		SystemCacheResidentBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "system_cache_resident_bytes"),
-			"(SystemCacheResidentBytes)",
+			"The size, in bytes, of the portion of the system file cache which is currently resident and active in physical memory (SystemCacheResidentBytes)",
 			nil,
 			nil,
 		),
 		SystemCodeResidentBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "system_code_resident_bytes"),
-			"(SystemCodeResidentBytes)",
+			"The size, in bytes, of the pageable operating system code that is currently resident and active in physical memory (SystemCodeResidentBytes)",
 			nil,
 			nil,
 		),
 		SystemCodeTotalBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "system_code_total_bytes"),
-			"(SystemCodeTotalBytes)",
+			"The size, in bytes, of the pageable operating system code currently mapped into the system virtual address space (SystemCodeTotalBytes)",
 			nil,
 			nil,
 		),
 		SystemDriverResidentBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "system_driver_resident_bytes"),
-			"(SystemDriverResidentBytes)",
+			"The size, in bytes, of the pageable physical memory being used by device drivers. It is the working set (physical memory area) of the drivers (SystemDriverResidentBytes)",
 			nil,
 			nil,
 		),
 		SystemDriverTotalBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "system_driver_total_bytes"),
-			"(SystemDriverTotalBytes)",
+			"The size, in bytes, of the pageable virtual memory currently being used by device drivers. Pageable memory can be written to disk when it is not being used (SystemDriverTotalBytes)",
 			nil,
 			nil,
 		),
 		TransitionFaultsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "transition_faults_total"),
-			"(TransitionFaultsPersec)",
+			"Number of faults rate at which page faults are resolved by recovering pages that were being used by another process sharing the page, or were on the "+
+				"modified page list or the standby list, or were being written to disk at the time of the page fault (TransitionFaultsPersec)",
 			nil,
 			nil,
 		),
 		TransitionPagesRepurposedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "transition_pages_repurposed_total"),
-			"(TransitionPagesRePurposedPersec)",
+			"Transition Pages RePurposed is the rate at which the number of transition cache pages were reused for a different purpose (TransitionPagesRePurposedPersec)",
 			nil,
 			nil,
 		),
@@ -326,7 +336,7 @@ func (c *MemoryCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 
 	ch <- prometheus.MustNewConstMetric(
 		c.CacheFaultsTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].CacheFaultsPersec,
 	)
 
@@ -344,7 +354,7 @@ func (c *MemoryCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 
 	ch <- prometheus.MustNewConstMetric(
 		c.DemandZeroFaultsTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].DemandZeroFaultsPersec,
 	)
 
@@ -368,37 +378,37 @@ func (c *MemoryCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PageFaultsTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].PageFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPageReadsTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].PageReadsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPagesReadTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].PagesInputPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPagesWrittenTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].PagesOutputPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPageOperationsTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].PagesPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPageWritesTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].PageWritesPersec,
 	)
 
@@ -416,7 +426,7 @@ func (c *MemoryCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PoolPagedAllocsTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].PoolPagedAllocs,
 	)
 
@@ -482,19 +492,19 @@ func (c *MemoryCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 
 	ch <- prometheus.MustNewConstMetric(
 		c.TransitionFaultsTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].TransitionFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.TransitionPagesRepurposedTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].TransitionPagesRePurposedPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.WriteCopiesTotal,
-		prometheus.GaugeValue,
+		prometheus.CounterValue,
 		dst[0].WriteCopiesPersec,
 	)
 

collector/memory_test.go

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

collector/mscluster_network.go

@@ -0,0 +1,117 @@
+package collector
+
+import (
+	"github.com/StackExchange/wmi"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+func init() {
+	registerCollector("mscluster_network", newMSCluster_NetworkCollector)
+}
+
+// A MSCluster_NetworkCollector is a Prometheus collector for WMI MSCluster_Network metrics
+type MSCluster_NetworkCollector struct {
+	Characteristics *prometheus.Desc
+	Flags           *prometheus.Desc
+	Metric          *prometheus.Desc
+	Role            *prometheus.Desc
+	State           *prometheus.Desc
+}
+
+func newMSCluster_NetworkCollector() (Collector, error) {
+	const subsystem = "mscluster_network"
+	return &MSCluster_NetworkCollector{
+		Characteristics: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "characteristics"),
+			"Provides the characteristics of the network.",
+			[]string{"name"},
+			nil,
+		),
+		Flags: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "flags"),
+			"Provides access to the flags set for the node. ",
+			[]string{"name"},
+			nil,
+		),
+		Metric: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "metric"),
+			"The metric of a cluster network (networks with lower values are used first). If this value is set, then the AutoMetric property is set to false.",
+			[]string{"name"},
+			nil,
+		),
+		Role: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "role"),
+			"Provides access to the network's Role property. The Role property describes the role of the network in the cluster. 0: None; 1: Cluster; 2: Client; 3: Both ",
+			[]string{"name"},
+			nil,
+		),
+		State: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "state"),
+			"Provides the current state of the network. 1-1: Unknown; 0: Unavailable; 1: Down; 2: Partitioned; 3: Up",
+			[]string{"name"},
+			nil,
+		),
+	}, nil
+}
+
+// MSCluster_Network docs:
+// - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-network
+//
+type MSCluster_Network struct {
+	Name string
+
+	Characteristics uint
+	Flags           uint
+	Metric          uint
+	Role            uint
+	State           uint
+}
+
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *MSCluster_NetworkCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
+	var dst []MSCluster_Network
+	q := queryAll(&dst)
+	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
+		return err
+	}
+
+	for _, v := range dst {
+		ch <- prometheus.MustNewConstMetric(
+			c.Characteristics,
+			prometheus.GaugeValue,
+			float64(v.Characteristics),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Flags,
+			prometheus.GaugeValue,
+			float64(v.Flags),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Metric,
+			prometheus.GaugeValue,
+			float64(v.Metric),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Role,
+			prometheus.GaugeValue,
+			float64(v.Role),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.State,
+			prometheus.GaugeValue,
+			float64(v.State),
+			v.Name,
+		)
+	}
+
+	return nil
+}

collector/mscluster_node.go

@@ -0,0 +1,253 @@
+package collector
+
+import (
+	"github.com/StackExchange/wmi"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+func init() {
+	registerCollector("mscluster_node", newMSCluster_NodeCollector)
+}
+
+// A MSCluster_NodeCollector is a Prometheus collector for WMI MSCluster_Node metrics
+type MSCluster_NodeCollector struct {
+	BuildNumber           *prometheus.Desc
+	Characteristics       *prometheus.Desc
+	DetectedCloudPlatform *prometheus.Desc
+	DynamicWeight         *prometheus.Desc
+	Flags                 *prometheus.Desc
+	MajorVersion          *prometheus.Desc
+	MinorVersion          *prometheus.Desc
+	NeedsPreventQuorum    *prometheus.Desc
+	NodeDrainStatus       *prometheus.Desc
+	NodeHighestVersion    *prometheus.Desc
+	NodeLowestVersion     *prometheus.Desc
+	NodeWeight            *prometheus.Desc
+	State                 *prometheus.Desc
+	StatusInformation     *prometheus.Desc
+}
+
+func newMSCluster_NodeCollector() (Collector, error) {
+	const subsystem = "mscluster_node"
+	return &MSCluster_NodeCollector{
+		BuildNumber: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "build_number"),
+			"Provides access to the node's BuildNumber property.",
+			[]string{"name"},
+			nil,
+		),
+		Characteristics: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "characteristics"),
+			"Provides access to the characteristics set for the node.",
+			[]string{"name"},
+			nil,
+		),
+		DetectedCloudPlatform: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "detected_cloud_platform"),
+			"(DetectedCloudPlatform)",
+			[]string{"name"},
+			nil,
+		),
+		DynamicWeight: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "dynamic_weight"),
+			"The dynamic vote weight of the node adjusted by dynamic quorum feature.",
+			[]string{"name"},
+			nil,
+		),
+		Flags: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "flags"),
+			"Provides access to the flags set for the node.",
+			[]string{"name"},
+			nil,
+		),
+		MajorVersion: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "major_version"),
+			"Provides access to the node's MajorVersion property, which specifies the major portion of the Windows version installed.",
+			[]string{"name"},
+			nil,
+		),
+		MinorVersion: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "minor_version"),
+			"Provides access to the node's MinorVersion property, which specifies the minor portion of the Windows version installed.",
+			[]string{"name"},
+			nil,
+		),
+		NeedsPreventQuorum: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "needs_prevent_quorum"),
+			"Whether the cluster service on that node should be started with prevent quorum flag.",
+			[]string{"name"},
+			nil,
+		),
+		NodeDrainStatus: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "node_drain_status"),
+			"The current node drain status of a node. 0: Not Initiated; 1: In Progress; 2: Completed; 3: Failed",
+			[]string{"name"},
+			nil,
+		),
+		NodeHighestVersion: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "node_highest_version"),
+			"Provides access to the node's NodeHighestVersion property, which specifies the highest possible version of the cluster service with which the node can join or communicate.",
+			[]string{"name"},
+			nil,
+		),
+		NodeLowestVersion: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "node_lowest_version"),
+			"Provides access to the node's NodeLowestVersion property, which specifies the lowest possible version of the cluster service with which the node can join or communicate.",
+			[]string{"name"},
+			nil,
+		),
+		NodeWeight: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "node_weight"),
+			"The vote weight of the node.",
+			[]string{"name"},
+			nil,
+		),
+		State: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "state"),
+			"Returns the current state of a node. -1: Unknown; 0: Up; 1: Down; 2: Paused; 3: Joining",
+			[]string{"name"},
+			nil,
+		),
+		StatusInformation: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "status_information"),
+			"The isolation or quarantine status of the node.",
+			[]string{"name"},
+			nil,
+		),
+	}, nil
+}
+
+// MSCluster_Node docs:
+// - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-node
+//
+type MSCluster_Node struct {
+	Name string
+
+	BuildNumber           uint
+	Characteristics       uint
+	DetectedCloudPlatform uint
+	DynamicWeight         uint
+	Flags                 uint
+	MajorVersion          uint
+	MinorVersion          uint
+	NeedsPreventQuorum    uint
+	NodeDrainStatus       uint
+	NodeHighestVersion    uint
+	NodeLowestVersion     uint
+	NodeWeight            uint
+	State                 uint
+	StatusInformation     uint
+}
+
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *MSCluster_NodeCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
+	var dst []MSCluster_Node
+	q := queryAll(&dst)
+	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
+		return err
+	}
+
+	for _, v := range dst {
+
+		ch <- prometheus.MustNewConstMetric(
+			c.BuildNumber,
+			prometheus.GaugeValue,
+			float64(v.BuildNumber),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Characteristics,
+			prometheus.GaugeValue,
+			float64(v.Characteristics),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.DetectedCloudPlatform,
+			prometheus.GaugeValue,
+			float64(v.DetectedCloudPlatform),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.DynamicWeight,
+			prometheus.GaugeValue,
+			float64(v.DynamicWeight),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Flags,
+			prometheus.GaugeValue,
+			float64(v.Flags),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.MajorVersion,
+			prometheus.GaugeValue,
+			float64(v.MajorVersion),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.MinorVersion,
+			prometheus.GaugeValue,
+			float64(v.MinorVersion),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.NeedsPreventQuorum,
+			prometheus.GaugeValue,
+			float64(v.NeedsPreventQuorum),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.NodeDrainStatus,
+			prometheus.GaugeValue,
+			float64(v.NodeDrainStatus),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.NodeHighestVersion,
+			prometheus.GaugeValue,
+			float64(v.NodeHighestVersion),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.NodeLowestVersion,
+			prometheus.GaugeValue,
+			float64(v.NodeLowestVersion),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.NodeWeight,
+			prometheus.GaugeValue,
+			float64(v.NodeWeight),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.State,
+			prometheus.GaugeValue,
+			float64(v.State),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.StatusInformation,
+			prometheus.GaugeValue,
+			float64(v.StatusInformation),
+			v.Name,
+		)
+	}
+
+	return nil
+}

collector/mscluster_resource.go

@@ -0,0 +1,285 @@
+package collector
+
+import (
+	"github.com/StackExchange/wmi"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+func init() {
+	registerCollector("mscluster_resource", newMSCluster_ResourceCollector)
+}
+
+// A MSCluster_ResourceCollector is a Prometheus collector for WMI MSCluster_Resource metrics
+type MSCluster_ResourceCollector struct {
+	Characteristics        *prometheus.Desc
+	DeadlockTimeout        *prometheus.Desc
+	EmbeddedFailureAction  *prometheus.Desc
+	Flags                  *prometheus.Desc
+	IsAlivePollInterval    *prometheus.Desc
+	LooksAlivePollInterval *prometheus.Desc
+	MonitorProcessId       *prometheus.Desc
+	PendingTimeout         *prometheus.Desc
+	ResourceClass          *prometheus.Desc
+	RestartAction          *prometheus.Desc
+	RestartDelay           *prometheus.Desc
+	RestartPeriod          *prometheus.Desc
+	RestartThreshold       *prometheus.Desc
+	RetryPeriodOnFailure   *prometheus.Desc
+	State                  *prometheus.Desc
+	Subclass               *prometheus.Desc
+}
+
+func newMSCluster_ResourceCollector() (Collector, error) {
+	const subsystem = "mscluster_resource"
+	return &MSCluster_ResourceCollector{
+		Characteristics: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "characteristics"),
+			"Provides the characteristics of the object.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		DeadlockTimeout: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "deadlock_timeout"),
+			"Indicates the length of time to wait, in milliseconds, before declaring a deadlock in any call into a resource.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		EmbeddedFailureAction: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "embedded_failure_action"),
+			"The time, in milliseconds, that a resource should remain in a failed state before the Cluster service attempts to restart it.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		Flags: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "flags"),
+			"Provides access to the flags set for the object.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		IsAlivePollInterval: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "is_alive_poll_interval"),
+			"Provides access to the resource's IsAlivePollInterval property, which is the recommended interval in milliseconds at which the Cluster Service should poll the resource to determine whether it is operational. If the property is set to 0xFFFFFFFF, the Cluster Service uses the IsAlivePollInterval property for the resource type associated with the resource.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		LooksAlivePollInterval: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "looks_alive_poll_interval"),
+			"Provides access to the resource's LooksAlivePollInterval property, which is the recommended interval in milliseconds at which the Cluster Service should poll the resource to determine whether it appears operational. If the property is set to 0xFFFFFFFF, the Cluster Service uses the LooksAlivePollInterval property for the resource type associated with the resource.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		MonitorProcessId: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "monitor_process_id"),
+			"Provides the process ID of the resource host service that is currently hosting the resource.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		PendingTimeout: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "pending_timeout"),
+			"Provides access to the resource's PendingTimeout property. If a resource cannot be brought online or taken offline in the number of milliseconds specified by the PendingTimeout property, the resource is forcibly terminated.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		ResourceClass: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "resource_class"),
+			"Gets or sets the resource class of a resource. 0: Unknown; 1: Storage; 2: Network; 32768: Unknown ",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		RestartAction: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "restart_action"),
+			"Provides access to the resource's RestartAction property, which is the action to be taken by the Cluster Service if the resource fails.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		RestartDelay: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "restart_delay"),
+			"Indicates the time delay before a failed resource is restarted.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		RestartPeriod: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "restart_period"),
+			"Provides access to the resource's RestartPeriod property, which is interval of time, in milliseconds, during which a specified number of restart attempts can be made on a nonresponsive resource.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		RestartThreshold: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "restart_threshold"),
+			"Provides access to the resource's RestartThreshold property which is the maximum number of restart attempts that can be made on a resource within an interval defined by the RestartPeriod property before the Cluster Service initiates the action specified by the RestartAction property.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		RetryPeriodOnFailure: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "retry_period_on_failure"),
+			"Provides access to the resource's RetryPeriodOnFailure property, which is the interval of time (in milliseconds) that a resource should remain in a failed state before the Cluster service attempts to restart it.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		State: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "state"),
+			"The current state of the resource. -1: Unknown; 0: Inherited; 1: Initializing; 2: Online; 3: Offline; 4: Failed; 128: Pending; 129: Online Pending; 130: Offline Pending ",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+		Subclass: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "subclass"),
+			"Provides the list of references to nodes that can be the owner of this resource.",
+			[]string{"type", "owner_group", "name"},
+			nil,
+		),
+	}, nil
+}
+
+// MSCluster_Resource docs:
+// - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-resource
+//
+type MSCluster_Resource struct {
+	Name       string
+	Type       string
+	OwnerGroup string
+
+	Characteristics        uint
+	DeadlockTimeout        uint
+	EmbeddedFailureAction  uint
+	Flags                  uint
+	IsAlivePollInterval    uint
+	LooksAlivePollInterval uint
+	MonitorProcessId       uint
+	PendingTimeout         uint
+	ResourceClass          uint
+	RestartAction          uint
+	RestartDelay           uint
+	RestartPeriod          uint
+	RestartThreshold       uint
+	RetryPeriodOnFailure   uint
+	State                  uint
+	Subclass               uint
+}
+
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *MSCluster_ResourceCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
+	var dst []MSCluster_Resource
+	q := queryAll(&dst)
+	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
+		return err
+	}
+
+	for _, v := range dst {
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Characteristics,
+			prometheus.GaugeValue,
+			float64(v.Characteristics),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.DeadlockTimeout,
+			prometheus.GaugeValue,
+			float64(v.DeadlockTimeout),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.EmbeddedFailureAction,
+			prometheus.GaugeValue,
+			float64(v.EmbeddedFailureAction),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Flags,
+			prometheus.GaugeValue,
+			float64(v.Flags),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.IsAlivePollInterval,
+			prometheus.GaugeValue,
+			float64(v.IsAlivePollInterval),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.LooksAlivePollInterval,
+			prometheus.GaugeValue,
+			float64(v.LooksAlivePollInterval),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.MonitorProcessId,
+			prometheus.GaugeValue,
+			float64(v.MonitorProcessId),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.PendingTimeout,
+			prometheus.GaugeValue,
+			float64(v.PendingTimeout),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.ResourceClass,
+			prometheus.GaugeValue,
+			float64(v.ResourceClass),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.RestartAction,
+			prometheus.GaugeValue,
+			float64(v.RestartAction),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.RestartDelay,
+			prometheus.GaugeValue,
+			float64(v.RestartDelay),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.RestartPeriod,
+			prometheus.GaugeValue,
+			float64(v.RestartPeriod),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.RestartThreshold,
+			prometheus.GaugeValue,
+			float64(v.RestartThreshold),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.RetryPeriodOnFailure,
+			prometheus.GaugeValue,
+			float64(v.RetryPeriodOnFailure),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.State,
+			prometheus.GaugeValue,
+			float64(v.State),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Subclass,
+			prometheus.GaugeValue,
+			float64(v.Subclass),
+			v.Type, v.OwnerGroup, v.Name,
+		)
+	}
+
+	return nil
+}

collector/mscluster_resourcegroup.go

@@ -0,0 +1,241 @@
+package collector
+
+import (
+	"github.com/StackExchange/wmi"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+func init() {
+	registerCollector("mscluster_resourcegroup", newMSCluster_ResourceGroupCollector)
+}
+
+// A MSCluster_ResourceGroupCollector is a Prometheus collector for WMI MSCluster_ResourceGroup metrics
+type MSCluster_ResourceGroupCollector struct {
+	AutoFailbackType    *prometheus.Desc
+	Characteristics     *prometheus.Desc
+	ColdStartSetting    *prometheus.Desc
+	DefaultOwner        *prometheus.Desc
+	FailbackWindowEnd   *prometheus.Desc
+	FailbackWindowStart *prometheus.Desc
+	FailoverPeriod      *prometheus.Desc
+	FailoverThreshold   *prometheus.Desc
+	FaultDomain         *prometheus.Desc
+	Flags               *prometheus.Desc
+	GroupType           *prometheus.Desc
+	PlacementOptions    *prometheus.Desc
+	Priority            *prometheus.Desc
+	ResiliencyPeriod    *prometheus.Desc
+	State               *prometheus.Desc
+}
+
+func newMSCluster_ResourceGroupCollector() (Collector, error) {
+	const subsystem = "mscluster_resourcegroup"
+	return &MSCluster_ResourceGroupCollector{
+		AutoFailbackType: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "auto_failback_type"),
+			"Provides access to the group's AutoFailbackType property.",
+			[]string{"name"},
+			nil,
+		),
+		Characteristics: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "characteristics"),
+			"Provides the characteristics of the group.",
+			[]string{"name"},
+			nil,
+		),
+		ColdStartSetting: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "cold_start_setting"),
+			"Indicates whether a group can start after a cluster cold start.",
+			[]string{"name"},
+			nil,
+		),
+		DefaultOwner: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "default_owner"),
+			"Number of the last node the resource group was activated on or explicitly moved to.",
+			[]string{"name"},
+			nil,
+		),
+		FailbackWindowEnd: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "failback_window_end"),
+			"The FailbackWindowEnd property provides the latest time that the group can be moved back to the node identified as its preferred node.",
+			[]string{"name"},
+			nil,
+		),
+		FailbackWindowStart: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "failback_window_start"),
+			"The FailbackWindowStart property provides the earliest time (that is, local time as kept by the cluster) that the group can be moved back to the node identified as its preferred node.",
+			[]string{"name"},
+			nil,
+		),
+		FailoverPeriod: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "failover_period"),
+			"The FailoverPeriod property specifies a number of hours during which a maximum number of failover attempts, specified by the FailoverThreshold property, can occur.",
+			[]string{"name"},
+			nil,
+		),
+		FailoverThreshold: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "failover_threshold"),
+			"The FailoverThreshold property specifies the maximum number of failover attempts.",
+			[]string{"name"},
+			nil,
+		),
+		Flags: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "flags"),
+			"Provides access to the flags set for the group. ",
+			[]string{"name"},
+			nil,
+		),
+		GroupType: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "group_type"),
+			"The Type of the resource group.",
+			[]string{"name"},
+			nil,
+		),
+		Priority: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "priority"),
+			"Priority value of the resource group",
+			[]string{"name"},
+			nil,
+		),
+		ResiliencyPeriod: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "resiliency_period"),
+			"The resiliency period for this group, in seconds.",
+			[]string{"name"},
+			nil,
+		),
+		State: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "state"),
+			"The current state of the resource group. -1: Unknown; 0: Online; 1: Offline; 2: Failed; 3: Partial Online; 4: Pending",
+			[]string{"name"},
+			nil,
+		),
+	}, nil
+}
+
+// MSCluster_ResourceGroup docs:
+// - https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cluswmi/mscluster-resourcegroup
+//
+type MSCluster_ResourceGroup struct {
+	Name string
+
+	AutoFailbackType    uint
+	Characteristics     uint
+	ColdStartSetting    uint
+	DefaultOwner        uint
+	FailbackWindowEnd   int
+	FailbackWindowStart int
+	FailoverPeriod      uint
+	FailoverThreshold   uint
+	Flags               uint
+	GroupType           uint
+	Priority            uint
+	ResiliencyPeriod    uint
+	State               uint
+}
+
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *MSCluster_ResourceGroupCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
+	var dst []MSCluster_ResourceGroup
+	q := queryAll(&dst)
+	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
+		return err
+	}
+
+	for _, v := range dst {
+
+		ch <- prometheus.MustNewConstMetric(
+			c.AutoFailbackType,
+			prometheus.GaugeValue,
+			float64(v.AutoFailbackType),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Characteristics,
+			prometheus.GaugeValue,
+			float64(v.Characteristics),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.ColdStartSetting,
+			prometheus.GaugeValue,
+			float64(v.ColdStartSetting),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.DefaultOwner,
+			prometheus.GaugeValue,
+			float64(v.DefaultOwner),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.FailbackWindowEnd,
+			prometheus.GaugeValue,
+			float64(v.FailbackWindowEnd),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.FailbackWindowStart,
+			prometheus.GaugeValue,
+			float64(v.FailbackWindowStart),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.FailoverPeriod,
+			prometheus.GaugeValue,
+			float64(v.FailoverPeriod),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.FailoverThreshold,
+			prometheus.GaugeValue,
+			float64(v.FailoverThreshold),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Flags,
+			prometheus.GaugeValue,
+			float64(v.Flags),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.GroupType,
+			prometheus.GaugeValue,
+			float64(v.GroupType),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.Priority,
+			prometheus.GaugeValue,
+			float64(v.Priority),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.ResiliencyPeriod,
+			prometheus.GaugeValue,
+			float64(v.ResiliencyPeriod),
+			v.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.State,
+			prometheus.GaugeValue,
+			float64(v.State),
+			v.Name,
+		)
+
+	}
+
+	return nil
+}

collector/msmq.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -6,8 +7,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"
 )
 
@@ -93,29 +94,27 @@ 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

@@ -0,0 +1,10 @@
+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

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

collector/net.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -6,8 +7,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"
 )
 
@@ -70,25 +71,25 @@ func NewNetworkCollector() (Collector, error) {
 			nil,
 		),
 		PacketsOutboundDiscarded: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_discarded"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_discarded_total"),
 			"(Network.PacketsOutboundDiscarded)",
 			[]string{"nic"},
 			nil,
 		),
 		PacketsOutboundErrors: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_errors"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_outbound_errors_total"),
 			"(Network.PacketsOutboundErrors)",
 			[]string{"nic"},
 			nil,
 		),
 		PacketsReceivedDiscarded: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_received_discarded"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_received_discarded_total"),
 			"(Network.PacketsReceivedDiscarded)",
 			[]string{"nic"},
 			nil,
 		),
 		PacketsReceivedErrors: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_received_errors"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_received_errors_total"),
 			"(Network.PacketsReceivedErrors)",
 			[]string{"nic"},
 			nil,
@@ -100,7 +101,7 @@ func NewNetworkCollector() (Collector, error) {
 			nil,
 		),
 		PacketsReceivedUnknown: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "packets_received_unknown"),
+			prometheus.BuildFQName(Namespace, subsystem, "packets_received_unknown_total"),
 			"(Network.PacketsReceivedUnknown)",
 			[]string{"nic"},
 			nil,
@@ -118,7 +119,7 @@ func NewNetworkCollector() (Collector, error) {
 			nil,
 		),
 		CurrentBandwidth: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "current_bandwidth"),
+			prometheus.BuildFQName(Namespace, subsystem, "current_bandwidth_bytes"),
 			"(Network.CurrentBandwidth)",
 			[]string{"nic"},
 			nil,
@@ -251,7 +252,7 @@ func (c *NetworkCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 		ch <- prometheus.MustNewConstMetric(
 			c.CurrentBandwidth,
 			prometheus.GaugeValue,
-			nic.CurrentBandwidth,
+			nic.CurrentBandwidth/8,
 			name,
 		)
 	}

collector/net_test.go

@@ -1,8 +1,11 @@
+//go:build windows
 // +build windows
 
 package collector
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestNetworkToInstanceName(t *testing.T) {
 	data := map[string]string{
@@ -15,3 +18,10 @@ 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,11 +1,12 @@
+//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

@@ -0,0 +1,10 @@
+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,11 +1,12 @@
+//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

@@ -0,0 +1,10 @@
+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,11 +1,12 @@
+//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

@@ -0,0 +1,10 @@
+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,11 +1,12 @@
+//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

@@ -0,0 +1,10 @@
+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,11 +1,12 @@
+//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

@@ -0,0 +1,10 @@
+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,11 +1,12 @@
+//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() {
@@ -123,26 +124,31 @@ func (c *NETFramework_NETCLRMemoryCollector) Collect(ctx *ScrapeContext, ch chan
 type Win32_PerfRawData_NETFramework_NETCLRMemory struct {
 	Name string
 
-	AllocatedBytesPersec               uint64
-	FinalizationSurvivors              uint64
-	Frequency_PerfTime                 uint64
-	Gen0heapsize                       uint64
-	Gen0PromotedBytesPerSec            uint64
-	Gen1heapsize                       uint64
-	Gen1PromotedBytesPerSec            uint64
-	Gen2heapsize                       uint64
-	LargeObjectHeapsize                uint64
-	NumberBytesinallHeaps              uint64
-	NumberGCHandles                    uint64
-	NumberGen0Collections              uint64
-	NumberGen1Collections              uint64
-	NumberGen2Collections              uint64
-	NumberInducedGC                    uint64
-	NumberofPinnedObjects              uint64
-	NumberofSinkBlocksinuse            uint64
-	NumberTotalcommittedBytes          uint64
-	NumberTotalreservedBytes           uint64
-	PercentTimeinGC                    uint32
+	AllocatedBytesPersec      uint64
+	FinalizationSurvivors     uint64
+	Frequency_PerfTime        uint64
+	Gen0heapsize              uint64
+	Gen0PromotedBytesPerSec   uint64
+	Gen1heapsize              uint64
+	Gen1PromotedBytesPerSec   uint64
+	Gen2heapsize              uint64
+	LargeObjectHeapsize       uint64
+	NumberBytesinallHeaps     uint64
+	NumberGCHandles           uint64
+	NumberGen0Collections     uint64
+	NumberGen1Collections     uint64
+	NumberGen2Collections     uint64
+	NumberInducedGC           uint64
+	NumberofPinnedObjects     uint64
+	NumberofSinkBlocksinuse   uint64
+	NumberTotalcommittedBytes uint64
+	NumberTotalreservedBytes  uint64
+	// PercentTimeinGC has countertype=PERF_RAW_FRACTION.
+	// Formula: (100 * CounterValue) / BaseValue
+	// By docs https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/scripting-articles/ms974615(v=msdn.10)#perf_raw_fraction
+	PercentTimeinGC uint32
+	// BaseValue is just a "magic" number used to make the calculation come out right.
+	PercentTimeinGC_base               uint32
 	ProcessID                          uint64
 	PromotedFinalizationMemoryfromGen0 uint64
 	PromotedMemoryfromGen0             uint64
@@ -293,7 +299,7 @@ func (c *NETFramework_NETCLRMemoryCollector) collect(ch chan<- prometheus.Metric
 		ch <- prometheus.MustNewConstMetric(
 			c.TimeinGC,
 			prometheus.GaugeValue,
-			float64(process.PercentTimeinGC)/float64(process.Frequency_PerfTime),
+			float64(100*process.PercentTimeinGC)/float64(process.PercentTimeinGC_base),
 			process.Name,
 		)
 	}

collector/netframework_clrmemory_test.go

@@ -0,0 +1,10 @@
+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,11 +1,12 @@
+//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

@@ -0,0 +1,10 @@
+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,11 +1,12 @@
+//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

@@ -0,0 +1,10 @@
+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,18 +1,24 @@
+//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"errors"
+	"fmt"
+	"os"
+	"strings"
 	"time"
 
-	"github.com/StackExchange/wmi"
+	"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/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/log"
+	"golang.org/x/sys/windows/registry"
 )
 
 func init() {
-	registerCollector("os", NewOSCollector)
+	registerCollector("os", NewOSCollector, "Paging File")
 }
 
 // A OSCollector is a Prometheus collector for WMI metrics
@@ -32,6 +38,12 @@ 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"
@@ -40,7 +52,7 @@ func NewOSCollector() (Collector, error) {
 		OSInformation: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "info"),
 			"OperatingSystem.Caption, OperatingSystem.Version",
-			[]string{"product", "version"},
+			[]string{"product", "version", "major_version", "minor_version", "build_number"},
 			nil,
 		),
 		PagingLimitBytes: prometheus.NewDesc(
@@ -86,7 +98,7 @@ func NewOSCollector() (Collector, error) {
 			nil,
 		),
 		ProcessMemoryLimitBytes: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "process_memory_limix_bytes"),
+			prometheus.BuildFQName(Namespace, subsystem, "process_memory_limit_bytes"),
 			"OperatingSystem.MaxProcessMemorySize",
 			nil,
 			nil,
@@ -121,7 +133,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(ch); err != nil {
+	if desc, err := c.collect(ctx, ch); err != nil {
 		log.Error("failed collecting os metrics:", desc, err)
 		return err
 	}
@@ -146,41 +158,103 @@ type Win32_OperatingSystem struct {
 	Version                 string
 }
 
-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 {
+func (c *OSCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	nwgi, err := netapi32.GetWorkstationInfo()
+	if err != nil {
 		return nil, err
 	}
 
-	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
+	gmse, err := sysinfoapi.GlobalMemoryStatusEx()
+	if err != nil {
+		return nil, err
 	}
 
+	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, _, pagingErr := memManKey.GetStringsValue("ExistingPageFiles")
+	// 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)
+		// For unknown reasons, Windows doesn't always create a page file. Continue collection rather than aborting.
+		if err != nil {
+			log.Debugf("Failed to read page file (reason: %s): %s\n", err, fileString)
+		} else {
+			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,
-		dst[0].Caption,
-		dst[0].Version,
+		fmt.Sprintf("Microsoft %s", pn), // Caption
+		fmt.Sprintf("%d.%d.%s", nwgi.VersionMajor, nwgi.VersionMinor, bn), // Version
+		fmt.Sprintf("%d", nwgi.VersionMajor),                              // Major Version
+		fmt.Sprintf("%d", nwgi.VersionMinor),                              // Minor Version
+		bn,                                                                // Build number
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PhysicalMemoryFreeBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].FreePhysicalMemory*1024), // KiB -> bytes
+		float64(gmse.AvailPhys),
 	)
 
-	time := dst[0].LocalDateTime
-
 	ch <- prometheus.MustNewConstMetric(
 		c.Time,
 		prometheus.GaugeValue,
-		float64(time.Unix()),
+		float64(currentTime.Unix()),
 	)
 
-	timezoneName, _ := time.Zone()
-
 	ch <- prometheus.MustNewConstMetric(
 		c.Timezone,
 		prometheus.GaugeValue,
@@ -188,58 +262,64 @@ func (c *OSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, er
 		timezoneName,
 	)
 
-	ch <- prometheus.MustNewConstMetric(
-		c.PagingFreeBytes,
-		prometheus.GaugeValue,
-		float64(dst[0].FreeSpaceInPagingFiles*1024), // KiB -> bytes
-	)
+	if pagingErr == nil {
+		ch <- prometheus.MustNewConstMetric(
+			c.PagingFreeBytes,
+			prometheus.GaugeValue,
+			pfb,
+		)
 
+		ch <- prometheus.MustNewConstMetric(
+			c.PagingLimitBytes,
+			prometheus.GaugeValue,
+			fsipf,
+		)
+	} else {
+		log.Debugln("Could not find HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management key. windows_os_paging_free_bytes and windows_os_paging_limit_bytes will be omitted.")
+	}
 	ch <- prometheus.MustNewConstMetric(
 		c.VirtualMemoryFreeBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].FreeVirtualMemory*1024), // KiB -> bytes
+		float64(gmse.AvailPageFile),
 	)
 
+	// 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(dst[0].MaxNumberOfProcesses),
+		float64(4294967295),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ProcessMemoryLimitBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].MaxProcessMemorySize*1024), // KiB -> bytes
+		float64(gmse.TotalVirtual),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.Processes,
 		prometheus.GaugeValue,
-		float64(dst[0].NumberOfProcesses),
+		float64(gpi.ProcessCount),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.Users,
 		prometheus.GaugeValue,
-		float64(dst[0].NumberOfUsers),
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.PagingLimitBytes,
-		prometheus.GaugeValue,
-		float64(dst[0].SizeStoredInPagingFiles*1024), // KiB -> bytes
+		float64(nwgi.LoggedOnUsers),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.VirtualMemoryBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].TotalVirtualMemorySize*1024), // KiB -> bytes
+		float64(gmse.TotalPageFile),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.VisibleMemoryBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].TotalVisibleMemorySize*1024), // KiB -> bytes
+		float64(gmse.TotalPhys),
 	)
 
 	return nil, nil

collector/os_test.go

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

collector/perflib.go

@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"reflect"
 	"strconv"
+	"strings"
 
 	perflibCollector "github.com/leoluk/perflib_exporter/collector"
 	"github.com/leoluk/perflib_exporter/perflib"
-	"github.com/prometheus/common/log"
+	"github.com/prometheus-community/windows_exporter/log"
 )
 
 var nametable = perflib.QueryNameTable("Counter 009") // Reads the names in English TODO: validate that the English names are always present
@@ -67,6 +68,16 @@ func unmarshalObject(obj *perflib.PerfObject, vs interface{}) error {
 			if tag == "" {
 				continue
 			}
+			secondValue := false
+
+			st := strings.Split(tag, ",")
+			tag = st[0]
+
+			for _, t := range st {
+				if t == "secondvalue" {
+					secondValue = true
+				}
+			}
 
 			ctr, found := counters[tag]
 			if !found {
@@ -80,6 +91,14 @@ func unmarshalObject(obj *perflib.PerfObject, vs interface{}) error {
 				return fmt.Errorf("tagged field %v has wrong type %v, must be float64", f.Name, fieldType)
 			}
 
+			if secondValue {
+				if !ctr.Def.HasSecondValue {
+					return fmt.Errorf("tagged field %v expected a SecondValue, which was not present", f.Name)
+				}
+				target.Field(i).SetFloat(float64(ctr.SecondValue))
+				continue
+			}
+
 			switch ctr.Def.CounterType {
 			case perflibCollector.PERF_ELAPSED_TIME:
 				target.Field(i).SetFloat(float64(ctr.Value-windowsEpoch) / float64(obj.Frequency))

collector/perflib_test.go

@@ -11,6 +11,7 @@ import (
 type simple struct {
 	ValA float64 `perflib:"Something"`
 	ValB float64 `perflib:"Something Else"`
+	ValC float64 `perflib:"Something Else,secondvalue"`
 }
 
 func TestUnmarshalPerflib(t *testing.T) {
@@ -62,16 +63,18 @@ func TestUnmarshalPerflib(t *testing.T) {
 							},
 							{
 								Def: &perflib.PerfCounterDef{
-									Name:        "Something Else",
-									CounterType: perflibCollector.PERF_COUNTER_COUNTER,
+									Name:           "Something Else",
+									CounterType:    perflibCollector.PERF_COUNTER_COUNTER,
+									HasSecondValue: true,
 								},
-								Value: 256,
+								Value:       256,
+								SecondValue: 222,
 							},
 						},
 					},
 				},
 			},
-			expectedOutput: []simple{{ValA: 123, ValB: 256}},
+			expectedOutput: []simple{{ValA: 123, ValB: 256, ValC: 222}},
 			expectError:    false,
 		},
 		{

collector/process.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -9,8 +10,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"
 )
 
@@ -42,6 +43,8 @@ type processCollector struct {
 	PrivateBytes      *prometheus.Desc
 	ThreadCount       *prometheus.Desc
 	VirtualBytes      *prometheus.Desc
+	WorkingSetPrivate *prometheus.Desc
+	WorkingSetPeak    *prometheus.Desc
 	WorkingSet        *prometheus.Desc
 
 	processWhitelistPattern *regexp.Regexp
@@ -65,43 +68,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). 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.",
+			"Returns elapsed time that all of the threads of this process used the processor to execute instructions by mode (privileged, user).",
 			[]string{"process", "process_id", "creating_process_id", "mode"},
 			nil,
 		),
 		HandleCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "handle_count"),
+			prometheus.BuildFQName(Namespace, subsystem, "handles"),
 			"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). 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. ",
+			"Bytes issued to I/O operations in different modes (read, write, other).",
 			[]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). 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. ",
+			"I/O operations issued in different modes (read, write, other).",
 			[]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. 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.",
+			"Page faults by the threads executing in this process.",
 			[]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). 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.",
+			"Current number of bytes this process has used in the paging file(s).",
 			[]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. 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.",
+			"Pool Bytes is the last observed number of bytes in the paged or nonpaged pool.",
 			[]string{"process", "process_id", "creating_process_id", "pool"},
 			nil,
 		),
@@ -118,20 +121,32 @@ func newProcessCollector() (Collector, error) {
 			nil,
 		),
 		ThreadCount: prometheus.NewDesc(
-			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.",
+			prometheus.BuildFQName(Namespace, subsystem, "threads"),
+			"Number of threads currently active in this process.",
 			[]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. 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.",
+			"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.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
 		WorkingSet: prometheus.NewDesc(
-			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.",
+			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.",
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
@@ -380,6 +395,24 @@ func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 			cpid,
 		)
 
+		ch <- prometheus.MustNewConstMetric(
+			c.WorkingSetPrivate,
+			prometheus.GaugeValue,
+			process.WorkingSetPrivate,
+			processName,
+			pid,
+			cpid,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.WorkingSetPeak,
+			prometheus.GaugeValue,
+			process.WorkingSetPeak,
+			processName,
+			pid,
+			cpid,
+		)
+
 		ch <- prometheus.MustNewConstMetric(
 			c.WorkingSet,
 			prometheus.GaugeValue,

collector/process_test.go

@@ -0,0 +1,14 @@
+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,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -5,8 +6,8 @@ package collector
 import (
 	"strings"
 
+	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -60,7 +61,7 @@ func NewRemoteFx() (Collector, error) {
 		),
 		CurrentTCPBandwidth: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "net_current_tcp_bandwidth"),
-			"TCP Bandwidth detected in bytes per seccond.",
+			"TCP Bandwidth detected in bytes per second.",
 			[]string{"session_name"},
 			nil,
 		),
@@ -345,7 +346,3 @@ func (c *RemoteFxCollector) collectRemoteFXGraphicsCounters(ctx *ScrapeContext,
 
 	return nil, nil
 }
-
-func milliSecToSec(t float64) float64 {
-	return t / 1000
-}

collector/remote_fx_test.go

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

collector/scheduled_task.go

@@ -0,0 +1,346 @@
+//go:build windows
+// +build windows
+
+package collector
+
+import (
+	"fmt"
+	"regexp"
+	"runtime"
+	"strings"
+
+	ole "github.com/go-ole/go-ole"
+	"github.com/go-ole/go-ole/oleutil"
+	"github.com/prometheus-community/windows_exporter/log"
+	"github.com/prometheus/client_golang/prometheus"
+	"gopkg.in/alecthomas/kingpin.v2"
+)
+
+var (
+	taskWhitelist = kingpin.Flag(
+		"collector.scheduled_task.whitelist",
+		"Regexp of tasks to whitelist. Task path must both match whitelist and not match blacklist to be included.",
+	).Default(".+").String()
+	taskBlacklist = kingpin.Flag(
+		"collector.scheduled_task.blacklist",
+		"Regexp of tasks to blacklist. Task path must both match whitelist and not match blacklist to be included.",
+	).String()
+)
+
+type ScheduledTaskCollector struct {
+	LastResult *prometheus.Desc
+	MissedRuns *prometheus.Desc
+	State      *prometheus.Desc
+
+	taskWhitelistPattern *regexp.Regexp
+	taskBlacklistPattern *regexp.Regexp
+}
+
+// TaskState ...
+// https://docs.microsoft.com/en-us/windows/desktop/api/taskschd/ne-taskschd-task_state
+type TaskState uint
+
+type TaskResult uint
+
+const (
+	TASK_STATE_UNKNOWN TaskState = iota
+	TASK_STATE_DISABLED
+	TASK_STATE_QUEUED
+	TASK_STATE_READY
+	TASK_STATE_RUNNING
+	TASK_RESULT_SUCCESS TaskResult = 0x0
+)
+
+// RegisteredTask ...
+type ScheduledTask struct {
+	Name            string
+	Path            string
+	Enabled         bool
+	State           TaskState
+	MissedRunsCount float64
+	LastTaskResult  TaskResult
+}
+
+type ScheduledTasks []ScheduledTask
+
+func init() {
+	registerCollector("scheduled_task", NewScheduledTask)
+}
+
+// NewScheduledTask ...
+func NewScheduledTask() (Collector, error) {
+	const subsystem = "scheduled_task"
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	err := ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
+	if err != nil {
+		code := err.(*ole.OleError).Code()
+		if code != ole.S_OK && code != S_FALSE {
+			return nil, err
+		}
+	}
+	defer ole.CoUninitialize()
+
+	return &ScheduledTaskCollector{
+		LastResult: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "last_result"),
+			"The result that was returned the last time the registered task was run",
+			[]string{"task"},
+			nil,
+		),
+
+		MissedRuns: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "missed_runs"),
+			"The number of times the registered task missed a scheduled run",
+			[]string{"task"},
+			nil,
+		),
+
+		State: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "state"),
+			"The current state of a scheduled task",
+			[]string{"task", "state"},
+			nil,
+		),
+
+		taskWhitelistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *taskWhitelist)),
+		taskBlacklistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *taskBlacklist)),
+	}, nil
+}
+
+func (c *ScheduledTaskCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
+	if desc, err := c.collect(ch); err != nil {
+		log.Error("failed collecting user metrics:", desc, err)
+		return err
+	}
+
+	return nil
+}
+
+var TASK_STATES = []string{"disabled", "queued", "ready", "running", "unknown"}
+
+func (c *ScheduledTaskCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	scheduledTasks, err := getScheduledTasks()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, task := range scheduledTasks {
+		if c.taskBlacklistPattern.MatchString(task.Path) ||
+			!c.taskWhitelistPattern.MatchString(task.Path) {
+			continue
+		}
+
+		lastResult := 0.0
+		if task.LastTaskResult == TASK_RESULT_SUCCESS {
+			lastResult = 1.0
+		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.LastResult,
+			prometheus.GaugeValue,
+			lastResult,
+			task.Path,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.MissedRuns,
+			prometheus.GaugeValue,
+			task.MissedRunsCount,
+			task.Path,
+		)
+
+		for _, state := range TASK_STATES {
+			var stateValue float64
+
+			if strings.ToLower(task.State.String()) == state {
+				stateValue = 1.0
+			}
+
+			ch <- prometheus.MustNewConstMetric(
+				c.State,
+				prometheus.GaugeValue,
+				stateValue,
+				task.Path,
+				state,
+			)
+		}
+	}
+
+	return nil, nil
+}
+
+const SCHEDULED_TASK_PROGRAM_ID = "Schedule.Service.1"
+
+// S_FALSE is returned by CoInitialize if it was already called on this thread.
+const S_FALSE = 0x00000001
+
+func getScheduledTasks() (scheduledTasks ScheduledTasks, err error) {
+	schedClassID, err := ole.ClassIDFrom(SCHEDULED_TASK_PROGRAM_ID)
+	if err != nil {
+		return scheduledTasks, err
+	}
+
+	taskSchedulerObj, err := ole.CreateInstance(schedClassID, nil)
+	if err != nil || taskSchedulerObj == nil {
+		return scheduledTasks, err
+	}
+	defer taskSchedulerObj.Release()
+
+	taskServiceObj := taskSchedulerObj.MustQueryInterface(ole.IID_IDispatch)
+	_, err = oleutil.CallMethod(taskServiceObj, "Connect")
+	if err != nil {
+		return scheduledTasks, err
+	}
+	defer taskServiceObj.Release()
+
+	res, err := oleutil.CallMethod(taskServiceObj, "GetFolder", `\`)
+	if err != nil {
+		return scheduledTasks, err
+	}
+
+	rootFolderObj := res.ToIDispatch()
+	defer rootFolderObj.Release()
+
+	err = fetchTasksRecursively(rootFolderObj, &scheduledTasks)
+
+	return scheduledTasks, err
+}
+
+func fetchTasksInFolder(folder *ole.IDispatch, scheduledTasks *ScheduledTasks) error {
+	res, err := oleutil.CallMethod(folder, "GetTasks", 1)
+	if err != nil {
+		return err
+	}
+
+	tasks := res.ToIDispatch()
+	defer tasks.Release()
+
+	err = oleutil.ForEach(tasks, func(v *ole.VARIANT) error {
+		task := v.ToIDispatch()
+		defer task.Release()
+
+		parsedTask, err := parseTask(task)
+		if err != nil {
+			return err
+		}
+
+		*scheduledTasks = append(*scheduledTasks, parsedTask)
+
+		return nil
+	})
+
+	return err
+}
+
+func fetchTasksRecursively(folder *ole.IDispatch, scheduledTasks *ScheduledTasks) error {
+	if err := fetchTasksInFolder(folder, scheduledTasks); err != nil {
+		return err
+	}
+
+	res, err := oleutil.CallMethod(folder, "GetFolders", 1)
+	if err != nil {
+		return err
+	}
+
+	subFolders := res.ToIDispatch()
+	defer subFolders.Release()
+
+	err = oleutil.ForEach(subFolders, func(v *ole.VARIANT) error {
+		subFolder := v.ToIDispatch()
+		defer subFolder.Release()
+		return fetchTasksRecursively(subFolder, scheduledTasks)
+	})
+
+	return err
+}
+
+func parseTask(task *ole.IDispatch) (scheduledTask ScheduledTask, err error) {
+	taskNameVar, err := oleutil.GetProperty(task, "Name")
+	if err != nil {
+		return scheduledTask, err
+	}
+	defer func() {
+		if tempErr := taskNameVar.Clear(); tempErr != nil {
+			err = tempErr
+		}
+	}()
+
+	taskPathVar, err := oleutil.GetProperty(task, "Path")
+	if err != nil {
+		return scheduledTask, err
+	}
+	defer func() {
+		if tempErr := taskPathVar.Clear(); tempErr != nil {
+			err = tempErr
+		}
+	}()
+
+	taskEnabledVar, err := oleutil.GetProperty(task, "Enabled")
+	if err != nil {
+		return scheduledTask, err
+	}
+	defer func() {
+		if tempErr := taskEnabledVar.Clear(); tempErr != nil {
+			err = tempErr
+		}
+	}()
+
+	taskStateVar, err := oleutil.GetProperty(task, "State")
+	if err != nil {
+		return scheduledTask, err
+	}
+	defer func() {
+		if tempErr := taskStateVar.Clear(); tempErr != nil {
+			err = tempErr
+		}
+	}()
+
+	taskNumberOfMissedRunsVar, err := oleutil.GetProperty(task, "NumberOfMissedRuns")
+	if err != nil {
+		return scheduledTask, err
+	}
+	defer func() {
+		if tempErr := taskNumberOfMissedRunsVar.Clear(); tempErr != nil {
+			err = tempErr
+		}
+	}()
+
+	taskLastTaskResultVar, err := oleutil.GetProperty(task, "LastTaskResult")
+	if err != nil {
+		return scheduledTask, err
+	}
+	defer func() {
+		if tempErr := taskLastTaskResultVar.Clear(); tempErr != nil {
+			err = tempErr
+		}
+	}()
+
+	scheduledTask.Name = taskNameVar.ToString()
+	scheduledTask.Path = strings.ReplaceAll(taskPathVar.ToString(), "\\", "/")
+	scheduledTask.Enabled = taskEnabledVar.Value().(bool)
+	scheduledTask.State = TaskState(taskStateVar.Val)
+	scheduledTask.MissedRunsCount = float64(taskNumberOfMissedRunsVar.Val)
+	scheduledTask.LastTaskResult = TaskResult(taskLastTaskResultVar.Val)
+
+	return scheduledTask, err
+}
+
+func (t TaskState) String() string {
+	switch t {
+	case TASK_STATE_UNKNOWN:
+		return "Unknown"
+	case TASK_STATE_DISABLED:
+		return "Disabled"
+	case TASK_STATE_QUEUED:
+		return "Queued"
+	case TASK_STATE_READY:
+		return "Ready"
+	case TASK_STATE_RUNNING:
+		return "Running"
+	default:
+		return ""
+	}
+}

collector/scheduled_task_test.go

@@ -0,0 +1,9 @@
+package collector
+
+import (
+	"testing"
+)
+
+func BenchmarkScheduledTaskCollector(b *testing.B) {
+	benchmarkCollector(b, "scheduled_task", NewScheduledTask)
+}

collector/service.go

@@ -1,14 +1,18 @@
+//go:build windows
 // +build windows
 
 package collector
 
 import (
-	"strconv"
+	"fmt"
 	"strings"
+	"syscall"
 
 	"github.com/StackExchange/wmi"
+	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/log"
+	"golang.org/x/sys/windows"
+	"golang.org/x/sys/windows/svc/mgr"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -21,6 +25,10 @@ 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
@@ -40,6 +48,9 @@ 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(
@@ -73,9 +84,16 @@ 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 desc, err := c.collect(ch); err != nil {
-		log.Error("failed collecting service metrics:", desc, err)
-		return err
+	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
+		}
 	}
 	return nil
 }
@@ -103,6 +121,15 @@ 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",
@@ -110,6 +137,13 @@ 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",
@@ -126,14 +160,14 @@ var (
 	}
 )
 
-func (c *serviceCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *serviceCollector) collectWMI(ch chan<- prometheus.Metric) error {
 	var dst []Win32_Service
 	q := queryAllWhere(&dst, c.queryWhereClause)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 	for _, service := range dst {
-		pid := strconv.FormatUint(uint64(service.ProcessId), 10)
+		pid := fmt.Sprintf("%d", uint64(service.ProcessId))
 
 		runAs := ""
 		if service.StartName != nil {
@@ -191,5 +225,95 @@ func (c *serviceCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 			)
 		}
 	}
-	return nil, nil
+	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 {
+		// Get UTF16 service name.
+		serviceName, err := syscall.UTF16PtrFromString(service)
+		if err != nil {
+			log.Warnf("Service %s get name error:  %#v", service, err)
+			continue
+		}
+
+		// Open connection for service handler.
+		serviceHandle, err := windows.OpenService(svcmgrConnection.Handle, serviceName, windows.GENERIC_READ)
+		if err != nil {
+			log.Warnf("Open service %s error:  %#v", service, err)
+			continue
+		}
+
+		// Create handle for each service.
+		serviceManager := &mgr.Service{Name: service, Handle: serviceHandle}
+		defer serviceManager.Close()
+
+		// Get Service Configuration.
+		serviceConfig, err := serviceManager.Config()
+		if err != nil {
+			log.Warnf("Get ervice %s config error:  %#v", service, err)
+			continue
+		}
+
+		// Get Service Current Status.
+		serviceStatus, err := serviceManager.Query()
+		if err != nil {
+			log.Warnf("Get service %s status error:  %#v", service, err)
+			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
 }

collector/service_test.go

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

collector/smtp.go

@@ -0,0 +1,694 @@
+//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

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

collector/system.go

@@ -1,10 +1,11 @@
+//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

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

collector/tcp.go

@@ -1,10 +1,11 @@
+//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() {
@@ -30,13 +31,13 @@ func NewTCPCollector() (Collector, error) {
 
 	return &TCPCollector{
 		ConnectionFailures: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connection_failures"),
+			prometheus.BuildFQName(Namespace, subsystem, "connection_failures_total"),
 			"(TCP.ConnectionFailures)",
 			[]string{"af"},
 			nil,
 		),
 		ConnectionsActive: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connections_active"),
+			prometheus.BuildFQName(Namespace, subsystem, "connections_active_total"),
 			"(TCP.ConnectionsActive)",
 			[]string{"af"},
 			nil,
@@ -48,13 +49,13 @@ func NewTCPCollector() (Collector, error) {
 			nil,
 		),
 		ConnectionsPassive: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connections_passive"),
+			prometheus.BuildFQName(Namespace, subsystem, "connections_passive_total"),
 			"(TCP.ConnectionsPassive)",
 			[]string{"af"},
 			nil,
 		),
 		ConnectionsReset: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "connections_reset"),
+			prometheus.BuildFQName(Namespace, subsystem, "connections_reset_total"),
 			"(TCP.ConnectionsReset)",
 			[]string{"af"},
 			nil,

collector/tcp_test.go

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

collector/terminal_services.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package collector
@@ -7,8 +8,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"
 )
 
 const ConnectionBrokerFeatureID uint32 = 133
@@ -81,7 +82,7 @@ func NewTerminalServicesCollector() (Collector, error) {
 			nil,
 		),
 		HandleCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "handle_count"),
+			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,
@@ -141,7 +142,7 @@ func NewTerminalServicesCollector() (Collector, error) {
 			nil,
 		),
 		ThreadCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "thread_count"),
+			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,

collector/terminal_services_test.go

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

collector/textfile.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !notextfile
 // +build !notextfile
 
 package collector
@@ -21,15 +22,16 @@ 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"
 )
 
@@ -37,7 +39,7 @@ var (
 	textFileDirectory = kingpin.Flag(
 		"collector.textfile.directory",
 		"Directory to read text files with metrics from.",
-	).Default("C:\\Program Files\\windows_exporter\\textfile_inputs").String()
+	).Default(getDefaultPath()).String()
 
 	mtimeDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(Namespace, "textfile", "mtime_seconds"),
@@ -65,6 +67,31 @@ 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
@@ -223,6 +250,10 @@ 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") {
@@ -253,7 +284,12 @@ fileLoop:
 			error = 1.0
 			continue
 		}
+
+		// Use temporary array to check for duplicates
+		var families_array []*dto.MetricFamily
+
 		for _, mf := range parsedFamilies {
+			families_array = append(families_array, mf)
 			for _, m := range mf.Metric {
 				if m.TimestampMs != nil {
 					log.Errorf("Textfile %q contains unsupported client-side timestamps, skipping entire file", path)
@@ -267,11 +303,28 @@ fileLoop:
 			}
 		}
 
+		// If duplicate metrics are detected in a *single* file, skip processing of file metrics
+		if duplicateMetricEntry(families_array) {
+			log.Errorf("Duplicate metrics detected in file %s. Skipping file processing.", f.Name())
+			error = 1.0
+			continue
+		}
+
 		// Only set this once it has been parsed and validated, so that
 		// a failure does not appear fresh.
 		mtimes[f.Name()] = f.ModTime()
 
-		for _, mf := range parsedFamilies {
+		for _, metricFamily := range parsedFamilies {
+			metricFamilies = append(metricFamilies, metricFamily)
+		}
+	}
+
+	// If duplicates are detected across *multiple* files, return error.
+	if duplicateMetricEntry(metricFamilies) {
+		log.Errorf("Duplicate metrics detected across multiple files")
+		error = 1.0
+	} else {
+		for _, mf := range metricFamilies {
 			convertMetricFamily(mf, ch)
 		}
 	}
@@ -297,3 +350,8 @@ 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,6 +5,8 @@ import (
 	"io/ioutil"
 	"strings"
 	"testing"
+
+	dto "github.com/prometheus/client_model/go"
 )
 
 func TestCRFilter(t *testing.T) {
@@ -45,3 +47,108 @@ 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,9 +1,11 @@
 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() {
@@ -75,6 +77,11 @@ 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

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

collector/time.go

@@ -1,10 +1,13 @@
+//go:build windows
 // +build windows
 
 package collector
 
 import (
+	"errors"
+
+	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/log"
 )
 
 func init() {
@@ -22,6 +25,10 @@ type TimeCollector struct {
 }
 
 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{
@@ -38,7 +45,7 @@ func newTimeCollector() (Collector, error) {
 			nil,
 		),
 		NTPClientTimeSourceCount: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "ntp_client_time_source_count"),
+			prometheus.BuildFQName(Namespace, subsystem, "ntp_client_time_sources"),
 			"Active number of NTP Time sources being used by the client",
 			nil,
 			nil,

collector/time_test.go

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