process: Use registry collector for V1 data (#1814)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>

.editorconfig

@@ -1,6 +1,16 @@
 root = true
 
-[*.wxs]
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+tab_width = 4
 
+[*.{json,wxs,xml}]
+indent_style = space
+indent_size = 4
+
+[*.{yml,yaml}]
 indent_style = space
 indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -6,6 +6,27 @@ body:
     attributes:
       value: Thanks for taking the time to fill out this bug report!
   
+  - type: markdown
+    attributes:
+      value: |-
+        > [!NOTE]
+        > If you encounter "Counter not found" issues, try to re-build  the performance counter first.
+
+        ```
+        PS C:\WINDOWS\system32> cd c:\windows\system32
+        PS C:\windows\system32> lodctr /R
+        
+        Error: Unable to rebuild performance counter setting from system backup store, error code is 2
+        PS C:\windows\system32> cd ..
+        PS C:\windows> cd syswow64
+        PS C:\windows\syswow64> lodctr /R
+        
+        Info: Successfully rebuilt performance counter setting from system backup store
+        PS C:\windows\syswow64> winmgmt.exe /RESYNCPERF
+        ```
+        
+        ----
+  
   - type: textarea
     attributes:
       label: Current Behavior

.github/workflows/container_description.yml

@@ -33,25 +33,3 @@ jobs:
           # Empty string results in README-containers.md being pushed if it
           # exists. Otherwise, README.md is pushed.
           readme_file: ''
-
-  PushQuayIoReadme:
-    runs-on: ubuntu-latest
-    name: Push README to quay.io
-    if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
-    steps:
-      - name: git checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-      - name: Set quay.io org name
-        run: echo "DOCKER_REPO=$(echo quay.io/${GITHUB_REPOSITORY_OWNER} | tr -d '-')" >> $GITHUB_ENV
-      - name: Set quay.io repo name
-        run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
-      - name: Push README to quay.io
-        uses: christian-korneck/update-container-description-action@d36005551adeaba9698d8d67a296bd16fa91f8e8 # v1
-        env:
-          DOCKER_APIKEY: ${{ secrets.QUAY_IO_API_TOKEN }}
-        with:
-          destination_container_repo: ${{ env.DOCKER_REPO_NAME }}
-          provider: quay
-          # Empty string results in README-containers.md being pushed if it
-          # exists. Otherwise, README.md is pushed.
-          readme_file: ''

.github/workflows/lint.yml

@@ -12,6 +12,8 @@ on:
     - "tools/e2e-output.txt"
     branches:
       - master
+      - next
+      - main
   pull_request:
     paths:
     - "go.mod"
@@ -21,9 +23,11 @@ on:
     - "tools/e2e-output.txt"
     branches:
       - master
+      - next
+      - main
 
 env:
-  PROMU_VER: '0.14.0'
+  VERSION_PROMU: '0.14.0'
   PROMTOOL_VER: '2.43.0'
 
 jobs:
@@ -40,9 +44,9 @@ jobs:
 
       - 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"
+          Invoke-WebRequest -Uri https://github.com/prometheus/promu/releases/download/v$($Env:VERSION_PROMU)/promu-$($Env:VERSION_PROMU).windows-amd64.zip -OutFile promu-$($Env:VERSION_PROMU).windows-amd64.zip
+          Expand-Archive -Path promu-$($Env:VERSION_PROMU).windows-amd64.zip -DestinationPath .
+          Copy-Item -Path promu-$($Env:VERSION_PROMU).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
 
           # 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
@@ -64,9 +68,9 @@ jobs:
           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"
+          Invoke-WebRequest -Uri https://github.com/prometheus/promu/releases/download/v$($Env:VERSION_PROMU)/promu-$($Env:VERSION_PROMU).windows-amd64.zip -OutFile promu-$($Env:VERSION_PROMU).windows-amd64.zip
+          Expand-Archive -Path promu-$($Env:VERSION_PROMU).windows-amd64.zip -DestinationPath .
+          Copy-Item -Path promu-$($Env:VERSION_PROMU).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
 
           # 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
@@ -100,5 +104,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.59
-          args: "--timeout=5m"
+          version: v1.60
+          args: "--max-same-issues=0"

.github/workflows/pr-check.yaml

@@ -37,7 +37,7 @@ jobs:
       - name: check
         run: |
           PR_TITLE_PREFIX=$(echo "$PR_TITLE" | cut -d':' -f1)
-          if [[ -d "pkg/collector/$PR_TITLE_PREFIX" ]] || [[ -d "$PR_TITLE_PREFIX" ]] || [[ "$PR_TITLE_PREFIX" == "chore" ]] || [[ "$PR_TITLE_PREFIX" == "chore(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "*" ]] || [[ "$PR_TITLE_PREFIX" == "Synchronize common files from prometheus/prometheus" ]]; then
+          if [[ -d "internal/collector/$PR_TITLE_PREFIX" ]] || [[ -d "internal/$PR_TITLE_PREFIX" ]] || [[ -d "pkg/$PR_TITLE_PREFIX" ]] || [[ -d "$PR_TITLE_PREFIX" ]] || [[ "$PR_TITLE_PREFIX" == "docs" ]] || [[ "$PR_TITLE_PREFIX" == "ci" ]] || [[ "$PR_TITLE_PREFIX" == "revert" ]] || [[ "$PR_TITLE_PREFIX" == "fix" ]]  || [[ "$PR_TITLE_PREFIX" == "feat" ]] || [[ "$PR_TITLE_PREFIX" == "chore" ]] || [[ "$PR_TITLE_PREFIX" == "chore(docs)" ]] || [[ "$PR_TITLE_PREFIX" == "chore(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "*" ]] || [[ "$PR_TITLE_PREFIX" == "Synchronize common files from prometheus/prometheus" ]]; then
             exit 0
           fi
 

.github/workflows/release.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
   release:
     types:
       - published
@@ -16,7 +17,7 @@ permissions:
   packages: write
 
 env:
-  PROMU_VER: '0.14.0'
+  VERSION_PROMU: '0.17.0'
 
 jobs:
   build:
@@ -24,51 +25,26 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          # fetch-depth required for gitversion in `Build` step
-          fetch-depth: 0
+          fetch-depth: '0'
 
       - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
 
-      # https://github.com/pl4nty/Windows-Containers/blob/Main/helpful_tools/Install-BuildKit-GitHubActions/workflow.yaml
-      - name: Setup containerd
-        run: |
-          $version = "1.7.20"
-          curl.exe -L https://github.com/containerd/containerd/releases/download/v$version/containerd-$version-windows-amd64.tar.gz -o containerd.tar.gz
-          tar.exe xvf containerd.tar.gz
-          .\bin\containerd.exe --register-service
-          Start-Service containerd
-      - name: Setup BuildKit
-        run: |
-          $version = "v0.15.0"
-          curl.exe -L https://github.com/moby/buildkit/releases/download/$version/buildkit-$version.windows-amd64.tar.gz -o buildkit.tar.gz
-          tar.exe xvf buildkit.tar.gz
-          
-          .\bin\buildkitd.exe --register-service
-          Start-Service buildkitd
-      - name: Setup Docker Buildx
-        run: |
-          $version = "v0.16.1"
-          curl.exe -L https://github.com/docker/buildx/releases/download/$version/buildx-$version.windows-amd64.exe -o $env:ProgramData\Docker\cli-plugins\docker-buildx.exe
-      - uses: docker/setup-buildx-action@v3
-        with:
-          driver: remote
-          endpoint: npipe:////./pipe/buildkitd
-
       - name: Install WiX
         run: dotnet tool install --global wix
 
       - name: Install WiX extensions
         run: |
           wix extension add -g WixToolset.Util.wixext
+          wix extension add -g WixToolset.Ui.wixext
           wix extension add -g WixToolset.Firewall.wixext
 
       - name: Install Build 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"
+          Invoke-WebRequest -Uri https://github.com/prometheus/promu/releases/download/v$($Env:VERSION_PROMU)/promu-$($Env:VERSION_PROMU).windows-amd64.zip -OutFile promu-$($Env:VERSION_PROMU).windows-amd64.zip
+          Expand-Archive -Path promu-$($Env:VERSION_PROMU).windows-amd64.zip -DestinationPath .
+          Copy-Item -Path promu-$($Env:VERSION_PROMU).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
 
           # GOPATH\bin dir must be added to PATH else the `promu` commands won't be found
           echo "$(go env GOPATH)\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -76,53 +52,66 @@ jobs:
       - name: Build
         run: |
           $ErrorActionPreference = "Stop"
-          
+
           $Version = git describe --tags --always
           $Version = $Version -replace 'v', ''
           # '+' symbols are invalid characters in image tags
           $Version = $Version -replace '\+', '_'
           $Version | Set-Content VERSION -PassThru
-          
+
           make build-all
-          
+
           # GH requires all files to have different names, so add version/arch to differentiate
           foreach($Arch in "amd64", "arm64") {
             Move-Item output\$Arch\windows_exporter.exe output\windows_exporter-$Version-$Arch.exe
           }
-          
-          Get-ChildItem -Path output
 
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: windows_exporter_binaries
-          path: output\windows_exporter-*.exe
+          Get-ChildItem -Path output
 
       - name: Build Release Artifacts
         run: |
           $ErrorActionPreference = "Stop"
           $Version = Get-Content VERSION
-          
+
           foreach($Arch in "amd64", "arm64") {
             Write-Host "Building windows_exporter $Version msi for $Arch"
             .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$Version-$Arch.exe -Version $Version -Arch "$Arch"
           }
-          
+
           Move-Item installer\*.msi output\
           Get-ChildItem -Path output\
 
           promu checksum output\
 
-      - name: Build Docker Artifacts
-        run: make build-all
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows_exporter_binaries
+          path: |
+            output\windows_exporter-*.exe
+            output\windows_exporter-*.msi
+
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/')
         env:
-          VERSION: >-
-            ${{
-              startsWith(github.ref, 'refs/tags/') && 'latest' || 
-              (
-                github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || github.ref_name
-              )
-            }}
+          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 $_}
+  docker:
+    name: Build docker images
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: windows_exporter_binaries
 
       - name: Login to Docker Hub
         if: ${{ github.event_name != 'pull_request' }}
@@ -136,8 +125,8 @@ jobs:
       #  uses: docker/login-action@v3
       #  with:
       #    registry: quay.io
-      #    username: 'robot'
-      #    password: ${{ secrets.QUAY_IO_API_TOKEN }}
+      #    username: ${{ secrets.QUAY_USER }}
+      #    password: ${{ secrets.QUAY_PASS }}
 
       - name: Login to GitHub container registry
         if: ${{ github.event_name != 'pull_request' }}
@@ -147,19 +136,32 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Push Latest image
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ startsWith(github.ref, 'refs/tags/') && 'latest' || github.ref_name }}
-        run: |
-          make push-all
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/prometheus-community/windows-exporter
+            docker.io/prometheuscommunity/windows-exporter
+          # quay.io/prometheuscommunity/windows-exporter
+          tags: |
+            type=semver,pattern={{version}}
+            type=ref,event=branch
+            type=ref,event=pr
+          labels: |
+            org.opencontainers.image.title=windows_exporter
+            org.opencontainers.image.description=A Prometheus exporter for Windows machines.
+            org.opencontainers.image.vendor=The Prometheus Community
+            org.opencontainers.image.licenses=MIT
 
-      - 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
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: windows/amd64

.github/workflows/spelling.yml

@@ -10,7 +10,7 @@ on:
       - master
 
 env:
-  PROMU_VER: 'v0.14.0'
+  VERSION_PROMU: 'v0.14.0'
 
 jobs:
   codespell:
@@ -23,4 +23,4 @@ jobs:
           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
+          ignore_words_list: calle,Entires

.github/workflows/stale-close.yml

@@ -0,0 +1,29 @@
+name: 'Close stale issues and PRs'
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: '30 1 * * *'
+permissions:
+  issues: write
+  pull-requests: write
+jobs:
+  stale:
+    if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          # opt out of defaults to avoid marking issues as stale and closing them
+          # https://github.com/actions/stale#days-before-close
+          # https://github.com/actions/stale#days-before-stale
+          days-before-stale: -1
+          days-before-close: -1
+          stale-pr-message: ''
+          stale-issue-message: 'This issue has been marked as stale because it has been open for 90 days with no activity. This thread will be automatically closed in 30 days if no further activity occurs.'
+          operations-per-run: 30
+          # override days-before-stale, for only marking the pull requests as stale
+          days-before-issue-stale: 90
+          days-before-issue-close: 30
+          stale-pr-label: stale
+          exempt-pr-labels: keepalive

.github/workflows/stale.yml

@@ -1,21 +1,31 @@
-name: 'Close stale issues and PRs'
+name: Stale Check
 on:
+  workflow_dispatch: {}
   schedule:
-    - cron: '30 1 * * *'
-
+    - cron: '16 22 * * *'
 permissions:
   issues: write
   pull-requests: write
-
 jobs:
   stale:
+    if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         with:
-          stale-issue-message: 'This issue has been marked as stale because it has been open for 90 days with no activity. This thread will be automatically closed in 30 days if no further activity occurs.'
-          exempt-issue-labels: 'lifecycle/frozen'
-          days-before-stale: 90
-          days-before-close: 30
-          enable-statistics: false
-          operations-per-run: 500
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          # opt out of defaults to avoid marking issues as stale and closing them
+          # https://github.com/actions/stale#days-before-close
+          # https://github.com/actions/stale#days-before-stale
+          days-before-stale: -1
+          days-before-close: -1
+          # Setting it to empty string to skip comments.
+          # https://github.com/actions/stale#stale-pr-message
+          # https://github.com/actions/stale#stale-issue-message
+          stale-pr-message: ''
+          stale-issue-message: ''
+          operations-per-run: 30
+          # override days-before-stale, for only marking the pull requests as stale
+          days-before-pr-stale: 60
+          stale-pr-label: stale
+          exempt-pr-labels: keepalive

.gitignore

@@ -8,4 +8,5 @@ output/
 *.syso
 installer/*.msi
 installer/*.wixpdb
-local/
+local/
+!.idea/inspectionProfiles/Project_Default.xml

.golangci.yaml

@@ -1,41 +1,44 @@
 linters:
   enable-all: true
   disable:
-    - containedctx
-    - contextcheck
     - cyclop
     - depguard
-    - dogsled
     - dupl
     - err113
+    - execinquery
     - exhaustive
     - exhaustruct
+    - exportloopref
     - fatcontext
     - funlen
-    - gochecknoglobals
     - gocognit
     - goconst
     - gocyclo
-    - godox
-    - inamedparam
-    - ireturn
+    - godot
+    - gomnd
+    - paralleltest
     - lll
+    - maintidx
     - mnd
-    - nlreturn
-    - noctx
     - testpackage
     - varnamelen
     - wrapcheck
-    - wsl
-    - execinquery
-    - gomnd
-    - stylecheck
-    - maintidx
+
+run:
+  timeout: 15m
+
+output:
+  sort-results: true
 
 linters-settings:
+  gosec:
+    excludes:
+      - G101 # Potential hardcoded credentials
+      - G115 # integer overflow conversion
+
   gci:
     sections:
-      - prefix(github.com/prometheus-community/windows_exporter/pkg/initiate)
+      - prefix(github.com/prometheus-community/windows_exporter/internal/windowsservice)
       - standard # Standard section: captures all standard packages.
       - default # Default section: contains all imports that could not be matched to another section type.
     custom-order: true
@@ -47,7 +50,30 @@ linters-settings:
         # Support string case: `camel`, `pascal`, `kebab`, `snake`, `upperSnake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`, `header`
         json: camel
         yaml: snake
-
+  forbidigo:
+    forbid:
+      - "^(fmt\\.Print(|f|ln)|print|println)$"
+      - p: "^syscall\\.(.{1,7}|.{7}[^N]|.{9,})$"
+        msg: use golang.org/x/sys/windows instead of syscall
+      - p: "^windows\\.NewLazyDLL$"
+        msg: use NewLazySystemDLL instead NewLazyDLL
+  sloglint:
+    no-mixed-args: true
+    kv-only: false
+    attr-only: true
+    no-global: "all"
+    context: "scope"
+    static-msg: false
+    no-raw-keys: false
+    key-naming-case: snake
+    forbidden-keys:
+      - time
+      - level
+      - msg
+      - source
+    args-on-sep-lines: true
+  stylecheck:
+    checks: ["all", "-ST1003"]
 issues:
   exclude:
   - don't use underscores in Go names

.promu.yml

@@ -1,19 +1,27 @@
 go:
-    version: 1.20
+  # Whenever the Go version is updated here,
+  # .github/workflows should also be updated.
+  version: 1.23
+  cgo: false
 repository:
-    path: github.com/prometheus-community/windows_exporter
+  path: github.com/prometheus-community/windows_exporter
 build:
-    binaries:
-        - name: windows_exporter
-    ldflags: |
-        -X github.com/prometheus/common/version.Version={{.Version}}
-        -X github.com/prometheus/common/version.Revision={{.Revision}}
-        -X github.com/prometheus/common/version.Branch={{.Branch}}
-        -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-        -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+  binaries:
+    - name: windows_exporter
+      path: ./cmd/windows_exporter
+  tags:
+    all:
+      - trimpath
+  ldflags: |
+    -X github.com/prometheus/common/version.Version={{.Version}}
+    -X github.com/prometheus/common/version.Revision={{.Revision}}
+    -X github.com/prometheus/common/version.Branch={{.Branch}}
+    -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+    -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 tarball:
-    files:
-        - LICENSE
+  files:
+    - LICENSE
 crossbuild:
-    platforms:
-        - windows
+  platforms:
+    - windows/amd64
+    - windows/arm64

.run/all.run.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="all" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="run">
+    <module name="windows_exporter" />
+    <working_directory value="$PROJECT_DIR$" />
+    <parameters value="--web.listen-address=127.0.0.1:9182 --log.level=info --collectors.enabled=ad,adcs,adfs,cache,container,cpu,cpu_info,cs,dfsr,dhcp,diskdrive,dns,exchange,filetime,fsrmquota,hyperv,iis,license,logical_disk,logon,memory,mscluster,msmq,mssql,net,netframework,nps,os,pagefile,performancecounter,physical_disk,printer,process,remote_fx,scheduled_task,service,smb,smbclient,smtp,system,tcp,terminal_services,thermalzone,time,udp,update,vmware,performancecounter --debug.enabled --collector.performancecounter.objects='[{ &quot;name&quot;: &quot;memory&quot;, &quot;object&quot;: &quot;Memory&quot;, &quot;counters&quot;: [{ &quot;name&quot;:&quot;Cache Faults/sec&quot;, &quot;type&quot;:&quot;counter&quot; }]}]'" />
+    <sudo value="true" />
+    <kind value="PACKAGE" />
+    <package value="github.com/prometheus-community/windows_exporter/cmd/windows_exporter" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$/exporter.go" />
+    <method v="2" />
+  </configuration>
+</component>

Dockerfile

@@ -1,9 +1,13 @@
-# 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:ltsc2022"
+# mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
+# Using this image as a base for HostProcess containers has a few advantages over using other base images for Windows containers including:
+# - Smaller image size
+# - OS compatibility (works on any Windows version that supports containers)
+
+# This image MUST be built with docker buildx build (buildx) command on a Linux system.
+# Ref: https://github.com/microsoft/windows-host-process-containers-base-image
+
+ARG BASE="mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0"
 FROM $BASE
 
-ENV PATH="C:\Windows\system32;C:\Windows;"
-COPY output/amd64/windows_exporter.exe /windows_exporter.exe
+COPY windows_exporter*-amd64.exe /windows_exporter.exe
 ENTRYPOINT ["windows_exporter.exe"]

Dockerfile.cross

@@ -1,22 +0,0 @@
-# Build this Docker Image on any platform with
-# docker buildx build -t a --platform=windows/amd64 .
-
-ARG BASE=mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
-
-FROM --platform=$BUILDPLATFORM golang:1.21 as builder
-ARG TARGETARCH
-ARG TARGETOS
-
-# Get dependencies
-WORKDIR /w
-COPY go.mod go.sum ./
-RUN go mod download
-RUN go install github.com/prometheus/promu@latest
-
-# Build windows_exporter
-COPY . ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make windows_exporter.exe
-
-FROM $BASE
-COPY --from=builder /w/windows_exporter.exe /windows_exporter.exe
-ENTRYPOINT ["windows_exporter.exe"]

Makefile

@@ -7,7 +7,7 @@ DOCKER_REPO       ?= prometheuscommunity
 DOCKER_IMAGE_NAME ?= windows-exporter
 
 # ALL_DOCKER_REPOS is the list of repositories to push the image to. ghcr.io requires that org name be the same as the image repo name.
-ALL_DOCKER_REPOS  ?= docker.io/$(DOCKER_REPO) ghcr.io/prometheus-community # quay.io/$(DOCKER_REPO) 
+ALL_DOCKER_REPOS  ?= docker.io/$(DOCKER_REPO) ghcr.io/prometheus-community # quay.io/$(DOCKER_REPO)
 
 # Image Variables for host process Container
 # Windows image build is heavily influenced by https://github.com/kubernetes/kubernetes/blob/master/cluster/images/etcd/Makefile
@@ -29,14 +29,14 @@ test:
 	go test -v ./...
 
 bench:
-	go test -v -bench='benchmarkcollector' ./pkg/collector/{cpu,logical_disk,physical_disk,logon,memory,net,printer,process,service,system,tcp,time}
+	go test -v -bench='benchmarkcollector' ./internal/collectors/{cpu,logical_disk,physical_disk,logon,memory,net,printer,process,service,system,tcp,time}
 
 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
+	powershell -NonInteractive -ExecutionPolicy Bypass -File .\tools\end-to-end-test.ps1
 
 .PHONY: promtool
 promtool: windows_exporter.exe
@@ -64,31 +64,19 @@ build-hostprocess:
 sub-build-%:
 	$(MAKE) OS=$* build-image
 
-build-all: $(addprefix sub-build-,$(ALL_OS)) build-hostprocess
-
-push:
-	set -x; \
-	for docker_repo in ${DOCKER_REPO}; do \
-		for osversion in ${ALL_OS}; do \
-			$(DOCKER) tag local/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion} $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
-			$(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); \
+build-all: crossbuild
+	@for docker_repo in ${DOCKER_REPO}; do \
+		echo $(DOCKER) buildx build -f Dockerfile -t $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION) .; \
 	done
 
-# We can't load the image into the local docker store, so we have to build and push it in one go
-push-hostprocess:
-	set -x; \
-	for docker_repo in ${DOCKER_REPO}; do \
-		$(DOCKER) buildx build --push --build-arg=BASE=mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 -f Dockerfile -t $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION)-hostprocess .; \
+push:
+	@for docker_repo in ${DOCKER_REPO}; do \
+		echo $(DOCKER) buildx build --push -f Dockerfile -t $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION) .; \
 	done
 
 .PHONY: push-all
 push-all: build-all
-	$(MAKE) DOCKER_REPO="$(ALL_DOCKER_REPOS)" push # push-hostprocess - disabled until it works on Windows
+	$(MAKE) DOCKER_REPO="$(ALL_DOCKER_REPOS)" push
 
 # Mandatory target for container description sync action
 .PHONY: docker-repo-name

README.md

@@ -1,6 +1,12 @@
 # windows_exporter
 
-![Build Status](https://github.com/prometheus-community/windows_exporter/workflows/windows_exporter%20CI/CD/badge.svg)
+[![CI](https://github.com/prometheus-community/windows_exporter/actions/workflows/release.yml/badge.svg)](https://github.com/prometheus-community/windows_exporter)
+[![Linting](https://github.com/prometheus-community/windows_exporter/actions/workflows/lint.yml/badge.svg)](https://github.com/prometheus-community/windows_exporter)
+[![GitHub license](https://img.shields.io/github/license/prometheus-community/windows_exporter)](https://github.com/prometheus-community/windows_exporter/blob/master/LICENSE.txt)
+[![Current Release](https://img.shields.io/github/release/prometheus-community/windows_exporter.svg?logo=github)](https://github.com/prometheus-community/windows_exporter/releases/latest)
+[![GitHub Repo stars](https://img.shields.io/github/stars/prometheus-community/windows_exporter?style=flat&logo=github)](https://github.com/prometheus-community/windows_exporter/stargazers)
+[![GitHub all releases](https://img.shields.io/github/downloads/prometheus-community/windows_exporter/total?logo=github)](https://github.com/prometheus-community/windows_exporter/releases/latest)
+[![Go Report Card](https://goreportcard.com/badge/github.com/prometheus-community/windows_exporter)](https://goreportcard.com/report/github.com/prometheus-community/windows_exporter)
 
 A Prometheus exporter for Windows machines.
 
@@ -14,39 +20,31 @@ Name     | Description | Enabled by default
 [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) | ✓
+[cs](docs/collector.cs.md) | "Computer System" metrics (system properties, num cpus/total memory) |
 [container](docs/collector.container.md) | Container metrics |
 [diskdrive](docs/collector.diskdrive.md) | Diskdrive 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 |
+[filetime](docs/collector.filetime.md) | FileTime metrics |
 [fsrmquota](docs/collector.fsrmquota.md) | Microsoft File Server Resource Manager (FSRM) Quotas collector |
 [hyperv](docs/collector.hyperv.md) | Hyper-V hosts |
 [iis](docs/collector.iis.md) | IIS sites and applications |
-[license](docs/collector.license.md) | Windows license status | 
+[license](docs/collector.license.md) | Windows license status |
 [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 |
+[memory](docs/collector.memory.md) | Memory usage metrics | ✓
+[mscluster](docs/collector.mscluster.md) | MSCluster 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 |
-[netframework_clrinterop](docs/collector.netframework_clrinterop.md) | .NET Framework Interop Metrics |
-[netframework_clrjit](docs/collector.netframework_clrjit.md) | .NET Framework JIT metrics |
-[netframework_clrloading](docs/collector.netframework_clrloading.md) | .NET Framework CLR Loading metrics |
-[netframework_clrlocksandthreads](docs/collector.netframework_clrlocksandthreads.md) | .NET Framework locks and metrics threads |
-[netframework_clrmemory](docs/collector.netframework_clrmemory.md) |  .NET Framework Memory metrics |
-[netframework_clrremoting](docs/collector.netframework_clrremoting.md) | .NET Framework Remoting metrics |
-[netframework_clrsecurity](docs/collector.netframework_clrsecurity.md) | .NET Framework Security Check metrics |
+[netframework](docs/collector.netframework.md) | .NET Framework metrics |
 [net](docs/collector.net.md) | Network interface I/O | ✓
 [os](docs/collector.os.md) | OS metrics (memory, processes, users) | ✓
+[pagefile](docs/collector.pagefile.md) | pagefile metrics |
+[performancecounter](docs/collector.performancecounter.md) | Custom performance counter metrics |
 [physical_disk](docs/collector.physical_disk.md) | physical disk metrics | ✓
-[printer](docs/collector.printer.md) | Printer metrics | 
+[printer](docs/collector.printer.md) | Printer metrics |
 [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 |
@@ -56,12 +54,12 @@ Name     | Description | Enabled by default
 [smtp](docs/collector.smtp.md) | IIS SMTP Server |
 [system](docs/collector.system.md) | System calls | ✓
 [tcp](docs/collector.tcp.md) | TCP connections |
-[teradici_pcoip](docs/collector.teradici_pcoip.md) | [Teradici PCoIP](https://www.teradici.com/web-help/pcoip_wmi_specs/) session metrics |
-[time](docs/collector.time.md) | Windows Time Service |
-[thermalzone](docs/collector.thermalzone.md) | Thermal information
 [terminal_services](docs/collector.terminal_services.md) | Terminal services (RDS)
 [textfile](docs/collector.textfile.md) | Read prometheus metrics from a text file |
-[vmware_blast](docs/collector.vmware_blast.md) | VMware Blast session metrics |
+[thermalzone](docs/collector.thermalzone.md) | Thermal information |
+[time](docs/collector.time.md) | Windows Time Service |
+[udp](docs/collector.udp.md) | UDP connections |
+[update](docs/collector.update.md) | Windows Update Service |
 [vmware](docs/collector.vmware.md) | Performance counters installed by the Vmware Guest agent |
 
 See the linked documentation on each collector for more information on reported metrics, configuration settings and usage examples.
@@ -85,77 +83,90 @@ This can be useful for having different Prometheus servers collect specific metr
 
 windows_exporter accepts flags to configure certain behaviours. The ones configuring the global behaviour of the exporter are listed below, while collector-specific ones are documented in the respective collector documentation above.
 
-| Flag                                 | Description                                                                                                                                         | Default value |
-|--------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| `--web.listen-address`               | host:port for exporter.                                                                                                                             | `:9182`       |
-| `--telemetry.path`                   | URL path for surfacing collected metrics.                                                                                                           | `/metrics`    |
-| `--telemetry.max-requests`           | Maximum number of concurrent requests. 0 to disable.                                                                                                | `5`           |
-| `--collectors.enabled`               | Comma-separated list of collectors to use. Use `[defaults]` as a placeholder which gets expanded containing all the collectors enabled by default." | `[defaults]`  |
-| `--collectors.print`                 | If true, print available collectors and exit.                                                                                                       |               |
-| `--scrape.timeout-margin`            | Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads.                                               | `0.5`         |
-| `--web.config.file`                  | A [web config][web_config] for setting up TLS and Auth                                                                                              | None          |
-| `--config.file`                      | [Using a config file](#using-a-configuration-file) from path or URL                                                                                 | None          |
-| `--config.file.insecure-skip-verify` | Skip TLS when loading config file from URL                                                                                                          | false         |
+| Flag                                 | Description                                                                                                                                                                                      | Default value |
+|--------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
+| `--web.listen-address`               | host:port for exporter.                                                                                                                                                                          | `:9182`       |
+| `--telemetry.path`                   | URL path for surfacing collected metrics.                                                                                                                                                        | `/metrics`    |
+| `--telemetry.max-requests`           | Maximum number of concurrent requests. 0 to disable.                                                                                                                                             | `5`           |
+| `--collectors.enabled`               | Comma-separated list of collectors to use. Use `[defaults]` as a placeholder which gets expanded containing all the collectors enabled by default."                                              | `[defaults]`  |
+| `--collectors.print`                 | If true, print available collectors and exit.                                                                                                                                                    |               |
+| `--scrape.timeout-margin`            | Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads.                                                                                            | `0.5`         |
+| `--web.config.file`                  | A [web config][web_config] for setting up TLS and Auth                                                                                                                                           | None          |
+| `--config.file`                      | [Using a config file](#using-a-configuration-file) from path or URL                                                                                                                              | None          |
+| `--config.file.insecure-skip-verify` | Skip TLS when loading config file from URL                                                                                                                                                       | false         |
+| `--log.file`                         | Output file of log messages. One of [stdout, stderr, eventlog, \<path to log file>]<br>**NOTE:** The MSI installer will add a default argument to the installed service setting this to eventlog | stderr        |
 
 ## Installation
+
 The latest release can be downloaded from the [releases page](https://github.com/prometheus-community/windows_exporter/releases).
 
 Each release provides a .msi installer. The installer will setup the windows_exporter as a Windows service, as well as create an exception in the Windows Firewall.
 
-If the installer is run without any parameters, the exporter will run with default settings for enabled collectors, ports, etc. The following parameters are available:
+If the installer is run without any parameters, the exporter will run with default settings for enabled collectors, ports, etc.
 
-| Name                             | Description                                                                                                                                           |
-|----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `ENABLED_COLLECTORS`             | As the `--collectors.enabled` flag, provide a comma-separated list of enabled collectors                                                              |
-| `LISTEN_ADDR`                    | The IP address to bind to. Defaults to an empty string. (any local address)                                                                           |
-| `LISTEN_PORT`                    | The port to bind to. Defaults to `9182`.                                                                                                              |
-| `METRICS_PATH`                   | The path at which to serve metrics. Defaults to `/metrics`                                                                                            |
-| `TEXTFILE_DIRS`                  | As the `--collector.textfile.directories` flag, provide a directory to read text files with metrics from                                              |
-| `REMOTE_ADDR`                    | Allows setting comma separated remote IP addresses for the Windows Firewall exception (allow list). Defaults to an empty string (any remote address). |
-| `EXTRA_FLAGS`                    | Allows passing full CLI flags. Defaults to an empty string.                                                                                           |
-| `ADD_FIREWALL_EXCEPTION`         | Setup an firewall exception for windows_exporter. Defaults to `yes`.                                                                                  |
-| `ENABLE_V1_PERFORMANCE_COUNTERS` | Enables V1 performance counter on modern systems. Defaults to `yes`.                                                                                  |
+The installer provides a configuration file to customize the exporter.
 
-Parameters are sent to the installer via `msiexec`. Example invocations:
+The configuration file
+* is located in the same directory as the exporter executable.
+* has the YAML format and is provided with the `--config.file` parameter.
+* can be used to enable or disable collectors, set collector-specific parameters, and set global parameters.
+
+The following parameters are available:
+
+| Name                 | Description                                                                                                                                                                        |
+|----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `ENABLED_COLLECTORS` | As the `--collectors.enabled` flag, provide a comma-separated list of enabled collectors                                                                                           |
+| `CONFIG_FILE`        | Use the `--config.file` flag to specify a config file. If empty, no config file will be set. The special value `config.yaml` set the path to the config.yaml at install dir        |                                                                                     |
+| `LISTEN_ADDR`        | The IP address to bind to. Defaults to an empty string. (any local address)                                                                                                        |
+| `LISTEN_PORT`        | The port to bind to. Defaults to `9182`.                                                                                                                                           |
+| `METRICS_PATH`       | The path at which to serve metrics. Defaults to `/metrics`                                                                                                                         |
+| `TEXTFILE_DIRS`      | Use the `--collector.textfile.directories` flag to specify one or more directories, separated by commas, where the collector should read text files containing metrics             |
+| `REMOTE_ADDR`        | Allows setting comma separated remote IP addresses for the Windows Firewall exception (allow list). Defaults to an empty string (any remote address).                              |
+| `EXTRA_FLAGS`        | Allows passing full CLI flags. Defaults to an empty string. For `--collectors.enabled` and `--config.file`, use the specialized properties  `ENABLED_COLLECTORS` and `CONFIG_FILE` |
+| `ADDLOCAL`           | Enables features within the windows_exporter installer. Supported values: `FirewallException`                                                                                      |
+| `REMOVE`             | Disables features within the windows_exporter installer. Supported values: `FirewallException`                                                                                     |
+
+Parameters are sent to the installer via `msiexec`.
+On PowerShell, the `--%` should be passed before defining properties.
+
+Example invocations:
 
 ```powershell
-msiexec /i <path-to-msi-file> ENABLED_COLLECTORS=os,iis LISTEN_PORT=5000
+msiexec /i <path-to-msi-file> --% ENABLED_COLLECTORS=os,iis LISTEN_PORT=5000
 ```
 
 Example service collector with a custom query.
 ```powershell
-msiexec /i <path-to-msi-file> ENABLED_COLLECTORS=os,service --% EXTRA_FLAGS="--collector.service.services-where ""Name LIKE 'sql%'"""
+msiexec /i <path-to-msi-file> --% ENABLED_COLLECTORS=os,service EXTRA_FLAGS="--collectors.exchange.enabled=""ADAccessProcesses"""
+```
+
+Define a config file.
+```powershell
+msiexec /i <path-to-msi-file> --% CONFIG_FILE="D:\config.yaml"
 ```
 
 On some older versions of Windows,
 you may need to surround parameter values with double quotes to get the installation command parsing properly:
 ```powershell
-msiexec /i C:\Users\Administrator\Downloads\windows_exporter.msi ENABLED_COLLECTORS="ad,iis,logon,memory,process,tcp,textfile,thermalzone" TEXTFILE_DIRS="C:\custom_metrics\"
+msiexec /i C:\Users\Administrator\Downloads\windows_exporter.msi --% ENABLED_COLLECTORS="ad,iis,logon,memory,process,tcp,textfile,thermalzone" TEXTFILE_DIRS="C:\custom_metrics\"
 ```
 
 To install the exporter with creating a firewall exception, use the following command:
 
 ```powershell
-msiexec /i <path-to-msi-file> ADD_FIREWALL_EXCEPTION=yes
+msiexec /i <path-to-msi-file> --% ADDLOCAL=FirewallException
 ```
 
-To repair an installation, e.g force re-creating Windows service:
-
-```powershell
-msiexec /fa <path-to-msi-file>
-```
-
-
-Powershell versions 7.3 and above require [PSNativeCommandArgumentPassing](https://learn.microsoft.com/en-us/powershell/scripting/learn/experimental-features?view=powershell-7.3) to be set to `Legacy` when using `--% EXTRA_FLAGS`:
+PowerShell versions 7.3 and above require [PSNativeCommandArgumentPassing](https://learn.microsoft.com/en-us/powershell/scripting/learn/experimental-features?view=powershell-7.3) to be set to `Legacy` when using `--% EXTRA_FLAGS`:
 
 ```powershell
 $PSNativeCommandArgumentPassing = 'Legacy'
-msiexec /i <path-to-msi-file> ENABLED_COLLECTORS=os,service --% EXTRA_FLAGS="--collector.service.services-where ""Name LIKE 'sql%'"""
+msiexec /i <path-to-msi-file> ENABLED_COLLECTORS=os,service --% EXTRA_FLAGS="--collectors.exchange.enabled=""ADAccessProcesses"""
 ```
 
 ## Docker Implementation
 
-The windows_exporter can be run as a Docker container. The Docker image is available on 
+The windows_exporter can be run as a Docker container. The Docker image is available on
 
 * [Docker Hub](https://hub.docker.com/r/prometheuscommunity/windows-exporter): `docker.io/prometheuscommunity/windows-exporter`
 * [GitHub Container Registry](https://github.com/prometheus-community/windows_exporter/pkgs/container/windows-exporter): `ghcr.io/prometheus-community/windows-exporter`
@@ -188,11 +199,19 @@ Windows Server 2012 and 2012R2 are supported as best-effort only, but not guaran
 
 The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182)
 
+### HTTP Endpoints
+
+windows_exporter provides the following HTTP endpoints:
+
+* `/metrics`: Exposes metrics in the [Prometheus text format](https://prometheus.io/docs/instrumenting/exposition_formats/).
+* `/health`: Returns 200 OK when the exporter is running.
+* `/debug/pprof/`: Exposes the [pprof](https://golang.org/pkg/net/http/pprof/) endpoints. Only, if `--debug.enabled` is set.
+
 ## Examples
 
 ### Enable only service collector and specify a custom query
 
-    .\windows_exporter.exe --collectors.enabled "service" --collector.service.services-where "Name='windows_exporter'"
+    .\windows_exporter.exe --collectors.enabled "service" --collector.service.include="windows_exporter"
 
 ### Enable only process collector and specify a custom query
 
@@ -218,10 +237,10 @@ If you need to skip TLS verification, you can use the `--config.file.insecure-sk
 
 ```yaml
 collectors:
-  enabled: cpu,cs,net,service
+  enabled: cpu,net,service
 collector:
   service:
-    services-where: "Name='windows_exporter'"
+    include: windows_exporter
 log:
   level: warn
 ```

cmd/windows_exporter/doc.go

@@ -0,0 +1,195 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+The main package for the windows_exporter executable.
+
+usage: windows_exporter [<flags>]
+
+A metrics collector for Windows.
+
+Flags:
+
+	-h, --[no-]help                Show context-sensitive help (also try
+	                               --help-long and --help-man).
+	    --config.file=CONFIG.FILE  YAML configuration file to use. Values set in
+	                               this file will be overridden by CLI flags.
+	    --[no-]config.file.insecure-skip-verify
+	                               Skip TLS verification in loading YAML
+	                               configuration.
+	    --web.listen-address=:9182 ...
+	                               Addresses on which to expose metrics and web
+	                               interface. Repeatable for multiple addresses.
+	                               Examples: `:9100` or `[::1]:9100` for http,
+	                               `vsock://:9100` for vsock
+	    --web.config.file=""       Path to configuration file that can
+	                               enable TLS or authentication. See:
+	                               https://github.com/prometheus/exporter-toolkit/blob/master/docs/web-configuration.md
+	    --telemetry.path="/metrics"
+	                               URL path for surfacing collected metrics.
+	    --[no-]web.disable-exporter-metrics
+	                               Exclude metrics about the exporter itself
+	                               (promhttp_*, process_*, go_*).
+	    --telemetry.max-requests=5
+	                               Maximum number of concurrent requests. 0 to
+	                               disable.
+	    --collectors.enabled="cpu,cs,memory,logical_disk,physical_disk,net,os,service,system"
+	                               Comma-separated list of collectors to use.
+	                               Use '[defaults]' as a placeholder for all the
+	                               collectors enabled by default.
+	    --scrape.timeout-margin=0.5
+	                               Seconds to subtract from the timeout allowed by
+	                               the client. Tune to allow for overhead or high
+	                               loads.
+	    --[no-]debug.enabled       If true, windows_exporter will expose debug
+	                               endpoints under /debug/pprof.
+	    --process.priority="normal"
+	                               Priority of the exporter process. Higher
+	                               priorities may improve exporter responsiveness
+	                               during periods of system load. Can be one of
+	                               ["realtime", "high", "abovenormal", "normal",
+	                               "belownormal", "low"]
+	    --log.level=info           Only log messages with the given severity or
+	                               above. One of: [debug, info, warn, error]
+	    --log.format=logfmt        Output format of log messages. One of: [logfmt,
+	                               json]
+	    --log.file=stderr          Output file of log messages. One of [stdout,
+	                               stderr, eventlog, <path to log file>]
+	    --[no-]version             Show application version.
+	    --collector.scheduled_task.exclude=""
+	                               Regexp of tasks to exclude. Task path must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.scheduled_task.include=".+"
+	                               Regexp of tasks to include. Task path must
+	                               both match include and not match exclude to be
+	                               included.
+	    --[no-]collector.updates.online
+	                               Whether to search for updates online.
+	    --collector.updates.scrape-interval=6h0m0s
+	                               Define the interval of scraping Windows Update
+	                               information.
+	    --[no-]collector.exchange.list
+	                               List the collectors along with their perflib
+	                               object name/ids
+	    --collector.exchange.enabled="ADAccessProcesses,TransportQueues,HttpProxy,ActiveSync,AvailabilityService,OutlookWebAccess,Autodiscover,WorkloadManagement,RpcClientAccess,MapiHttpEmsmdb"
+	                               Comma-separated list of collectors to use.
+	                               Defaults to all, if not specified.
+	    --collector.net.nic-exclude=""
+	                               Regexp of NIC:s to exclude. NIC name must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.net.nic-include=".+"
+	                               Regexp of NIC:s to include. NIC name must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.net.enabled="metrics,nic_addresses"
+	                               Comma-separated list of collectors to use.
+	                               Defaults to all, if not specified.
+	    --collector.mscluster.enabled="cluster,network,node,resource,resourcegroup"
+	                               Comma-separated list of collectors to use.
+	    --collector.mssql.enabled="accessmethods,availreplica,bufman,databases,dbreplica,genstats,locks,memmgr,sqlerrors,sqlstats,transactions,waitstats"
+	                               Comma-separated list of collectors to use.
+	    --collector.mssql.port=1433
+	                               Port of MSSQL server used for
+	                               windows_mssql_info metric.
+	    --collector.physical_disk.disk-exclude=""
+	                               Regexp of disks to exclude. Disk number must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.physical_disk.disk-include=".+"
+	                               Regexp of disks to include. Disk number must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.textfile.directories="C:\\Users\\Jan\\GolandProjects\\windows_exporter\\textfile_inputs"
+	                               Directory or Directories to read text files
+	                               with metrics from.
+	    --collector.filetime.file-patterns=""
+	                               Comma-separated list of file patterns.
+	                               Each pattern is a glob pattern that can
+	                               contain `*`, `?`, and `**` (recursive). See
+	                               https://github.com/bmatcuk/doublestar#patterns
+	    --collector.iis.app-exclude=""
+	                               Regexp of apps to exclude. App name must both
+	                               match include and not match exclude to be
+	                               included.
+	    --collector.iis.app-include=".+"
+	                               Regexp of apps to include. App name must both
+	                               match include and not match exclude to be
+	                               included.
+	    --collector.iis.site-exclude=""
+	                               Regexp of sites to exclude. Site name must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.iis.site-include=".+"
+	                               Regexp of sites to include. Site name must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.perfdata.objects=""
+	                               Objects of performance data to observe.
+	                               See docs for more information on how to use
+	                               this flag. By default, no objects are observed.
+	    --collector.printer.include=".+"
+	                               Regular expression to match printers to collect
+	                               metrics for
+	    --collector.printer.exclude=""
+	                               Regular expression to match printers to exclude
+	    --collector.process.exclude=""
+	                               Regexp of processes to exclude. Process name
+	                               must both match include and not match exclude
+	                               to be included.
+	    --collector.process.include=".+"
+	                               Regexp of processes to include. Process name
+	                               must both match include and not match exclude
+	                               to be included.
+	    --[no-]collector.process.iis
+	                               Enable IIS worker process name queries.
+	                               May cause the collector to leak memory.
+	    --collector.hyperv.enabled="datastore,dynamic_memory_balancer,dynamic_memory_vm,hypervisor_logical_processor,hypervisor_root_partition,hypervisor_root_virtual_processor,hypervisor_virtual_processor,legacy_network_adapter,virtual_machine_health_summary,virtual_machine_vid_partition,virtual_network_adapter,virtual_network_adapter_drop_reasons,virtual_smb,virtual_storage_device,virtual_switch"
+	                               Comma-separated list of collectors to use.
+	    --collector.logical_disk.volume-exclude=""
+	                               Regexp of volumes to exclude. Volume name must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.logical_disk.volume-include=".+"
+	                               Regexp of volumes to include. Volume name must
+	                               both match include and not match exclude to be
+	                               included.
+	    --collector.smtp.server-exclude=""
+	                               Regexp of virtual servers to exclude. Server
+	                               name must both match include and not match
+	                               exclude to be included.
+	    --collector.smtp.server-include=".+"
+	                               Regexp of virtual servers to include. Server
+	                               name must both match include and not match
+	                               exclude to be included.
+	    --collector.tcp.enabled="metrics,connections_state"
+	                               Comma-separated list of collectors to use.
+	                               Defaults to all, if not specified.
+	    --collector.dfsr.sources-enabled="connection,folder,volume"
+	                               Comma-separated list of DFSR Perflib sources to
+	                               use.
+	    --collector.service.exclude=""
+	                               Regexp of service to exclude. Service name (not
+	                               the display name!) must both match include and
+	                               not match exclude to be included.
+	    --collector.service.include=".+"
+	                               Regexp of service to include. Process name (not
+	                               the display name!) must both match include and
+	                               not match exclude to be included.
+	    --collector.time.enabled="system_time,ntp"
+	                               Comma-separated list of collectors to use.
+	                               Defaults to all, if not specified. ntp may not
+	                               available on all systems.
+*/
+package main

cmd/windows_exporter/main.go

@@ -0,0 +1,363 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+//go:generate go run github.com/tc-hib/go-winres@v0.3.3 make --product-version=git-tag --file-version=git-tag --arch=amd64,arm64
+
+package main
+
+//goland:noinspection GoUnsortedImport
+//nolint:gofumpt
+import (
+	// Its important that we do these first so that we can register with the Windows service control ASAP to avoid timeouts.
+	"github.com/prometheus-community/windows_exporter/internal/windowsservice"
+
+	"context"
+	"errors"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"net/http/pprof"
+	"os"
+	"os/signal"
+	"os/user"
+	"runtime"
+	"runtime/debug"
+	"slices"
+	"strings"
+	"time"
+
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/prometheus-community/windows_exporter/internal/config"
+	"github.com/prometheus-community/windows_exporter/internal/httphandler"
+	"github.com/prometheus-community/windows_exporter/internal/log"
+	"github.com/prometheus-community/windows_exporter/internal/log/flag"
+	"github.com/prometheus-community/windows_exporter/internal/utils"
+	"github.com/prometheus-community/windows_exporter/pkg/collector"
+	"github.com/prometheus/common/version"
+	"github.com/prometheus/exporter-toolkit/web"
+	webflag "github.com/prometheus/exporter-toolkit/web/kingpinflag"
+	"golang.org/x/sys/windows"
+)
+
+func main() {
+	exitCode := run()
+
+	// If we are running as a service, we need to signal the service control manager that we are done.
+	if !windowsservice.IsService {
+		os.Exit(exitCode)
+	}
+
+	windowsservice.ExitCodeCh <- exitCode
+
+	// Wait for the service control manager to signal that we are done.
+	<-windowsservice.StopCh
+}
+
+func run() int {
+	startTime := time.Now()
+	ctx := context.Background()
+
+	app := kingpin.New("windows_exporter", "A metrics collector for Windows.")
+
+	var (
+		configFile = app.Flag(
+			"config.file",
+			"YAML configuration file to use. Values set in this file will be overridden by CLI flags.",
+		).String()
+		insecureSkipVerify = app.Flag(
+			"config.file.insecure-skip-verify",
+			"Skip TLS verification in loading YAML configuration.",
+		).Default("false").Bool()
+		webConfig   = webflag.AddFlags(app, ":9182")
+		metricsPath = app.Flag(
+			"telemetry.path",
+			"URL path for surfacing collected metrics.",
+		).Default("/metrics").String()
+		disableExporterMetrics = app.Flag(
+			"web.disable-exporter-metrics",
+			"Exclude metrics about the exporter itself (promhttp_*, process_*, go_*).",
+		).Bool()
+		enabledCollectors = app.Flag(
+			"collectors.enabled",
+			"Comma-separated list of collectors to use. Use '[defaults]' as a placeholder for all the collectors enabled by default.").
+			Default(collector.DefaultCollectors).String()
+		timeoutMargin = app.Flag(
+			"scrape.timeout-margin",
+			"Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads.",
+		).Default("0.5").Float64()
+		debugEnabled = app.Flag(
+			"debug.enabled",
+			"If true, windows_exporter will expose debug endpoints under /debug/pprof.",
+		).Default("false").Bool()
+		processPriority = app.Flag(
+			"process.priority",
+			"Priority of the exporter process. Higher priorities may improve exporter responsiveness during periods of system load. Can be one of [\"realtime\", \"high\", \"abovenormal\", \"normal\", \"belownormal\", \"low\"]",
+		).Default("normal").String()
+		memoryLimit = app.Flag(
+			"process.memory-limit",
+			"Limit memory usage in bytes. This is a soft-limit and not guaranteed. 0 means no limit. Read more at https://pkg.go.dev/runtime/debug#SetMemoryLimit .",
+		).Default("200000000").Int64()
+	)
+
+	logFile := &log.AllowedFile{}
+
+	_ = logFile.Set("stdout")
+	if windowsservice.IsService {
+		_ = logFile.Set("eventlog")
+	}
+
+	logConfig := &log.Config{File: logFile}
+	flag.AddFlags(app, logConfig)
+
+	app.Version(version.Print("windows_exporter"))
+	app.HelpFlag.Short('h')
+
+	// Initialize collectors before loading and parsing CLI arguments
+	collectors := collector.NewWithFlags(app)
+
+	// Load values from configuration file(s). Executable flags must first be parsed, in order
+	// to load the specified file(s).
+	if _, err := app.Parse(os.Args[1:]); err != nil {
+		//nolint:sloglint // we do not have an logger yet
+		slog.Error("Failed to parse CLI args",
+			slog.Any("err", err),
+		)
+
+		return 1
+	}
+
+	debug.SetMemoryLimit(*memoryLimit)
+
+	logger, err := log.New(logConfig)
+	if err != nil {
+		//nolint:sloglint // we do not have an logger yet
+		slog.Error("failed to create logger",
+			slog.Any("err", err),
+		)
+
+		return 1
+	}
+
+	if *configFile != "" {
+		resolver, err := config.NewResolver(ctx, *configFile, logger, *insecureSkipVerify)
+		if err != nil {
+			logger.Error("could not load config file",
+				slog.Any("err", err),
+			)
+
+			return 1
+		}
+
+		if err = resolver.Bind(app, os.Args[1:]); err != nil {
+			logger.ErrorContext(ctx, "failed to bind configuration",
+				slog.Any("err", err),
+			)
+
+			return 1
+		}
+
+		// NOTE: This is temporary fix for issue #1092, calling kingpin.Parse
+		// twice makes slices flags duplicate its value, this clean up
+		// the first parse before the second call.
+		*webConfig.WebListenAddresses = (*webConfig.WebListenAddresses)[1:]
+
+		// Parse flags once more to include those discovered in configuration file(s).
+		if _, err = app.Parse(os.Args[1:]); err != nil {
+			logger.ErrorContext(ctx, "failed to parse CLI args from YAML file",
+				slog.Any("err", err),
+			)
+
+			return 1
+		}
+
+		logger, err = log.New(logConfig)
+		if err != nil {
+			//nolint:sloglint // we do not have an logger yet
+			slog.Error("failed to create logger",
+				slog.Any("err", err),
+			)
+
+			return 1
+		}
+	}
+
+	logger.LogAttrs(ctx, slog.LevelDebug, "logging has Started")
+
+	if err = setPriorityWindows(logger, os.Getpid(), *processPriority); err != nil {
+		logger.Error("failed to set process priority",
+			slog.Any("err", err),
+		)
+
+		return 1
+	}
+
+	enabledCollectorList := expandEnabledCollectors(*enabledCollectors)
+	if err := collectors.Enable(enabledCollectorList); err != nil {
+		logger.Error("couldn't enable collectors",
+			slog.Any("err", err),
+		)
+
+		return 1
+	}
+
+	// Initialize collectors before loading
+	if err = collectors.Build(logger); err != nil {
+		for _, err := range utils.SplitError(err) {
+			logger.Error("couldn't initialize collector",
+				slog.Any("err", err),
+			)
+
+			return 1
+		}
+	}
+
+	logCurrentUser(logger)
+
+	logger.InfoContext(ctx, "Enabled collectors: "+strings.Join(enabledCollectorList, ", "))
+
+	mux := http.NewServeMux()
+	mux.Handle("GET /health", httphandler.NewHealthHandler())
+	mux.Handle("GET /version", httphandler.NewVersionHandler())
+	mux.Handle("GET "+*metricsPath, httphandler.New(logger, collectors, &httphandler.Options{
+		DisableExporterMetrics: *disableExporterMetrics,
+		TimeoutMargin:          *timeoutMargin,
+	}))
+
+	if *debugEnabled {
+		mux.HandleFunc("GET /debug/pprof/", pprof.Index)
+		mux.HandleFunc("GET /debug/pprof/cmdline", pprof.Cmdline)
+		mux.HandleFunc("GET /debug/pprof/profile", pprof.Profile)
+		mux.HandleFunc("GET /debug/pprof/symbol", pprof.Symbol)
+		mux.HandleFunc("GET /debug/pprof/trace", pprof.Trace)
+	}
+
+	logger.LogAttrs(ctx, slog.LevelInfo, fmt.Sprintf("starting windows_exporter in %s", time.Since(startTime)),
+		slog.String("version", version.Version),
+		slog.String("branch", version.Branch),
+		slog.String("revision", version.GetRevision()),
+		slog.String("goversion", version.GoVersion),
+		slog.String("builddate", version.BuildDate),
+		slog.Int("maxprocs", runtime.GOMAXPROCS(0)),
+	)
+
+	server := &http.Server{
+		ReadHeaderTimeout: 5 * time.Second,
+		IdleTimeout:       60 * time.Second,
+		ReadTimeout:       5 * time.Second,
+		WriteTimeout:      5 * time.Minute,
+		Handler:           mux,
+	}
+
+	errCh := make(chan error, 1)
+
+	go func() {
+		if err := web.ListenAndServe(server, webConfig, logger); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			errCh <- err
+		}
+
+		close(errCh)
+	}()
+
+	ctx, stop := signal.NotifyContext(ctx, os.Interrupt, os.Kill)
+	defer stop()
+
+	select {
+	case <-ctx.Done():
+		logger.Info("Shutting down windows_exporter via kill signal")
+	case <-windowsservice.StopCh:
+		logger.Info("Shutting down windows_exporter via service control")
+	case err := <-errCh:
+		if err != nil {
+			logger.ErrorContext(ctx, "Failed to start windows_exporter",
+				slog.Any("err", err),
+			)
+
+			return 1
+		}
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	_ = server.Shutdown(ctx)
+
+	logger.InfoContext(ctx, "windows_exporter has shut down")
+
+	return 0
+}
+
+func logCurrentUser(logger *slog.Logger) {
+	u, err := user.Current()
+	if err != nil {
+		logger.Warn("Unable to determine which user is running this exporter. More info: https://github.com/golang/go/issues/37348",
+			slog.Any("err", err),
+		)
+
+		return
+	}
+
+	logger.Info("Running as " + u.Username)
+
+	if strings.Contains(u.Username, "ContainerAdministrator") || strings.Contains(u.Username, "ContainerUser") {
+		logger.Warn("Running as a preconfigured Windows Container user. This may mean you do not have Windows HostProcess containers configured correctly and some functionality will not work as expected.")
+	}
+}
+
+// setPriorityWindows sets the priority of the current process to the specified value.
+func setPriorityWindows(logger *slog.Logger, pid int, priority string) error {
+	// Mapping of priority names to uin32 values required by windows.SetPriorityClass.
+	priorityStringToInt := map[string]uint32{
+		"realtime":    windows.REALTIME_PRIORITY_CLASS,
+		"high":        windows.HIGH_PRIORITY_CLASS,
+		"abovenormal": windows.ABOVE_NORMAL_PRIORITY_CLASS,
+		"normal":      windows.NORMAL_PRIORITY_CLASS,
+		"belownormal": windows.BELOW_NORMAL_PRIORITY_CLASS,
+		"low":         windows.IDLE_PRIORITY_CLASS,
+	}
+
+	winPriority, ok := priorityStringToInt[priority]
+
+	// Only set process priority if a non-default and valid value has been set
+	if !ok || winPriority != windows.NORMAL_PRIORITY_CLASS {
+		return nil
+	}
+
+	logger.LogAttrs(context.Background(), slog.LevelDebug, "setting process priority to "+priority)
+
+	// https://learn.microsoft.com/en-us/windows/win32/procthread/process-security-and-access-rights
+	handle, err := windows.OpenProcess(
+		windows.STANDARD_RIGHTS_REQUIRED|windows.SYNCHRONIZE|windows.SPECIFIC_RIGHTS_ALL,
+		false, uint32(pid),
+	)
+	if err != nil {
+		return fmt.Errorf("failed to open own process: %w", err)
+	}
+
+	if err = windows.SetPriorityClass(handle, winPriority); err != nil {
+		return fmt.Errorf("failed to set priority class: %w", err)
+	}
+
+	if err = windows.CloseHandle(handle); err != nil {
+		return fmt.Errorf("failed to close handle: %w", err)
+	}
+
+	return nil
+}
+
+func expandEnabledCollectors(enabled string) []string {
+	expanded := strings.ReplaceAll(enabled, "[defaults]", collector.DefaultCollectors)
+
+	return slices.Compact(strings.Split(expanded, ","))
+}

cmd/windows_exporter/winres/winres.json

@@ -0,0 +1,56 @@
+{
+    "RT_GROUP_ICON": {
+        "APP": {
+            "0000": [
+                "icon.png"
+            ]
+        }
+    },
+    "RT_MANIFEST": {
+        "#1": {
+            "0409": {
+                "description": "A Prometheus exporter for Windows machines.",
+                "minimum-os": "win7",
+                "execution-level": "as invoker",
+                "ui-access": false,
+                "auto-elevate": false,
+                "dpi-awareness": "system",
+                "disable-theming": false,
+                "disable-window-filtering": false,
+                "high-resolution-scrolling-aware": false,
+                "ultra-high-resolution-scrolling-aware": false,
+                "long-path-aware": false,
+                "printer-driver-isolation": false,
+                "gdi-scaling": false,
+                "segment-heap": false,
+                "use-common-controls-v6": false
+            }
+        }
+    },
+    "RT_VERSION": {
+        "#1": {
+            "0000": {
+                "fixed": {
+                    "file_version": "0.0.0.0",
+                    "product_version": "0.0.0.0"
+                },
+                "info": {
+                    "0409": {
+                        "Comments": "",
+                        "CompanyName": "Prometheus Community",
+                        "FileDescription": "A Prometheus exporter for Windows machines.",
+                        "FileVersion": "",
+                        "InternalName": "windows_exporter",
+                        "LegalCopyright": "",
+                        "LegalTrademarks": "",
+                        "OriginalFilename": "",
+                        "PrivateBuild": "",
+                        "ProductName": "windows_exporter",
+                        "ProductVersion": "",
+                        "SpecialBuild": ""
+                    }
+                }
+            }
+        }
+    }
+}

config.yaml

@@ -0,0 +1,16 @@
+# example configuration file for windows_exporter
+
+collectors:
+  enabled: cpu,cpu_info,exchange,iis,logical_disk,logon,memory,net,os,performancecounter,process,remote_fx,service,system,tcp,time,terminal_services,textfile
+collector:
+  service:
+    include: "windows_exporter"
+  performancecounter:
+    objects: |-
+      - name: memory
+        object: "Memory"
+        counters:
+          - name: "Cache Faults/sec"
+            type: "counter" # optional
+log:
+  level: warn

contrib/console_templates/windows-overview.html

@@ -1,140 +0,0 @@
-{{ template "head" . }}
-
-{{ template "prom_content_head" . }}
-  <h1>Node Overview - {{ reReplaceAll "(.*?://)([^:/]+?)(:\\d+)?/.*" "$2" .Params.instance }}</h1>
-
-  <h3>CPU Usage</h3>
-  <div id="cpuGraph"></div>
-  <script>
-  new PromConsole.Graph({
-    node: document.querySelector("#cpuGraph"),
-    expr: "sum by (mode)(irate(windows_cpu_time_total{job='node',instance='{{ .Params.instance }}',mode!='idle'}[5m]))",
-    renderer: 'area',
-    max: {{ with printf "count(count by (cpu)(windows_cpu_time_total{job='node',instance='%s'}))" .Params.instance | query }}{{ . | first | value }}{{ else}}undefined{{end}},
-    yAxisFormatter: PromConsole.NumberFormatter.humanizeNoSmallPrefix,
-    yHoverFormatter: PromConsole.NumberFormatter.humanizeNoSmallPrefix,
-    yTitle: 'Cores'
-  })
-  </script>
-
-  <h3>Network Utilization</h3>
-  <div id="networkioGraph"></div>
-  <script>
-  new PromConsole.Graph({
-    node: document.querySelector("#networkioGraph"),
-    expr: [
-      "irate(windows_net_bytes_sent_total{job='node',instance='{{ .Params.instance }}',nic!~'^isatap_ec2_internal'}[5m])",
-      "irate(windows_net_bytes_received_total{job='node',instance='{{ .Params.instance }}',nic!~'^isatap_ec2_internal'}[5m])",
-    ],
-    min: 0,
-    name: [ 'sent', 'received' ],
-    yAxisFormatter: PromConsole.NumberFormatter.humanizeNoSmallPrefix,
-    yHoverFormatter: PromConsole.NumberFormatter.humanizeNoSmallPrefix,
-    yUnits: "B",
-    yTitle: 'Network IO'
-  })
-  </script>
-
-  <h3>Disk I/O Utilization</h3>
-  <div id="diskioGraph"></div>
-  <script>
-  new PromConsole.Graph({
-    node: document.querySelector("#diskioGraph"),
-    expr: [
-      "100 - irate(windows_logical_disk_idle_seconds_total{job='node',instance='{{ .Params.instance }}',volume!~'^HarddiskVolume.*$'}[5m]) * 100",
-    ],
-    min: 0,
-    name: '[[ volume ]]',
-    yAxisFormatter: PromConsole.NumberFormatter.humanizeNoSmallPrefix,
-    yHoverFormatter: PromConsole.NumberFormatter.humanizeNoSmallPrefix,
-    yUnits: "%",
-    yTitle: 'Disk I/O Utilization'
-  })
-  </script>
-
-  <h3>Memory</h3>
-  <div id="memoryGraph"></div>
-  <script>
-  new PromConsole.Graph({
-    node: document.querySelector("#memoryGraph"),
-    renderer: 'area',
-    expr: [
-      "windows_cs_physical_memory_bytes{job='node',instance='{{ .Params.instance }}'}",
-      "windows_os_physical_memory_free_bytes{job='node',instance='{{ .Params.instance }}'}",
-      "windows_cs_physical_memory__bytes{job='node',instance='{{ .Params.instance }}'} - windows_os_physical_memory_free_bytes{job='node',instance='{{.Params.instance}}'}",
-      "windows_os_virtual_memory_bytes{job='node',instance='{{ .Params.instance }}'}",
-    ],
-    name: ["Physical", "Free", "Used", "Virtual"],
-    min: 0,
-    yUnits: "B",
-    yAxisFormatter: PromConsole.NumberFormatter.humanize1024,
-    yHoverFormatter: PromConsole.NumberFormatter.humanize1024,
-    yTitle: 'Memory'
-  })
-  </script>
-
-{{ template "prom_right_table_head" }}
-  <tr><th colspan="2">Overview</th></tr>
-  <tr>
-    <td>User CPU</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "sum(irate(windows_cpu_time_total{job='node',instance='%s',mode='user'}[5m])) * 100 / count(count by (cpu)(windows_cpu_time_total{job='node',instance='%s'}))" .Params.instance .Params.instance) "%" "printf.1f") }}</td>
-  </tr>
-  <tr>
-    <td>Privileged CPU</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "sum(irate(windows_cpu_time_total{job='node',instance='%s',mode='privileged'}[5m])) * 100 / count(count by (cpu)(windows_cpu_time_total{job='node',instance='%s'}))" .Params.instance .Params.instance) "%" "printf.1f") }}</td>
-  </tr>
-  <tr>
-    <td>Memory Total</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "windows_cs_physical_memory_bytes{job='node',instance='%s'}" .Params.instance) "B" "humanize1024") }}</td>
-  </tr>
-  <tr>
-    <td>Memory Free</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "windows_os_physical_memory_free_bytes{job='node',instance='%s'}" .Params.instance) "B" "humanize1024") }}</td>
-  </tr>
-<tr>
-  <th colspan="2">Network</th>
-</tr>
-{{ range printf "windows_net_bytes_received_total{job='node',instance='%s',nic!='isatap_ec2_internal'}" .Params.instance | query | sortByLabel "nic" }}
-  <tr>
-    <td>{{ .Labels.nic }} Received</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "irate(windows_net_bytes_received_total{job='node',instance='%s',nic='%s'}[5m])" .Labels.instance .Labels.nic) "B/s" "humanize") }}</td>
-  </tr>
-  <tr>
-    <td>{{ .Labels.nic }} Transmitted</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "irate(windows_net_bytes_sent_total{job='node',instance='%s',nic='%s'}[5m])" .Labels.instance .Labels.nic) "B/s" "humanize") }}</td>
-  </tr>
-{{ end }}
-</tr>
-<tr>
-  <th colspan="2">Disks</th>
-</tr>
-{{ range printf "windows_logical_disk_size_bytes{job='node',instance='%s',volume!~'^HarddiskVolume.*$'}" .Params.instance | query | sortByLabel "volume" }}
-  <tr>
-    <td>{{ .Labels.volume }} Utilization</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "100 - irate(windows_logical_disk_idle_seconds_total{job='node',instance='%s',volume='%s'}[5m]) * 100" .Labels.instance .Labels.volume) "%" "printf.1f") }}</td>
-  </tr>
-{{ end }}
-{{ range printf "windows_logical_disk_size_bytes{job='node',instance='%s',volume!~'^HarddiskVolume.*$'}" .Params.instance | query | sortByLabel "volume" }}
-  <tr>
-    <td>{{ .Labels.volume }} Throughput</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "irate(windows_logical_disk_read_bytes_total{job='node',instance='%s',volume='%s'}[5m]) + irate(windows_logical_disk_write_bytes_total{job='node',instance='%s',volume='%s'}[5m])" .Labels.instance .Labels.volume .Labels.instance .Labels.volume) "B/s" "humanize") }}</td>
-  </tr>
-{{ end }}
-<tr>
-  <th colspan="2">Filesystem Fullness</th>
-</tr>
-{{ define "roughlyNearZero" }}
-{{ if gt .1 . }}~0{{ else }}{{ printf "%.1f" . }}{{ end }}
-{{ end }}
-{{ range printf "windows_logical_disk_size_bytes{job='node',instance='%s',volume!~'^HarddiskVolume.*$'}" .Params.instance | query | sortByLabel "volume" }}
-  <tr>
-    <td>{{ .Labels.volume }}</td>
-    <td>{{ template "prom_query_drilldown" (args (printf "100 - windows_logical_disk_free_bytes{job='node',instance='%s',volume='%s'} / windows_logical_disk_size_bytes{job='node'} * 100" .Labels.instance .Labels.volume) "%" "roughlyNearZero") }}</td>
-  </tr>
-{{ end }}
-</tr>
-{{ template "prom_right_table_tail" }}
-
-{{ template "prom_content_tail" . }}
-
-{{ template "tail" }}

docs/README.md

@@ -18,40 +18,34 @@ This directory contains documentation of the collectors in the windows_exporter,
 - [`fsrmquota`](collector.fsrmquota.md)
 - [`hyperv`](collector.hyperv.md)
 - [`iis`](collector.iis.md)
+- [`license`](collector.license.md)
 - [`logical_disk`](collector.logical_disk.md)
 - [`logon`](collector.logon.md)
 - [`memory`](collector.memory.md)
-- [`mscluster_cluster`](collector.mscluster_cluster.md)
-- [`mscluster_network`](collector.mscluster_network.md)
-- [`mscluster_node`](collector.mscluster_node.md)
-- [`mscluster_resource`](collector.mscluster_resource.md)
-- [`mscluster_resourcegroup`](collector.mscluster_resourcegroup.md)
+- [`mscluster`](collector.mscluster.md)
 - [`msmq`](collector.msmq.md)
 - [`mssql`](collector.mssql.md)
 - [`net`](collector.net.md)
-- [`netframework_clrexceptions`](collector.netframework_clrexceptions.md)
-- [`netframework_clrinterop`](collector.netframework_clrinterop.md)
-- [`netframework_clrjit`](collector.netframework_clrjit.md)
-- [`netframework_clrloading`](collector.netframework_clrloading.md)
-- [`netframework_clrlocksandthreads`](collector.netframework_clrlocksandthreads.md)
-- [`netframework_clrmemory`](collector.netframework_clrmemory.md)
-- [`netframework_clrremoting`](collector.netframework_clrremoting.md)
-- [`netframework_clrsecurity`](collector.netframework_clrsecurity.md)
+- [`netframework`](collector.netframework.md)
 - [`nps`](collector.nps.md)
 - [`os`](collector.os.md)
+- [`pagefile`](collector.pagefile.md)
+- [`performancecounter`](collector.performancecounter.md)
 - [`physical_disk`](collector.physical_disk.md)
+- [`printer`](collector.printer.md)
 - [`process`](collector.process.md)
 - [`remote_fx`](collector.remote_fx.md)
 - [`scheduled_task`](collector.scheduled_task.md)
 - [`service`](collector.service.md)
 - [`smb`](collector.smb.md)
+- [`smbclient`](collector.smbclient.md)
 - [`smtp`](collector.smtp.md)
 - [`system`](collector.system.md)
 - [`tcp`](collector.tcp.md)
-- [`teradici_pcoip`](collector.teradici_pcoip.md)
 - [`terminal_services`](collector.terminal_services.md)
 - [`textfile`](collector.textfile.md)
 - [`thermalzone`](collector.thermalzone.md)
 - [`time`](collector.time.md)
+- [`udp`](collector.udp.md)
+- [`update`](collector.update.md)
 - [`vmware`](collector.vmware.md)
-- [`vmware_blast`](collector.vmware_blast.md)

docs/collector.cpu.md

@@ -16,26 +16,22 @@ None
 ## Metrics
 These metrics are available on all versions of Windows:
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_cpu_cstate_seconds_total` | Time spent in low-power idle states | counter | `core`, `state`
-`windows_cpu_time_total` | Time that processor spent in different modes (dpc, idle, interrupt, privileged, user) | counter | `core`, `mode`
-`windows_cpu_interrupts_total` | Total number of received and serviced hardware interrupts | counter | `core`
-`windows_cpu_dpcs_total` | Total number of received and serviced deferred procedure calls (DPCs) | counter | `core`
-
-These metrics are only exposed on Windows Server 2008R2 and later:
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_cpu_clock_interrupts_total` | Total number of received and serviced clock tick interrupts | counter | `core`
-`windows_cpu_idle_break_events_total` | Total number of time processor was woken from idle | counter | `core`
-`windows_cpu_parking_status` | Parking Status represents whether a processor is parked or not | gauge | `core`
-`windows_cpu_core_frequency_mhz` | Core frequency in megahertz | gauge | `core`
-`windows_cpu_processor_performance_total` | Processor Performance is the number of CPU cycles executing instructions by each core; it is believed to be similar to the value that the APERF MSR would show, were it exposed | counter | `core`
-`windows_cpu_processor_mperf_total` | Processor MPerf Total is proportioanl to the number of TSC ticks each core has accumulated while executing instructions. Due to the manner in which it is presented, it should be scaled by 1e2 to properly line up with Processor Performance Total. As above, it is believed to be closely related to the MPERF MSR. | counter | `core`
-`windows_cpu_processor_rtc_total` | RTC total is assumed to represent the 64Hz tick rate in Windows. It is not by itself useful, but can be used with `windows_cpu_processor_utility_total` to more accurately measure CPU utilisation than with `windows_cpu_time_total` | counter | `core`
-`windows_cpu_processor_utility_total` | Processor Utility Total is a newer, more accurate measure of CPU utilization, in particular handling modern CPUs with variant CPU frequencies. The rate of this counter divided by the rate of `windows_cpu_processor_rtc_total` should provide an accurate view of CPU utilisation on modern systems, as observed in Task Manager. | counter | `core`
-`windows_cpu_processor_privileged_utility_total` | Processor Privileged Utility Total, when used in a similar fashion to `windows_cpu_processor_utility_total` will show the portion of CPU utilization which is happening in privileged mode. | counter | `core`
+| Name                                             | Description                                                                                                                                                                                                                                                                                                                         | Type    | Labels          |
+|--------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------------|
+| `windows_cpu_logical_processor`                  | Number of installed logical processors                                                                                                                                                                                                                                                                                              | counter | `core`, `state` |
+| `windows_cpu_cstate_seconds_total`               | Time spent in low-power idle states                                                                                                                                                                                                                                                                                                 | counter | `core`, `state` |
+| `windows_cpu_time_total`                         | Time that processor spent in different modes (dpc, idle, interrupt, privileged, user)                                                                                                                                                                                                                                               | counter | `core`, `mode`  |
+| `windows_cpu_interrupts_total`                   | Total number of received and serviced hardware interrupts                                                                                                                                                                                                                                                                           | counter | `core`          |
+| `windows_cpu_dpcs_total`                         | Total number of received and serviced deferred procedure calls (DPCs)                                                                                                                                                                                                                                                               | counter | `core`          |
+| `windows_cpu_clock_interrupts_total`             | Total number of received and serviced clock tick interrupts                                                                                                                                                                                                                                                                         | counter | `core`          |
+| `windows_cpu_idle_break_events_total`            | Total number of time processor was woken from idle                                                                                                                                                                                                                                                                                  | counter | `core`          |
+| `windows_cpu_parking_status`                     | Parking Status represents whether a processor is parked or not                                                                                                                                                                                                                                                                      | gauge   | `core`          |
+| `windows_cpu_core_frequency_mhz`                 | Core frequency in megahertz                                                                                                                                                                                                                                                                                                         | gauge   | `core`          |
+| `windows_cpu_processor_performance_total`        | Processor Performance is the number of CPU cycles executing instructions by each core; it is believed to be similar to the value that the APERF MSR would show, were it exposed                                                                                                                                                     | counter | `core`          |
+| `windows_cpu_processor_mperf_total`              | Processor MPerf Total is proportioanl to the number of TSC ticks each core has accumulated while executing instructions. Due to the manner in which it is presented, it should be scaled by 1e2 to properly line up with Processor Performance Total. As above, it is believed to be closely related to the MPERF MSR.              | counter | `core`          |
+| `windows_cpu_processor_rtc_total`                | RTC total is assumed to represent the 64Hz tick rate in Windows. It is not by itself useful, but can be used with `windows_cpu_processor_utility_total` to more accurately measure CPU utilisation than with `windows_cpu_time_total`                                                                                               | counter | `core`          |
+| `windows_cpu_processor_utility_total`            | Processor Utility Total is a newer, more accurate measure of CPU utilization, in particular handling modern CPUs with variant CPU frequencies. The rate of this counter divided by the rate of `windows_cpu_processor_rtc_total` should provide an accurate view of CPU utilisation on modern systems, as observed in Task Manager. | counter | `core`          |
+| `windows_cpu_processor_privileged_utility_total` | Processor Privileged Utility Total, when used in a similar fashion to `windows_cpu_processor_utility_total` will show the portion of CPU utilization which is happening in privileged mode.                                                                                                                                         | counter | `core`          |
 
 ### Example metric
 Show frequency of host CPU cores

docs/collector.cpu_info.md

@@ -15,13 +15,39 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_cpu_info` | Labelled CPU information | gauge | `architecture`, `device_id`, `description`, `family`, `l2_cache_size` `l3_cache_size`, `name`
+| Name                                       | Description                          | Type  | Labels                                                       |
+|--------------------------------------------|--------------------------------------|-------|--------------------------------------------------------------|
+| `windows_cpu_info`                         | Labelled CPU information             | gauge | `architecture`, `description`, `device_id`, `family`, `name` |
+| `windows_cpu_info_core`              | Number of cores per CPU              | gauge | `device_id`                                                  |
+| `windows_cpu_info_enabled_core`      | Number of enabled cores per CPU      | gauge | `device_id`                                                  |
+| `windows_cpu_info_l2_cache_size`           | Size of L2 cache per CPU             | gauge | `device_id`                                                  |
+| `windows_cpu_info_l3_cache_size`           | Size of L3 cache per CPU             | gauge | `device_id`                                                  |
+| `windows_cpu_info_logical_processor` | Number of logical processors per CPU | gauge | `device_id`                                                  |
+| `windows_cpu_info_thread`            | Number of threads per CPU            | gauge | `device_id`                                                  |
 
 ### Example metric
 ```
-windows_cpu_info{architecture="9",description="AMD64 Family 23 Model 49 Stepping 0",device_id="CPU0",family="107",l2_cache_size="32768",l3_cache_size="262144",name="AMD EPYC 7702P 64-Core Processor"} 1
+# HELP windows_cpu_info Labelled CPU information as provided by Win32_Processor
+# TYPE windows_cpu_info gauge
+windows_cpu_info{architecture="9",description="AMD64 Family 25 Model 33 Stepping 2",device_id="CPU0",family="107",name="AMD Ryzen 9 5900X 12-Core Processor"} 1
+# HELP windows_cpu_info_core Number of cores per CPU
+# TYPE windows_cpu_info_core gauge
+windows_cpu_info_core{device_id="CPU0"} 12
+# HELP windows_cpu_info_enabled_core Number of enabled cores per CPU
+# TYPE windows_cpu_info_enabled_core gauge
+windows_cpu_info_enabled_core{device_id="CPU0"} 12
+# HELP windows_cpu_info_l2_cache_size Size of L2 cache per CPU
+# TYPE windows_cpu_info_l2_cache_size gauge
+windows_cpu_info_l2_cache_size{device_id="CPU0"} 6144
+# HELP windows_cpu_info_l3_cache_size Size of L3 cache per CPU
+# TYPE windows_cpu_info_l3_cache_size gauge
+windows_cpu_info_l3_cache_size{device_id="CPU0"} 65536
+# HELP windows_cpu_info_logical_processor Number of logical processors per CPU
+# TYPE windows_cpu_info_logical_processor gauge
+windows_cpu_info_logical_processor{device_id="CPU0"} 24
+# HELP windows_cpu_info_thread Number of threads per CPU
+# TYPE windows_cpu_info_thread gauge
+windows_cpu_info_thread{device_id="CPU0"} 24
 ```
 The value of the metric is irrelevant, but the labels expose some useful information on the CPU installed in each socket.
 

docs/collector.cs.md

@@ -1,5 +1,9 @@
 # cs collector
 
+> [!CAUTION]
+> This collector is deprecated and will be removed in a future release.
+> See https://github.com/prometheus-community/windows_exporter/pull/1596 for more information.
+
 The cs collector exposes metrics detailing the hardware of the computer system
 
 |||

docs/collector.exchange.md

@@ -1,14 +1,13 @@
 # exchange collector
 
-The exchange collector collects metrics from MS Exchange hosts through perflib
+The exchange collector collects metrics from MS Exchange hosts through Performance Counter
 =======
 
-
-|||
--|-
-Metric name prefix  | `exchange`
-Classes 			| [Win32_PerfRawData_MSExchangeADAccess_MSExchangeADAccessProcesses](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeTransportQueues_MSExchangeTransportQueues](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_ESE_MSExchangeDatabaseInstances](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeHttpProxy_MSExchangeHttpProxy](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeActiveSync_MSExchangeActiveSync](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeAvailabilityService_MSExchangeAvailabilityService](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeOWA_MSExchangeOWA](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeAutodiscover_MSExchangeAutodiscover](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeWorkloadManagementWorkloads_MSExchangeWorkloadManagementWorkloads](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeRpcClientAccess_MSExchangeRpcClientAccess](https://docs.microsoft.com/en-us/exchange/)<br/>
-Enabled by default? | No
+|                     |                     |
+|---------------------|---------------------|
+| Metric name prefix  | `exchange`          |
+| Source              | Performance Counter |
+| Enabled by default? | No                  |
 
 ## Flags
 
@@ -19,45 +18,56 @@ Lists the Perflib Objects that are queried for data along with the perlfib objec
 Comma-separated list of collectors to use, for example: `--collectors.exchange.enabled=AvailabilityService,OutlookWebAccess`. Matching is case-sensitive. Depending on the exchange installation not all performance counters are available. Use `--collectors.exchange.list` to obtain a list of supported collectors.
 
 ## Metrics
-Name          | Description
---------------|---------------
-`windows_exchange_rpc_avg_latency_sec` | The latency (sec), averaged for the past 1024 packets
-`windows_exchange_rpc_requests` | Number of client requests currently being processed by  the RPC Client Access service
-`windows_exchange_rpc_active_user_count` | Number of unique users that have shown some kind of activity in the last 2 minutes
-`windows_exchange_rpc_connection_count` | Total number of client connections maintained
-`windows_exchange_rpc_operations_total` | The rate at which RPC operations occur
-`windows_exchange_rpc_user_count` | Number of users
-`windows_exchange_ldap_read_time_sec` | Time (sec) to send an LDAP read request and receive a response
-`windows_exchange_ldap_search_time_sec` | Time (sec) to send an LDAP search request and receive a response
-`windows_exchange_ldap_write_time_sec` | Time (sec) to send an LDAP Add/Modify/Delete request and receive a response
-`windows_exchange_ldap_timeout_errors_total` | Total number of LDAP timeout errors
-`windows_exchange_ldap_long_running_ops_per_sec` | Long Running LDAP operations per second
-`windows_exchange_transport_queues_external_active_remote_delivery` | External Active Remote Delivery Queue length
-`windows_exchange_transport_queues_internal_active_remote_delivery` | Internal Active Remote Delivery Queue length
-`windows_exchange_transport_queues_active_mailbox_delivery` | Active Mailbox Delivery Queue length
-`windows_exchange_transport_queues_retry_mailbox_delivery` | Retry Mailbox Delivery Queue length
-`windows_exchange_transport_queues_unreachable` | Unreachable Queue length
-`windows_exchange_transport_queues_external_largest_delivery` | External Largest Delivery Queue length
-`windows_exchange_transport_queues_internal_largest_delivery` | Internal Largest Delivery Queue length 
-`windows_exchange_transport_queues_poison` | Poison Queue length
-`windows_exchange_http_proxy_mailbox_server_locator_avg_latency_sec` | Average latency (sec) of MailboxServerLocator web service calls
-`windows_exchange_http_proxy_avg_auth_latency` | Average time spent authenticating CAS requests over the last 200 samples
-`windows_exchange_http_proxy_outstanding_proxy_requests` | Number of concurrent outstanding proxy requests
-`windows_exchange_http_proxy_requests_total` | Number of proxy requests processed each second
-`windows_exchange_avail_service_requests_per_sec` | Number of requests serviced per second
-`windows_exchange_owa_current_unique_users` | Number of unique users currently logged on to Outlook Web App
-`windows_exchange_owa_requests_total` | Number of requests handled by Outlook Web App per second
-`windows_exchange_autodiscover_requests_total` | Number of autodiscover service requests processed each second
-`windows_exchange_workload_active_tasks` | Number of active tasks currently running in the background for workload management
-`windows_exchange_workload_completed_tasks` | Number of workload management tasks that have been completed
-`windows_exchange_workload_queued_tasks` | Number of workload management tasks that are currently queued up waiting to be processed
-`windows_exchange_workload_yielded_tasks` | The total number of tasks that have been yielded by a workload
-`windows_exchange_workload_is_active` | Active indicates whether the workload is in an active (1) or paused (0) state
-`windows_exchange_activesync_requests_total` | Num HTTP requests received from the client via ASP.NET per sec. Shows Current user load
-`windows_exchange_http_proxy_avg_cas_proccessing_latency_sec` | Average latency (sec) of CAS processing time over the last 200 reqs
-`windows_exchange_http_proxy_mailbox_proxy_failure_rate` | % of failures between this CAS and MBX servers over the last 200 sample
-`windows_exchange_activesync_ping_cmds_pending` | Number of ping commands currently pending in the queue
-`windows_exchange_activesync_sync_cmds_total` | Number of sync commands processed per second. Clients use this command to synchronize items within a folder
+| Name                                                                        | Description                                                                                                 |
+|-----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------|
+| `windows_exchange_rpc_avg_latency_sec`                                      | The latency (sec), averaged for the past 1024 packets                                                       |
+| `windows_exchange_rpc_requests`                                             | Number of client requests currently being processed by  the RPC Client Access service                       |
+| `windows_exchange_rpc_active_user_count`                                    | Number of unique users that have shown some kind of activity in the last 2 minutes                          |
+| `windows_exchange_rpc_connection_count`                                     | Total number of client connections maintained                                                               |
+| `windows_exchange_rpc_operations_total`                                     | The rate at which RPC operations occur                                                                      |
+| `windows_exchange_rpc_user_count`                                           | Number of users                                                                                             |
+| `windows_exchange_ldap_read_time_sec`                                       | Time (sec) to send an LDAP read request and receive a response                                              |
+| `windows_exchange_ldap_search_time_sec`                                     | Time (sec) to send an LDAP search request and receive a response                                            |
+| `windows_exchange_ldap_write_time_sec`                                      | Time (sec) to send an LDAP Add/Modify/Delete request and receive a response                                 |
+| `windows_exchange_ldap_timeout_errors_total`                                | Total number of LDAP timeout errors                                                                         |
+| `windows_exchange_ldap_long_running_ops_per_sec`                            | Long Running LDAP operations per second                                                                     |
+| `windows_exchange_transport_queues_external_active_remote_delivery`         | External Active Remote Delivery Queue length                                                                |
+| `windows_exchange_transport_queues_internal_active_remote_delivery`         | Internal Active Remote Delivery Queue length                                                                |
+| `windows_exchange_transport_queues_active_mailbox_delivery`                 | Active Mailbox Delivery Queue length                                                                        |
+| `windows_exchange_transport_queues_retry_mailbox_delivery`                  | Retry Mailbox Delivery Queue length                                                                         |
+| `windows_exchange_transport_queues_unreachable`                             | Unreachable Queue length                                                                                    |
+| `windows_exchange_transport_queues_external_largest_delivery`               | External Largest Delivery Queue length                                                                      |
+| `windows_exchange_transport_queues_internal_largest_delivery`               | Internal Largest Delivery Queue length                                                                      |
+| `windows_exchange_transport_queues_poison`                                  | Poison Queue length                                                                                         |
+| `windows_exchange_transport_queues_messages_queued_for_delivery_total`      | Messages Queued For Delivery Total                                                                          |
+| `windows_exchange_transport_queues_messages_submitted_total`                | Messages Submitted Total                                                                                    |
+| `windows_exchange_transport_queues_messages_delayed_total`                  | Messages Delayed Total                                                                                      |
+| `windows_exchange_transport_queues_messages_completed_delivery_total`       | Messages Completed Delivery Total                                                                           |
+| `windows_exchange_transport_queues_shadow_queue_length`                     | Shadow Queue Length                                                                                         |
+| `windows_exchange_transport_queues_submission_queue_length`                 | Submission Queue Length                                                                                     |
+| `windows_exchange_transport_queues_delay_queue_length`                      | Delay Queue Length                                                                                          |
+| `windows_exchange_transport_queues_items_completed_delivery_total`          | Items Completed Delivery Total                                                                              |
+| `windows_exchange_transport_queues_items_queued_for_delivery_expired_total` | Items Queued For Delivery Expired Total                                                                     |
+| `windows_exchange_transport_queues_items_queued_for_delivery_total`         | Items Queued For Delivery Total                                                                             |
+| `windows_exchange_transport_queues_items_resubmitted_total`                 | Items Resubmitted Total                                                                                     |
+| `windows_exchange_http_proxy_mailbox_server_locator_avg_latency_sec`        | Average latency (sec) of MailboxServerLocator web service calls                                             |
+| `windows_exchange_http_proxy_avg_auth_latency`                              | Average time spent authenticating CAS requests over the last 200 samples                                    |
+| `windows_exchange_http_proxy_outstanding_proxy_requests`                    | Number of concurrent outstanding proxy requests                                                             |
+| `windows_exchange_http_proxy_requests_total`                                | Number of proxy requests processed each second                                                              |
+| `windows_exchange_avail_service_requests_per_sec`                           | Number of requests serviced per second                                                                      |
+| `windows_exchange_owa_current_unique_users`                                 | Number of unique users currently logged on to Outlook Web App                                               |
+| `windows_exchange_owa_requests_total`                                       | Number of requests handled by Outlook Web App per second                                                    |
+| `windows_exchange_autodiscover_requests_total`                              | Number of autodiscover service requests processed each second                                               |
+| `windows_exchange_workload_active_tasks`                                    | Number of active tasks currently running in the background for workload management                          |
+| `windows_exchange_workload_completed_tasks`                                 | Number of workload management tasks that have been completed                                                |
+| `windows_exchange_workload_queued_tasks`                                    | Number of workload management tasks that are currently queued up waiting to be processed                    |
+| `windows_exchange_workload_yielded_tasks`                                   | The total number of tasks that have been yielded by a workload                                              |
+| `windows_exchange_workload_is_active`                                       | Active indicates whether the workload is in an active (1) or paused (0) state                               |
+| `windows_exchange_activesync_requests_total`                                | Num HTTP requests received from the client via ASP.NET per sec. Shows Current user load                     |
+| `windows_exchange_http_proxy_avg_cas_proccessing_latency_sec`               | Average latency (sec) of CAS processing time over the last 200 reqs                                         |
+| `windows_exchange_http_proxy_mailbox_proxy_failure_rate`                    | % of failures between this CAS and MBX servers over the last 200 sample                                     |
+| `windows_exchange_activesync_ping_cmds_pending`                             | Number of ping commands currently pending in the queue                                                      |
+| `windows_exchange_activesync_sync_cmds_total`                               | Number of sync commands processed per second. Clients use this command to synchronize items within a folder |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.filetime.md

@@ -0,0 +1,36 @@
+# filetime collector
+
+The filetime collector exposes modified timestamps of files in the filesystem.
+
+The collector
+
+|||
+-|-
+Metric name prefix  | `filetime`
+Enabled by default? | No
+
+## Flags
+
+### `--collectors.filetime.file-patterns`
+Comma-separated list of file patterns. Each pattern is a glob pattern that can contain `*`, `?`, and `**` (recursive).
+See https://github.com/bmatcuk/doublestar#patterns for an extended description of the pattern syntax.
+
+## Metrics
+
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`windows_filetime_mtime_timestamp_seconds` | File modification time | gauge | `file`
+
+### Example metric
+
+```
+# HELP windows_filetime_mtime_timestamp_seconds File modification time
+# TYPE windows_filetime_mtime_timestamp_seconds gauge
+windows_filetime_mtime_timestamp_seconds{file="C:\\Users\\admin\\Desktop\\Dashboard.lnk"} 1.726434517e+09
+```
+
+## Useful queries
+_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
+
+## Alerting examples
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.hyperv.md

@@ -2,110 +2,262 @@
 
 The hyperv collector exposes metrics about the Hyper-V hypervisor
 
-|||
--|-
-Metric name prefix  | `hyperv`
-Classes             | `Win32_PerfRawData_VmmsVirtualMachineStats_HyperVVirtualMachineHealthSummary`<br/>`Win32_PerfRawData_VidPerfProvider_HyperVVMVidPartition`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorRootPartition`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorVirtualProcessor`<br/>`Win32_PerfRawData_NvspSwitchStats_HyperVVirtualSwitch`<br/>`Win32_PerfRawData_EthernetPerfProvider_HyperVLegacyNetworkAdapter`<br/>`Win32_PerfRawData_Counters_HyperVVirtualStorageDevice`<br/>`Win32_PerfRawData_NvspNicStats_HyperVVirtualNetworkAdapter`
-Enabled by default? | No
+|                     |                      |
+|---------------------|----------------------|
+| Metric name prefix  | `hyperv`             |
+| Source              | Performance counters |
+| Enabled by default? | No                   |
 
 ## Flags
 
-None
+### `--collectors.hyperv.enabled`
+Comma-separated list of collectors to use, for example:
+`--collectors.hyperv.enabled=dynamic_memory_balancer,dynamic_memory_vm,hypervisor_logical_processor,hypervisor_root_partition,hypervisor_root_virtual_processor,hypervisor_virtual_processor,legacy_network_adapter,virtual_machine_health_summary,virtual_machine_vid_partition,virtual_network_adapter,virtual_storage_device,virtual_switch`.
+Matching is case-sensitive.
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_hyperv_health_critical` | _Not yet documented_ | counter | None
-`windows_hyperv_health_ok` | _Not yet documented_ | counter | None
-`windows_hyperv_vid_physical_pages_allocated` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_vid_preferred_numa_node_index` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_vid_remote_physical_pages` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_root_partition_address_spaces` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_attached_devices` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_deposited_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_device_dma_errors` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_device_interrupt_errors` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_device_interrupt_mappings` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_device_interrupt_throttle_events` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_preferred_numa_node_index` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_gpa_space_modifications` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_io_tlb_flush_cost` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_io_tlb_flush` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_recommended_virtual_tlb_size` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_physical_pages_allocated` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_1G_device_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_1G_gpa_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_2M_device_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_2M_gpa_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_4K_device_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_4K_gpa_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_virtual_tlb_flush_entires` | _Not yet documented_ | counter | None
-`windows_hyperv_root_partition_virtual_tlb_pages` | _Not yet documented_ | counter | None
-`windows_hyperv_hypervisor_virtual_processors` | _Not yet documented_ | counter | None
-`windows_hyperv_hypervisor_logical_processors` | _Not yet documented_ | counter | None
-`windows_hyperv_host_lp_guest_run_time_percent` | _Not yet documented_ | counter | `core`
-`windows_hyperv_host_lp_hypervisor_run_time_percent` | _Not yet documented_ | counter | `core`
-`windows_hyperv_host_lp_total_run_time_percent` | _Not yet documented_ | counter | `core`
-`windows_hyperv_host_cpu_guest_run_time` | _Not yet documented_ | counter | `core`
-`windows_hyperv_host_cpu_hypervisor_run_time` | _Not yet documented_ | counter | `core`
-`windows_hyperv_host_cpu_remote_run_time` | _Not yet documented_ | counter | `core`
-`windows_hyperv_host_cpu_total_run_time` | _Not yet documented_ | counter | `core`
-`windows_hyperv_host_cpu_wait_time_per_dispatch_total` | _Not yet documented_ | counter | `core`
-`windows_hyperv_vm_cpu_guest_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`windows_hyperv_vm_cpu_hypervisor_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`windows_hyperv_vm_cpu_remote_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`windows_hyperv_vm_cpu_wait_time_per_dispatch_total` | _Not yet documented_ | counter | `vm`, `core`
-`windows_hyperv_vm_memory_added_total` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_vm_memory_pressure_average` | _Not yet documented_ | gauge | `vm`
-`windows_hyperv_vm_memory_pressure_current` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_vm_memory_physical_guest_visible` | _Not yet documented_ | gauge | `vm`
-`windows_hyperv_vm_memory_pressure_maximum` | _Not yet documented_ | gauge | `vm`
-`windows_hyperv_vm_memory_add_operations_total` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_vm_memory_remove_operations_total` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_vm_memory_pressure_minumim` | _Not yet documented_ | gauge | `vm`
-`windows_hyperv_vm_memory_physical` | _Not yet documented_ | gauge | `vm`
-`windows_hyperv_vm_memory_removed_total` | _Not yet documented_ | counter | `vm`
-`windows_hyperv_vm_cpu_total_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`windows_hyperv_vswitch_broadcast_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_broadcast_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_bytes_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_bytes_received_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_bytes_sent_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_directed_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_directed_packets_send_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_dropped_packets_incoming_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_dropped_packets_outcoming_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_extensions_dropped_packets_incoming_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_extensions_dropped_packets_outcoming_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_learned_mac_addresses_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_multicast_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_multicast_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_number_of_send_channel_moves_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_number_of_vmq_moves_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_packets_flooded_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_packets_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_vswitch_purged_mac_addresses_total` | _Not yet documented_ | counter | `vswitch`
-`windows_hyperv_ethernet_bytes_dropped` | _Not yet documented_ | counter | `adapter`
-`windows_hyperv_ethernet_bytes_received` | _Not yet documented_ | counter | `adapter`
-`windows_hyperv_ethernet_bytes_sent` | _Not yet documented_ | counter | `adapter`
-`windows_hyperv_ethernet_frames_dropped` | _Not yet documented_ | counter | `adapter`
-`windows_hyperv_ethernet_frames_received` | _Not yet documented_ | counter | `adapter`
-`windows_hyperv_ethernet_frames_sent` | _Not yet documented_ | counter | `adapter`
-`windows_hyperv_vm_device_error_count` | _Not yet documented_ | counter | `vm_device`
-`windows_hyperv_vm_device_queue_length` | _Not yet documented_ | counter | `vm_device`
-`windows_hyperv_vm_device_bytes_read` | _Not yet documented_ | counter | `vm_device`
-`windows_hyperv_vm_device_operations_read` | _Not yet documented_ | counter | `vm_device`
-`windows_hyperv_vm_device_bytes_written` | _Not yet documented_ | counter | `vm_device`
-`windows_hyperv_vm_device_operations_written` | _Not yet documented_ | counter | `vm_device`
-`windows_hyperv_vm_interface_bytes_received` | _Not yet documented_ | counter | `vm_interface`
-`windows_hyperv_vm_interface_bytes_sent` | _Not yet documented_ | counter | `vm_interface`
-`windows_hyperv_vm_interface_packets_incoming_dropped` | _Not yet documented_ | counter | `vm_interface`
-`windows_hyperv_vm_interface_packets_outgoing_dropped` | _Not yet documented_ | counter | `vm_interface`
-`windows_hyperv_vm_interface_packets_received` | _Not yet documented_ | counter | `vm_interface`
-`windows_hyperv_vm_interface_packets_sent` | _Not yet documented_ | counter | `vm_interface`
+### Hyper-V Datastore
+### Hyper-V Datastore Metrics Documentation
+
+This documentation outlines the available metrics for monitoring Hyper-V Datastore performance and resource usage using Prometheus. All metrics are prefixed with `windows_hyperv_datastore`.
+
+| Metric Name                                                            | Description                                                                     | Type    | Labels    |
+|------------------------------------------------------------------------|---------------------------------------------------------------------------------|---------|-----------|
+| `windows_hyperv_datastore_fragmentation_ratio`                         | Represents the fragmentation ratio of the DataStore.                            | gauge   | datastore |
+| `windows_hyperv_datastore_sector_size_bytes`                           | Represents the sector size of the DataStore in bytes.                           | gauge   | datastore |
+| `windows_hyperv_datastore_data_alignment_bytes`                        | Represents the data alignment of the DataStore in bytes.                        | gauge   | datastore |
+| `windows_hyperv_datastore_current_replay_log_size_bytes`               | Represents the current replay log size of the DataStore in bytes.               | gauge   | datastore |
+| `windows_hyperv_datastore_available_entries`                           | Represents the number of available entries inside object tables.                | gauge   | datastore |
+| `windows_hyperv_datastore_empty_entries`                               | Represents the number of empty entries inside object tables.                    | gauge   | datastore |
+| `windows_hyperv_datastore_free_bytes`                                  | Represents the number of free bytes inside key tables.                          | gauge   | datastore |
+| `windows_hyperv_datastore_data_end_bytes`                              | Represents the data end of the DataStore in bytes.                              | gauge   | datastore |
+| `windows_hyperv_datastore_file_objects`                                | Represents the number of file objects in the DataStore.                         | gauge   | datastore |
+| `windows_hyperv_datastore_object_tables`                               | Represents the number of object tables in the DataStore.                        | gauge   | datastore |
+| `windows_hyperv_datastore_key_tables`                                  | Represents the number of key tables in the DataStore.                           | gauge   | datastore |
+| `windows_hyperv_datastore_file_data_size_bytes`                        | Represents the file data size in bytes of the DataStore.                        | gauge   | datastore |
+| `windows_hyperv_datastore_table_data_size_bytes`                       | Represents the table data size in bytes of the DataStore.                       | gauge   | datastore |
+| `windows_hyperv_datastore_names_size_bytes`                            | Represents the names size in bytes of the DataStore.                            | gauge   | datastore |
+| `windows_hyperv_datastore_number_of_keys`                              | Represents the number of keys in the DataStore.                                 | gauge   | datastore |
+| `windows_hyperv_datastore_reconnect_latency_microseconds`              | Represents the reconnect latency in microseconds of the DataStore.              | gauge   | datastore |
+| `windows_hyperv_datastore_disconnect_count`                            | Represents the disconnect count of the DataStore.                               | counter | datastore |
+| `windows_hyperv_datastore_write_to_file_byte_latency_microseconds`     | Represents the write-to-file byte latency in microseconds of the DataStore.     | gauge   | datastore |
+| `windows_hyperv_datastore_write_to_file_byte_count`                    | Represents the write-to-file byte count of the DataStore.                       | counter | datastore |
+| `windows_hyperv_datastore_write_to_file_count`                         | Represents the write-to-file count of the DataStore.                            | counter | datastore |
+| `windows_hyperv_datastore_read_from_file_byte_latency_microseconds`    | Represents the read-from-file byte latency in microseconds of the DataStore.    | gauge   | datastore |
+| `windows_hyperv_datastore_read_from_file_byte_count`                   | Represents the read-from-file byte count of the DataStore.                      | counter | datastore |
+| `windows_hyperv_datastore_read_from_file_count`                        | Represents the read-from-file count of the DataStore.                           | counter | datastore |
+| `windows_hyperv_datastore_write_to_storage_byte_latency_microseconds`  | Represents the write-to-storage byte latency in microseconds of the DataStore.  | gauge   | datastore |
+| `windows_hyperv_datastore_write_to_storage_byte_count`                 | Represents the write-to-storage byte count of the DataStore.                    | counter | datastore |
+| `windows_hyperv_datastore_write_to_storage_count`                      | Represents the write-to-storage count of the DataStore.                         | counter | datastore |
+| `windows_hyperv_datastore_read_from_storage_byte_latency_microseconds` | Represents the read-from-storage byte latency in microseconds of the DataStore. | gauge   | datastore |
+| `windows_hyperv_datastore_read_from_storage_byte_count`                | Represents the read-from-storage byte count of the DataStore.                   | counter | datastore |
+| `windows_hyperv_datastore_read_from_storage_count`                     | Represents the read-from-storage count of the DataStore.                        | counter | datastore |
+| `windows_hyperv_datastore_commit_byte_latency_microseconds`            | Represents the commit byte latency in microseconds of the DataStore.            | gauge   | datastore |
+| `windows_hyperv_datastore_commit_byte_count`                           | Represents the commit byte count of the DataStore.                              | counter | datastore |
+| `windows_hyperv_datastore_commit_count`                                | Represents the commit count of the DataStore.                                   | counter | datastore |
+| `windows_hyperv_datastore_cache_update_operation_latency_microseconds` | Represents the cache update operation latency in microseconds of the DataStore. | gauge   | datastore |
+| `windows_hyperv_datastore_cache_update_operation_count`                | Represents the cache update operation count of the DataStore.                   | counter | datastore |
+| `windows_hyperv_datastore_commit_operation_latency_microseconds`       | Represents the commit operation latency in microseconds of the DataStore.       | gauge   | datastore |
+| `windows_hyperv_datastore_commit_operation_count`                      | Represents the commit operation count of the DataStore.                         | counter | datastore |
+| `windows_hyperv_datastore_compact_operation_latency_microseconds`      | Represents the compact operation latency in microseconds of the DataStore.      | gauge   | datastore |
+| `windows_hyperv_datastore_compact_operation_count`                     | Represents the compact operation count of the DataStore.                        | counter | datastore |
+| `windows_hyperv_datastore_load_file_operation_latency_microseconds`    | Represents the load file operation latency in microseconds of the DataStore.    | gauge   | datastore |
+| `windows_hyperv_datastore_load_file_operation_count`                   | Represents the load file operation count of the DataStore.                      | counter | datastore |
+| `windows_hyperv_datastore_remove_operation_latency_microseconds`       | Represents the remove operation latency in microseconds of the DataStore.       | gauge   | datastore |
+| `windows_hyperv_datastore_remove_operation_count`                      | Represents the remove operation count of the DataStore.                         | counter | datastore |
+| `windows_hyperv_datastore_query_size_operation_latency_microseconds`   | Represents the query size operation latency in microseconds of the DataStore.   | gauge   | datastore |
+| `windows_hyperv_datastore_query_size_operation_count`                  | Represents the query size operation count of the DataStore.                     | counter | datastore |
+| `windows_hyperv_datastore_set_operation_latency_microseconds`          | Represents the set operation latency in microseconds of the DataStore.          | gauge   | datastore |
+| `windows_hyperv_datastore_set_operation_count`                         | Represents the set operation count of the DataStore.                            | counter | datastore |
+
+### Hyper-V Dynamic Memory Balancer
+
+Some metrics explained: https://learn.microsoft.com/en-us/archive/blogs/chrisavis/monitoring-dynamic-memory-in-windows-server-hyper-v-2012
+
+| Name                                                                          | Description                                                                             | Type  | Labels     |
+|-------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------|-------|------------|
+| `windows_hyperv_dynamic_memory_balancer_available_memory_bytes`               | Represents the amount of memory left on the node.                                       | gauge | `balancer` |
+| `windows_hyperv_dynamic_memory_balancer_available_memory_for_balancing_bytes` | Represents the available memory for balancing purposes.                                 | gauge | `balancer` |
+| `windows_hyperv_dynamic_memory_balancer_average_pressure_ratio`               | Represents the average system pressure on the balancer node among all balanced objects. | gauge | `balancer` |
+| `windows_hyperv_dynamic_memory_balancer_system_current_pressure_ratio`        | Represents the current pressure in the system.                                          | gauge | `balancer` |
+
+
+### Hyper-V Dynamic Memory VM
+
+| Name                                                                   | Description                                                                       | Type    | Labels |
+|------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------|--------|
+| `windows_hyperv_dynamic_memory_vm_added_bytes_total`                   | Represents the cumulative amount of memory added to the VM.                       | counter | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_pressure_current_ratio`              | Represents the current pressure in the VM.                                        | gauge   | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_guest_available_bytes`               | Represents the current amount of available memory in the VM (reported by the VM). | gauge   | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_guest_visible_physical_memory_bytes` | Represents the amount of memory visible in the VM                                 | gauge   | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_pressure_maximum_ratio`              | Represents the maximum pressure band in the VM.                                   | gauge   | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_add_operations_total`                | Represents the total number of add operations for the VM.                         | counter | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_remove_operations_total`             | Represents the total number of remove operations for the VM.                      | counter | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_pressure_minimum_ratio`              | Represents the minimum pressure band in the VM.                                   | gauge   | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_physical`                            | Represents the current amount of memory in the VM.                                | gauge   | `vm`   |
+| `windows_hyperv_dynamic_memory_vm_removed_bytes_total`                 | Represents the cumulative amount of memory removed from the VM.                   | counter | `vm`   |
+
+### Hyper-V Hypervisor Logical Processor
+
+| Name                                                                 | Description                                                            | Type    | Labels         |
+|----------------------------------------------------------------------|------------------------------------------------------------------------|---------|----------------|
+| `windows_hyperv_hypervisor_logical_processor_time_total`             | Time that processor spent in different modes (hypervisor, guest, idle) | counter | `core`.`state` |
+| `windows_hyperv_hypervisor_logical_processor_context_switches_total` | The rate of virtual processor context switches on the processor.       | counter | `core`         |
+
+### Hyper-V Hypervisor Root Partition
+
+| Name                                                             | Description                                                                                                                                              | Type    | Labels |
+|------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_hyperv_root_partition_address_spaces`                   | The number of address spaces in the virtual TLB of the partition                                                                                         | gauge   | None   |
+| `windows_hyperv_root_partition_attached_devices`                 | The number of devices attached to the partition                                                                                                          | gauge   | None   |
+| `windows_hyperv_root_partition_deposited_pages`                  | The number of pages deposited into the partition                                                                                                         | gauge   | None   |
+| `windows_hyperv_root_partition_device_dma_errors`                | An indicator of illegal DMA requests generated by all devices assigned to the partition                                                                  | gauge   | None   |
+| `windows_hyperv_root_partition_device_interrupt_errors`          | An indicator of illegal interrupt requests generated by all devices assigned to the partition                                                            | gauge   | None   |
+| `windows_hyperv_root_partition_device_interrupt_mappings`        | The number of device interrupt mappings used by the partition                                                                                            | gauge   | None   |
+| `windows_hyperv_root_partition_device_interrupt_throttle_events` | The number of times an interrupt from a device assigned to the partition was temporarily throttled because the device was generating too many interrupts | gauge   | None   |
+| `windows_hyperv_root_partition_preferred_numa_node_index`        | The number of pages present in the GPA space of the partition (zero for root partition)                                                                  | gauge   | None   |
+| `windows_hyperv_root_partition_gpa_space_modifications`          | The rate of modifications to the GPA space of the partition                                                                                              | counter | None   |
+| `windows_hyperv_root_partition_io_tlb_flush_cost`                | The average time (in nanoseconds) spent processing an I/O TLB flush                                                                                      | gauge   | None   |
+| `windows_hyperv_root_partition_io_tlb_flush`                     | The rate of flushes of I/O TLBs of the partition                                                                                                         | counter | None   |
+| `windows_hyperv_root_partition_recommended_virtual_tlb_size`     | The recommended number of pages to be deposited for the virtual TLB                                                                                      | gauge   | None   |
+| `windows_hyperv_root_partition_physical_pages_allocated`         | The number of timer interrupts skipped for the partition                                                                                                 | gauge   | None   |
+| `windows_hyperv_root_partition_1G_device_pages`                  | The number of 1G pages present in the device space of the partition                                                                                      | gauge   | None   |
+| `windows_hyperv_root_partition_1G_gpa_pages`                     | The number of 1G pages present in the GPA space of the partition                                                                                         | gauge   | None   |
+| `windows_hyperv_root_partition_2M_device_pages`                  | The number of 2M pages present in the device space of the partition                                                                                      | gauge   | None   |
+| `windows_hyperv_root_partition_2M_gpa_pages`                     | The number of 2M pages present in the GPA space of the partition                                                                                         | gauge   | None   |
+| `windows_hyperv_root_partition_4K_device_pages`                  | The number of 4K pages present in the device space of the partition                                                                                      | gauge   | None   |
+| `windows_hyperv_root_partition_4K_gpa_pages`                     | The number of 4K pages present in the GPA space of the partition                                                                                         | gauge   | None   |
+| `windows_hyperv_root_partition_virtual_tlb_flush_entries`        | The rate of flushes of the entire virtual TLB                                                                                                            | counter | None   |
+| `windows_hyperv_root_partition_virtual_tlb_pages`                | The number of pages used by the virtual TLB of the partition                                                                                             | gauge   | None   |
+
+
+### Hyper-V Hypervisor Root Virtual Processor
+
+| Name                                                                      | Description                                                                                                       | Type    | Labels         |
+|---------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|---------|----------------|
+| `windows_hyperv_hypervisor_root_virtual_processor_time_total`             | Time that processor spent in different modes (hypervisor, guest_run, guest_idle, remote, total)                   | counter | `core`.`state` |
+| `windows_hyperv_hypervisor_root_virtual_cpu_wait_time_per_dispatch_total` | The average time (in nanoseconds) spent waiting for a virtual processor to be dispatched onto a logical processor | counter | `core`         |
+
+
+### Hyper-V Legacy Network Adapter
+
+| Name                                                          | Description                                                             | Type    | Labels    |
+|---------------------------------------------------------------|-------------------------------------------------------------------------|---------|-----------|
+| `windows_hyperv_legacy_network_adapter_bytes_dropped_total`   | Bytes Dropped is the number of bytes dropped on the network adapter     | counter | `adapter` |
+| `windows_hyperv_legacy_network_adapter_bytes_received_total`  | Bytes received is the number of bytes received on the network adapter   | counter | `adapter` |
+| `windows_hyperv_legacy_network_adapter_bytes_sent_total`      | Bytes sent is the number of bytes sent over the network adapter         | counter | `adapter` |
+| `windows_hyperv_legacy_network_adapter_frames_dropped_total`  | Frames Dropped is the number of frames dropped on the network adapter   | counter | `adapter` |
+| `windows_hyperv_legacy_network_adapter_frames_received_total` | Frames received is the number of frames received on the network adapter | counter | `adapter` |
+| `windows_hyperv_legacy_network_adapter_frames_sent_total`     | Frames sent is the number of frames sent over the network adapter       | counter | `adapter` |
+
+
+### Hyper-V Hypervisor Virtual Processor
+
+| Name                                                                           | Description                                                                                                        | Type    | Labels       |
+|--------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------|---------|--------------|
+| `windows_hyperv_hypervisor_virtual_processor_time_total`                       | Time that processor spent in different modes (hypervisor, guest_run, guest_idle, remote)                           | counter | `vm`, `core` |
+| `windows_hyperv_hypervisor_virtual_processor_total_run_time_total`             | Time that processor spent                                                                                          | counter | `vm`, `core` |
+| `windows_hyperv_hypervisor_virtual_processor_cpu_wait_time_per_dispatch_total` | The average time (in nanoseconds) spent waiting for a virtual processor to be dispatched onto a logical processor. | counter | `vm`, `core` |
+
+### Hyper-V Virtual Network Adapter
+
+| Name                                                                    | Description                                                                                                | Type    | Labels    |
+|-------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_hyperv_virtual_network_adapter_received_bytes_total`           | Represents the total number of bytes received per second by the network adapter                            | counter | `adapter` |
+| `windows_hyperv_virtual_network_adapter_sent_bytes_total`               | Represents the total number of bytes sent per second by the network adapter                                | counter | `adapter` |
+| `windows_hyperv_virtual_network_adapter_incoming_dropped_packets_total` | Represents the total number of dropped packets per second in the incoming direction of the network adapter | counter | `adapter` |
+| `windows_hyperv_virtual_network_adapter_outgoing_dropped_packets_total` | Represents the total number of dropped packets per second in the outgoing direction of the network adapter | counter | `adapter` |
+| `windows_hyperv_virtual_network_adapter_received_packets_total`         | Represents the total number of packets received per second by the network adapter                          | counter | `adapter` |
+| `windows_hyperv_virtual_network_adapter_sent_packets_total`             | Represents the total number of packets sent per second by the network adapter                              | counter | `adapter` |
+
+### Hyper-V Virtual Network Adapter Drop Reasons
+
+| Name                                                  | Description                                  | Type    | Labels                         |
+|-------------------------------------------------------|----------------------------------------------|---------|--------------------------------|
+| `windows_hyperv_virtual_network_adapter_drop_reasons` | Hyper-V Virtual Network Adapter Drop Reasons | counter | `adapter`,`direction`,`reason` |
+
+### Hyper-V Virtual SMB
+
+| Name                                                  | Description                                                                       | Type    | Labels     |
+|-------------------------------------------------------|-----------------------------------------------------------------------------------|---------|------------|
+| `windows_hyperv_virtual_smb_direct_mapped_sections`   | Represents the number of direct-mapped sections in the virtual SMB`               | gauge   | `instance` |
+| `windows_hyperv_virtual_smb_direct_mapped_pages`      | Represents the number of direct-mapped pages in the virtual SMB`                  | gauge   | `instance` |
+| `windows_hyperv_virtual_smb_write_bytes_rdma`         | Represents the number of bytes written per second using RDMA in the virtual SMB`  | counter | `instance` |
+| `windows_hyperv_virtual_smb_write_bytes`              | Represents the number of bytes written per second in the virtual SMB`             | counter | `instance` |
+| `windows_hyperv_virtual_smb_read_bytes_rdma`          | Represents the number of bytes read per second using RDMA in the virtual SMB`     | counter | `instance` |
+| `windows_hyperv_virtual_smb_read_bytes`               | Represents the number of bytes read per second in the virtual SMB`                | counter | `instance` |
+| `windows_hyperv_virtual_smb_flush_requests`           | Represents the number of flush requests per second in the virtual SMB`            | counter | `instance` |
+| `windows_hyperv_virtual_smb_write_requests_rdma`      | Represents the number of write requests per second using RDMA in the virtual SMB` | counter | `instance` |
+| `windows_hyperv_virtual_smb_write_requests`           | Represents the number of write requests per second in the virtual SMB`            | counter | `instance` |
+| `windows_hyperv_virtual_smb_read_requests_rdma`       | Represents the number of read requests per second using RDMA in the virtual SMB`  | counter | `instance` |
+| `windows_hyperv_virtual_smb_read_requests`            | Represents the number of read requests per second in the virtual SMB`             | counter | `instance` |
+| `windows_hyperv_virtual_smb_current_pending_requests` | Represents the current number of pending requests in the virtual SMB`             | gauge   | `instance` |
+| `windows_hyperv_virtual_smb_current_open_file_count`  | Represents the current number of open files in the virtual SMB`                   | gauge   | `instance` |
+| `windows_hyperv_virtual_smb_tree_connect_count`       | Represents the number of tree connects in the virtual SMB`                        | gauge   | `instance` |
+| `windows_hyperv_virtual_smb_requests`                 | Represents the number of requests per second in the virtual SMB`                  | counter | `instance` |
+| `windows_hyperv_virtual_smb_sent_bytes`               | Represents the number of bytes sent per second in the virtual SMB`                | counter | `instance` |
+| `windows_hyperv_virtual_smb_received_bytes`           | Represents the number of bytes received per second in the virtual SMB`            | counter | `instance` |
+
+
+### Hyper-V Virtual Switch
+
+| Name                                                                | Description                                                                                                         | Type    | Labels    |
+|---------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_hyperv_vswitch_broadcast_packets_received_total`           | Represents the total number of broadcast packets received per second by the virtual switch                          | counter | `vswitch` |
+| `windows_hyperv_vswitch_broadcast_packets_sent_total`               | Represents the total number of broadcast packets sent per second by the virtual switch                              | counter | `vswitch` |
+| `windows_hyperv_vswitch_bytes_total`                                | Represents the total number of bytes per second traversing the virtual switch                                       | counter | `vswitch` |
+| `windows_hyperv_vswitch_bytes_received_total`                       | Represents the total number of bytes received per second by the virtual switch                                      | counter | `vswitch` |
+| `windows_hyperv_vswitch_bytes_sent_total`                           | Represents the total number of bytes sent per second by the virtual switch                                          | counter | `vswitch` |
+| `windows_hyperv_vswitch_directed_packets_received_total`            | Represents the total number of directed packets received per second by the virtual switch                           | counter | `vswitch` |
+| `windows_hyperv_vswitch_directed_packets_send_total`                | Represents the total number of directed packets sent per second by the virtual switch                               | counter | `vswitch` |
+| `windows_hyperv_vswitch_dropped_packets_incoming_total`             | Represents the total number of packet dropped per second by the virtual switch in the incoming direction            | counter | `vswitch` |
+| `windows_hyperv_vswitch_dropped_packets_outcoming_total`            | Represents the total number of packet dropped per second by the virtual switch in the outgoing direction            | counter | `vswitch` |
+| `windows_hyperv_vswitch_extensions_dropped_packets_incoming_total`  | Represents the total number of packet dropped per second by the virtual switch extensions in the incoming direction | counter | `vswitch` |
+| `windows_hyperv_vswitch_extensions_dropped_packets_outcoming_total` | Represents the total number of packet dropped per second by the virtual switch extensions in the outgoing direction | counter | `vswitch` |
+| `windows_hyperv_vswitch_learned_mac_addresses_total`                | Represents the total number of learned MAC addresses of the virtual switch                                          | counter | `vswitch` |
+| `windows_hyperv_vswitch_multicast_packets_received_total`           | Represents the total number of multicast packets received per second by the virtual switch                          | counter | `vswitch` |
+| `windows_hyperv_vswitch_multicast_packets_sent_total`               | Represents the total number of multicast packets sent per second by the virtual switch                              | counter | `vswitch` |
+| `windows_hyperv_vswitch_number_of_send_channel_moves_total`         | Represents the total number of send channel moves per second on this virtual switch                                 | counter | `vswitch` |
+| `windows_hyperv_vswitch_number_of_vmq_moves_total`                  | Represents the total number of VMQ moves per second on this virtual switch                                          | counter | `vswitch` |
+| `windows_hyperv_vswitch_packets_flooded_total`                      | Represents the total number of packets flooded by the virtual switch                                                | counter | `vswitch` |
+| `windows_hyperv_vswitch_packets_total`                              | Represents the total number of packets per second traversing the virtual switch                                     | counter | `vswitch` |
+| `windows_hyperv_vswitch_packets_received_total`                     | Represents the total number of packets received per second by the virtual switch                                    | counter | `vswitch` |
+| `windows_hyperv_vswitch_packets_sent_total`                         | Represents the total number of packets send per second by the virtual switch                                        | counter | `vswitch` |
+| `windows_hyperv_vswitch_purged_mac_addresses_total`                 | Represents the total number of purged MAC addresses of the virtual switch                                           | counter | `vswitch` |
+
+### Hyper-V Virtual Storage Device
+
+| Name                                                                | Description                                                                                             | Type    | Labels   |
+|---------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------|---------|----------|
+| `windows_hyperv_virtual_storage_device_error_count_total`           | Represents the total number of errors that have occurred on this virtual device.                        | counter | `device` |
+| `windows_hyperv_virtual_storage_device_queue_length`                | Represents the average queue length on this virtual device.                                             | gauge   | `device` |
+| `windows_hyperv_virtual_storage_device_bytes_read`                  | Represents the total number of bytes that have been read on this virtual device.                        | counter | `device` |
+| `windows_hyperv_virtual_storage_device_operations_read_total`       | Represents the total number of read operations that have occurred on this virtual device.               | counter | `device` |
+| `windows_hyperv_virtual_storage_device_bytes_written`               | Represents the total number of bytes that have been written on this virtual device.                     | counter | `device` |
+| `windows_hyperv_virtual_storage_device_operations_written_total`    | Represents the total number of write operations that have occurred on this virtual device.              | counter | `device` |
+| `windows_hyperv_virtual_storage_device_latency_seconds`             | Represents the average IO transfer latency for this virtual device.                                     | gauge   | `device` |
+| `windows_hyperv_virtual_storage_device_throughput`                  | Represents the average number of 8KB IO transfers completed by this virtual device.                     | gauge   | `device` |
+| `windows_hyperv_virtual_storage_device_normalized_throughput`       | Represents the average number of IO transfers completed by this virtual device.                         | gauge   | `device` |
+| `windows_hyperv_virtual_storage_device_lower_queue_length`          | Represents the average queue length on the underlying storage subsystem for this device.                | gauge   | `device` |
+| `windows_hyperv_virtual_storage_device_lower_latency_seconds`       | Represents the average IO transfer latency on the underlying storage subsystem for this virtual device. | gauge   | `device` |
+| `windows_hyperv_virtual_storage_device_io_quota_replenishment_rate` | Represents the IO quota replenishment rate for this virtual device.                                     | gauge   | `device` |
+
+### Hyper-V VM Vid Partition
+
+| Name                                           | Description                                                             | Type  | Labels |
+|------------------------------------------------|-------------------------------------------------------------------------|-------|--------|
+| `windows_hyperv_vid_physical_pages_allocated`  | The number of physical pages allocated                                  | gauge | `vm`   |
+| `windows_hyperv_vid_preferred_numa_node_index` | The preferred NUMA node index associated with this partition            | gauge | `vm`   |
+| `windows_hyperv_vid_remote_physical_pages`     | The number of physical pages not allocated from the preferred NUMA node | gauge | `vm`   |
+
+
+### Hyper-V Virtual Machine Health Summary
+
+| Name                                                 | Description                                           | Type  | Labels |
+|------------------------------------------------------|-------------------------------------------------------|-------|--------|
+| `windows_hyperv_virtual_machine_health_total_count` | Represents the number of virtual machines with health | gauge | None   |
+
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_
@@ -113,19 +265,19 @@ _This collector does not yet have explained examples, we would appreciate your h
 ## Useful queries
 Percent of physical CPU resources used per VM (on instance "localhost")
 ```
-(sum (rate(windows_hyperv_vm_cpu_hypervisor_run_time{instance="localhost"}[1m]))) / ignoring(vm) group_left max (windows_cs_logical_processors{instance="localhost"}) / 100000
+(sum (rate(windows_hyperv_hypervisor_virtual_processor_time_total{state="hypervisor",instance="localhost"}[1m]))) / ignoring(state,vm) group_left max (windows_cpu_logical_processor{instance="localhost"}) / 100000
 ```
 Percent of physical CPU resources used by all VMs (on all monitored hosts)
 ```
-(sum by (instance)(rate(windows_hyperv_vm_cpu_total_run_time{}[1m]))) / max by (instance)(windows_cs_logical_processors{}) / 100000
+(sum by (instance)(rate(windows_hyperv_hypervisor_virtual_processor_total_run_time_total{}[1m]))) / max by (instance)(windows_cpu_logical_processor{}) / 100000
 ```
 Percent of physical CPU resources by the hosts themselves (on all monitored hosts)
 ```
-(sum by (instance)(rate(windows_hyperv_host_cpu_total_run_time{}[1m]))) / sum by (instance)(windows_cs_logical_processors{}) / 100000
+(sum by (instance)(rate(windows_hyperv_hypervisor_root_virtual_processor_total_run_time_total{state="total"}[1m]))) / sum by (instance)(windows_cpu_logical_processor{}) / 100000
 ```
 Percent of physical CPU resources by the hypervisor (on all monitored hosts)
 ```
-(sum by (instance)(rate(windows_hyperv_host_lp_total_run_time_percent{}[1m]))) / sum by (instance)(windows_hyperv_hypervisor_logical_processors{}) / 100000
+(sum by (instance)(rate(windows_hyperv_hypervisor_logical_processor_total_run_time_total{}[1m]))) / sum by (instance)(windows_cpu_logical_processor{}) / 100000
 ```
 
 ## Alerting examples

docs/collector.logon.md

@@ -2,13 +2,11 @@
 
 The logon collector exposes metrics detailing the active user logon sessions.
 
-|||
--|-
-Metric name prefix  | `logon`
-Classes             | [`Win32_LogonSession`](https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/win32-logonsession)
-Enabled by default? | No
-
-> :warning: **On some deployments, this collector seems to have some memory/timeout issues**: See [#583](https://github.com/prometheus-community/windows_exporter/issues/583)
+|                     |           |
+|---------------------|-----------|
+| Metric name prefix  | `logon`   |
+| Source              | Win32 API |
+| Enabled by default? | No        |
 
 ## Flags
 
@@ -16,21 +14,65 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_logon_logon_type` | Number of active user logon sessions | gauge | status
+| Name                                      | Description                                | Type  | Labels                             |
+|-------------------------------------------|--------------------------------------------|-------|------------------------------------|
+| `windows_logon_session_logon_timestamp_seconds` | timestamp of the logon session in seconds. | gauge | `domain`, `id`, `type`, `username` |
 
 ### Example metric
 Query the total number of interactive logon sessions
 ```
-windows_logon_logon_type{status="interactive"}
+# HELP windows_logon_session_logon_timestamp_seconds timestamp of the logon session in seconds.
+# TYPE windows_logon_session_logon_timestamp_seconds gauge
+windows_logon_session_logon_timestamp_seconds{domain="",id="0x0:0x8c54",type="System",username=""} 1.72876928e+09
+windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x991a",type="Interactive",username="UMFD-1"} 1.728769282e+09
+windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x9933",type="Interactive",username="UMFD-0"} 1.728769282e+09
+windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x994a",type="Interactive",username="UMFD-0"} 1.728769282e+09
+windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x999d",type="Interactive",username="UMFD-1"} 1.728769282e+09
+windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0xbf25a",type="Interactive",username="UMFD-2"} 1.728769532e+09
+windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0xbf290",type="Interactive",username="UMFD-2"} 1.728769532e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x130241",type="Network",username="vm-jok-dev$"} 1.728769625e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x24f7c9",type="Network",username="vm-jok-dev$"} 1.728770121e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x276846",type="Network",username="vm-jok-dev$"} 1.728770195e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x3e4",type="Service",username="vm-jok-dev$"} 1.728769283e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x3e7",type="System",username="vm-jok-dev$"} 1.728769279e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x71d0f",type="Network",username="vm-jok-dev$"} 1.728769324e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x720a3",type="Network",username="vm-jok-dev$"} 1.728769324e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x725cb",type="Network",username="vm-jok-dev$"} 1.728769324e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x753d8",type="Network",username="vm-jok-dev$"} 1.728769325e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0xa3913",type="Network",username="vm-jok-dev$"} 1.728769385e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0xbe7f2",type="Network",username="jok"} 1.728769531e+09
+windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0xc76c4",type="RemoteInteractive",username="jok"} 1.728769533e+09
+windows_logon_session_logon_timestamp_seconds{domain="NT AUTHORITY",id="0x0:0x3e3",type="Service",username="IUSR"} 1.728769295e+09
+windows_logon_session_logon_timestamp_seconds{domain="NT AUTHORITY",id="0x0:0x3e5",type="Service",username="LOCAL SERVICE"} 1.728769283e+09
+windows_logon_session_logon_timestamp_seconds{domain="NT Service",id="0x0:0xae4c7",type="Service",username="MSSQLSERVER"} 1.728769425e+09
+windows_logon_session_logon_timestamp_seconds{domain="NT Service",id="0x0:0xb42f1",type="Service",username="SQLTELEMETRY"} 1.728769431e+09
+windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xbfbac",type="Interactive",username="DWM-2"} 1.728769532e+09
+windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xbfc72",type="Interactive",username="DWM-2"} 1.728769532e+09
+windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xdedd",type="Interactive",username="DWM-1"} 1.728769283e+09
+windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xdefd",type="Interactive",username="DWM-1"} 1.728769283e+09
 ```
 
+### Possible values for `type`
+
+- System
+- Interactive
+- Network
+- Batch
+- Service
+- Proxy
+- Unlock
+- NetworkCleartext
+- NewCredentials
+- RemoteInteractive
+- CachedInteractive
+- CachedRemoteInteractive
+- CachedUnlock
+
 ## Useful queries
 Query the total number of local and remote (I.E. Terminal Services) interactive sessions.
 ```
-windows_logon_logon_type{status=~"interactive|remote_interactive"}
+count(windows_logon_logon_type{type=~"Interactive|RemoteInteractive"}) by (type)
 ```
 
 ## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_
+_This collector doesn’t yet have alerting examples, we would appreciate your help adding them!_

docs/collector.memory.md

@@ -5,9 +5,9 @@ The memory collector exposes metrics about system memory usage
 |||
 -|-
 Metric name prefix  | `memory`
-Data source         | Perflib
-Classes             | `Win32_PerfRawData_PerfOS_Memory`
-Enabled by default? | No
+Data source         | Performance Counters
+Classes             | -
+Enabled by default? | Yes
 
 ## Flags
 
@@ -15,46 +15,73 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_memory_available_bytes` | The amount of physical memory immediately available for allocation to a process or for system use. It is equal to the sum of memory assigned to the standby (cached), free and zero page lists | gauge | None
-`windows_memory_cache_bytes` | Number of bytes currently being used by the file system cache | gauge | None
-`windows_memory_cache_bytes_peak` | Maximum number of CacheBytes after the system was last restarted | gauge | None
-`windows_memory_cache_faults_total` | 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) | counter | None
-`windows_memory_commit_limit` | Amount of virtual memory, in bytes, that can be committed without having to extend the paging file(s) | gauge | None
-`windows_memory_committed_bytes` | Amount of committed virtual memory, in bytes | gauge | None
-`windows_memory_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 | counter | None
-`windows_memory_free_and_zero_page_list_bytes` | 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 | gauge | None
-`windows_memory_free_system_page_table_entries` | Number of page table entries not being used by the system | gauge | None
-`windows_memory_modified_page_list_bytes` | 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. This memory needs to be written out before it will be available for allocation to a process or for system use | gauge | None
-`windows_memory_page_faults_total` | Overall rate at which faulted pages are handled by the processor | counter | None
-`windows_memory_swap_page_reads_total` | Number of disk page reads (a single read operation reading several pages is still only counted once) | counter | None
-`windows_memory_swap_pages_read_total` | Number of pages read across all page reads (ie counting all pages read even if they are read in a single operation) | counter | None
-`windows_memory_swap_pages_written_total` | Number of pages written across all page writes (ie counting all pages written even if they are written in a single operation) | counter | None
-`windows_memory_swap_page_operations_total` | Total number of swap page read and writes (PagesPersec) | counter | None
-`windows_memory_swap_page_writes_total` | Number of disk page writes (a single write operation writing several pages is still only counted once) | counter | None
-`windows_memory_pool_nonpaged_allocs_total` | The number of calls to allocate space in the nonpaged pool. The nonpaged pool is an area of system memory area for objects that cannot be written to disk, and must remain in physical memory as long as they are allocated | counter | None
-`windows_memory_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 | gauge | None
-`windows_memory_pool_paged_allocs_total` | Number of calls to allocate space in the paged pool, regardless of the amount of space allocated in each call | counter | None
-`windows_memory_pool_paged_bytes` | Number of bytes in the paged pool | gauge | None
-`windows_memory_pool_paged_resident_bytes` | 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 | gauge | None
-`windows_memory_standby_cache_core_bytes` | 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. It is immediately available for allocation to a process or for system use. If the system runs out of available free and zero memory, memory on lower priority standby cache page lists will be repurposed before memory on higher priority standby cache page lists | gauge | None
-`windows_memory_standby_cache_normal_priority_bytes` | 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. It is immediately available for allocation to a process or for system use. If the system runs out of available free and zero memory, memory on lower priority standby cache page lists will be repurposed before memory on higher priority standby cache page lists | gauge | None
-`windows_memory_standby_cache_reserve_bytes` | 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. It is immediately available for allocation to a process or for system use. If the system runs out of available free and zero memory, memory on lower priority standby cache page lists will be repurposed before memory on higher priority standby cache page lists | gauge | None
-`windows_memory_system_cache_resident_bytes` | The size, in bytes, of the portion of the system file cache which is currently resident and active in physical memory | gauge | None
-`windows_memory_system_code_resident_bytes` | The size, in bytes, of the pageable operating system code that is currently resident and active in physical memory. This value is a component of Memory\\System Code Total Bytes. Memory\\System Code Resident Bytes (and Memory\\System Code Total Bytes) does not include code that must remain in physical memory and cannot be written to disk | gauge | None
-`windows_memory_system_code_total_bytes` | The size, in bytes, of the pageable operating system code currently mapped into the system virtual address space. This value is calculated by summing the bytes in Ntoskrnl.exe, Hal.dll, the boot drivers, and file systems loaded by Ntldr/osloader. This counter does not include code that must remain in physical memory and cannot be written to disk | gauge | None
-`windows_memory_system_driver_resident_bytes` | 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. This value is a component of Memory\\System Driver Total Bytes, which also includes driver memory that has been written to disk. Neither Memory\\System Driver Resident Bytes nor Memory\\System Driver Total Bytes includes memory that cannot be written to disk | gauge | None
-`windows_memory_system_driver_total_bytes` | 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. It includes both physical memory (Memory\\System Driver Resident Bytes) and code and data paged to disk. It is a component of Memory\\System Code Total Bytes | gauge | None
-`windows_memory_transition_faults_total` | 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. The pages were recovered without additional disk activity. Transition faults are counted in numbers of faults; because only one page is faulted in each operation, it is also equal to the number of pages faulted | counter | None
-`windows_memory_transition_pages_repurposed_total` | Transition Pages RePurposed is the rate at which the number of transition cache pages were reused for a different purpose. These pages would have otherwise remained in the page cache to provide a (fast) soft fault (instead of retrieving it from backing store) in the event the page was accessed in the future | counter | None
-`windows_memory_write_copies_total` | The number of page faults caused by attempting to write that were satisfied by copying the page from elsewhere in physical memory | counter | None
+| Name                                                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels |
+|------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_memory_available_bytes`                     | The amount of physical memory immediately available for allocation to a process or for system use. It is equal to the sum of memory assigned to the standby (cached), free and zero page lists                                                                                                                                                                                                                                                                                                      | gauge   | None   |
+| `windows_memory_cache_bytes`                         | Number of bytes currently being used by the file system cache                                                                                                                                                                                                                                                                                                                                                                                                                                       | gauge   | None   |
+| `windows_memory_cache_bytes_peak`                    | Maximum number of CacheBytes after the system was last restarted                                                                                                                                                                                                                                                                                                                                                                                                                                    | gauge   | None   |
+| `windows_memory_cache_faults_total`                  | 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)                                                                                                                                                                                                                                                                                                                   | counter | None   |
+| `windows_memory_commit_limit`                        | Amount of virtual memory, in bytes, that can be committed without having to extend the paging file(s)                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | None   |
+| `windows_memory_committed_bytes`                     | Amount of committed virtual memory, in bytes                                                                                                                                                                                                                                                                                                                                                                                                                                                        | gauge   | None   |
+| `windows_memory_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                                                                                                                                                                                                                                | counter | None   |
+| `windows_memory_free_and_zero_page_list_bytes`       | 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                                                                                                                                                                                                                                                                                      | gauge   | None   |
+| `windows_memory_free_system_page_table_entries`      | Number of page table entries not being used by the system                                                                                                                                                                                                                                                                                                                                                                                                                                           | gauge   | None   |
+| `windows_memory_modified_page_list_bytes`            | 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. This memory needs to be written out before it will be available for allocation to a process or for system use                                                                                                                                                                             | gauge   | None   |
+| `windows_memory_page_faults_total`                   | Overall rate at which faulted pages are handled by the processor                                                                                                                                                                                                                                                                                                                                                                                                                                    | counter | None   |
+| `windows_memory_swap_page_reads_total`               | Number of disk page reads (a single read operation reading several pages is still only counted once)                                                                                                                                                                                                                                                                                                                                                                                                | counter | None   |
+| `windows_memory_swap_pages_read_total`               | Number of pages read across all page reads (ie counting all pages read even if they are read in a single operation)                                                                                                                                                                                                                                                                                                                                                                                 | counter | None   |
+| `windows_memory_swap_pages_written_total`            | Number of pages written across all page writes (ie counting all pages written even if they are written in a single operation)                                                                                                                                                                                                                                                                                                                                                                       | counter | None   |
+| `windows_memory_swap_page_operations_total`          | Total number of swap page read and writes (PagesPersec)                                                                                                                                                                                                                                                                                                                                                                                                                                             | counter | None   |
+| `windows_memory_swap_page_writes_total`              | Number of disk page writes (a single write operation writing several pages is still only counted once)                                                                                                                                                                                                                                                                                                                                                                                              | counter | None   |
+| `windows_memory_physical_free_bytes`                 | Bytes of physical memory currently unused and available                                                                                                                                                                                                                                                                                                                                                                                                                                             | gauge   | None   |
+| `windows_memory_physical_total_bytes`                | Total bytes of physical memory available to the operating system. This value does not necessarily indicate the true amount of physical memory, but what is reported to the operating system as available to it                                                                                                                                                                                                                                                                                      | gauge   | None   |
+| `windows_memory_pool_nonpaged_allocs_total`          | The number of calls to allocate space in the nonpaged pool. The nonpaged pool is an area of system memory area for objects that cannot be written to disk, and must remain in physical memory as long as they are allocated                                                                                                                                                                                                                                                                         | counter | None   |
+| `windows_memory_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                                                                                                                                                                                                                                                                                               | gauge   | None   |
+| `windows_memory_pool_paged_allocs_total`             | Number of calls to allocate space in the paged pool, regardless of the amount of space allocated in each call                                                                                                                                                                                                                                                                                                                                                                                       | counter | None   |
+| `windows_memory_pool_paged_bytes`                    | Number of bytes in the paged pool                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | gauge   | None   |
+| `windows_memory_pool_paged_resident_bytes`           | 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                                                                                                                                                                                                                                             | gauge   | None   |
+| `windows_memory_process_memory_limit_bytes`          | Maximum number of bytes of memory that can be allocated to a process                                                                                                                                                                                                                                                                                                                                                                                                                                | gauge   | None   |
+| `windows_memory_standby_cache_core_bytes`            | 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. It is immediately available for allocation to a process or for system use. If the system runs out of available free and zero memory, memory on lower priority standby cache page lists will be repurposed before memory on higher priority standby cache page lists            | gauge   | None   |
+| `windows_memory_standby_cache_normal_priority_bytes` | 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. It is immediately available for allocation to a process or for system use. If the system runs out of available free and zero memory, memory on lower priority standby cache page lists will be repurposed before memory on higher priority standby cache page lists | gauge   | None   |
+| `windows_memory_standby_cache_reserve_bytes`         | 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. It is immediately available for allocation to a process or for system use. If the system runs out of available free and zero memory, memory on lower priority standby cache page lists will be repurposed before memory on higher priority standby cache page lists         | gauge   | None   |
+| `windows_memory_system_cache_resident_bytes`         | The size, in bytes, of the portion of the system file cache which is currently resident and active in physical memory                                                                                                                                                                                                                                                                                                                                                                               | gauge   | None   |
+| `windows_memory_system_code_resident_bytes`          | The size, in bytes, of the pageable operating system code that is currently resident and active in physical memory. This value is a component of Memory\\System Code Total Bytes. Memory\\System Code Resident Bytes (and Memory\\System Code Total Bytes) does not include code that must remain in physical memory and cannot be written to disk                                                                                                                                                  | gauge   | None   |
+| `windows_memory_system_code_total_bytes`             | The size, in bytes, of the pageable operating system code currently mapped into the system virtual address space. This value is calculated by summing the bytes in Ntoskrnl.exe, Hal.dll, the boot drivers, and file systems loaded by Ntldr/osloader. This counter does not include code that must remain in physical memory and cannot be written to disk                                                                                                                                         | gauge   | None   |
+| `windows_memory_system_driver_resident_bytes`        | 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. This value is a component of Memory\\System Driver Total Bytes, which also includes driver memory that has been written to disk. Neither Memory\\System Driver Resident Bytes nor Memory\\System Driver Total Bytes includes memory that cannot be written to disk                                                                                   | gauge   | None   |
+| `windows_memory_system_driver_total_bytes`           | 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. It includes both physical memory (Memory\\System Driver Resident Bytes) and code and data paged to disk. It is a component of Memory\\System Code Total Bytes                                                                                                                                                                          | gauge   | None   |
+| `windows_memory_transition_faults_total`             | 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. The pages were recovered without additional disk activity. Transition faults are counted in numbers of faults; because only one page is faulted in each operation, it is also equal to the number of pages faulted                        | counter | None   |
+| `windows_memory_transition_pages_repurposed_total`   | Transition Pages RePurposed is the rate at which the number of transition cache pages were reused for a different purpose. These pages would have otherwise remained in the page cache to provide a (fast) soft fault (instead of retrieving it from backing store) in the event the page was accessed in the future                                                                                                                                                                                | counter | None   |
+| `windows_memory_write_copies_total`                  | The number of page faults caused by attempting to write that were satisfied by copying the page from elsewhere in physical memory                                                                                                                                                                                                                                                                                                                                                                   | counter | None   |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_
 
 ## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
 
+Show memory usage for instance (%)
+```
+100 - 100 * windows_memory_physical_free_bytes{instance="localhost"} / windows_memory_physical_total_bytes
+```
 ## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_
+
+**prometheus.rules**
+```yaml
+# Alert on hosts that have exhausted all available physical memory
+- alert: MemoryExhausted
+  expr: windows_os_physical_memory_free_bytes == 0
+  for: 10m
+  labels:
+    severity: high
+  annotations:
+    summary: "Host {{ $labels.instance }} is out of memory"
+    description: "{{ $labels.instance }} has exhausted all available physical memory"
+
+# Alert on hosts with greater than 90% memory usage
+- alert: MemoryLow
+  expr: 100 - 100 * windows_memory_physical_free_bytes{instance="localhost"} / windows_memory_physical_total_bytes > 90
+  for: 10m
+  labels:
+    severity: warning
+  annotations:
+    summary: "Memory usage for host {{ $labels.instance }} is greater than 90%"
+```

docs/collector.mscluster.md

@@ -0,0 +1,186 @@
+# mscluster_cluster collector
+
+The MSCluster_Cluster class is a dynamic WMI class that represents a cluster.
+
+|||
+-|-
+Metric name prefix  | `mscluster`
+Classes             | `MSCluster_Cluster`,`MSCluster_Network`,`MSCluster_Node`,`MSCluster_Resource`,`MSCluster_ResourceGroup`
+Enabled by default? | No
+
+## Flags
+
+### `--collectors.mscluster.enabled`
+Comma-separated list of collectors to use, for example:
+`--collectors.mscluster.enabled=cluster,network,node,resource,resouregroup`. 
+Matching is case-sensitive.
+
+## Metrics
+
+### Cluster
+
+| Name                                                        | Description                                                                                                                                                                                                                                                            | Type  | Labels |
+|-------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|--------|
+| `mscluster_cluster_AddEvictDelay`                           | Provides access to the cluster's AddEvictDelay property, which is the number a seconds that a new node is delayed after an eviction of another node.                                                                                                                   | gauge | `name` |
+| `mscluster_cluster_AdminAccessPoint`                        | The type of the cluster administrative access point.                                                                                                                                                                                                                   | gauge | `name` |
+| `mscluster_cluster_AutoAssignNodeSite`                      | Determines whether or not the cluster will attempt to automatically assign nodes to sites based on networks and Active Directory Site information.                                                                                                                     | gauge | `name` |
+| `mscluster_cluster_AutoBalancerLevel`                       | Determines the level of aggressiveness of AutoBalancer.                                                                                                                                                                                                                | gauge | `name` |
+| `mscluster_cluster_AutoBalancerMode`                        | Determines whether or not the auto balancer is enabled.                                                                                                                                                                                                                | gauge | `name` |
+| `mscluster_cluster_BackupInProgress`                        | Indicates whether a backup is in progress.                                                                                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_BlockCacheSize`                          | CSV BlockCache Size in MB.                                                                                                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_ClusSvcHangTimeout`                      | Controls how long the cluster network driver waits between Failover Cluster Service heartbeats before it determines that the Failover Cluster Service has stopped responding.                                                                                          | gauge | `name` |
+| `mscluster_cluster_ClusSvcRegroupOpeningTimeout`            | Controls how long a node will wait on other nodes in the opening stage before deciding that they failed.                                                                                                                                                               | gauge | `name` |
+| `mscluster_cluster_ClusSvcRegroupPruningTimeout`            | Controls how long the membership leader will wait to reach full connectivity between cluster nodes.                                                                                                                                                                    | gauge | `name` |
+| `mscluster_cluster_ClusSvcRegroupStageTimeout`              | Controls how long a node will wait on other nodes in a membership stage before deciding that they failed.                                                                                                                                                              | gauge | `name` |
+| `mscluster_cluster_ClusSvcRegroupTickInMilliseconds`        | Controls how frequently the membership algorithm is sending periodic membership messages.                                                                                                                                                                              | gauge | `name` |
+| `mscluster_cluster_ClusterEnforcedAntiAffinity`             | Enables or disables hard enforcement of group anti-affinity classes.                                                                                                                                                                                                   | gauge | `name` |
+| `mscluster_cluster_ClusterFunctionalLevel`                  | The functional level the cluster is currently running in.                                                                                                                                                                                                              | gauge | `name` |
+| `mscluster_cluster_ClusterGroupWaitDelay`                   | Maximum time in seconds that a group waits for its preferred node to come online during cluster startup before coming online on a different node.                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_ClusterLogLevel`                         | Controls the level of cluster logging.                                                                                                                                                                                                                                 | gauge | `name` |
+| `mscluster_cluster_ClusterLogSize`                          | Controls the maximum size of the cluster log files on each of the nodes.                                                                                                                                                                                               | gauge | `name` |
+| `mscluster_cluster_ClusterUpgradeVersion`                   | Specifies the upgrade version the cluster is currently running in.                                                                                                                                                                                                     | gauge | `name` |
+| `mscluster_cluster_CrossSiteDelay`                          | Controls how long the cluster network driver waits in milliseconds between sending Cluster Service heartbeats across sites.                                                                                                                                            | gauge | `name` |
+| `mscluster_cluster_CrossSiteThreshold`                      | Controls how many Cluster Service heartbeats can be missed across sites before it determines that Cluster Service has stopped responding.                                                                                                                              | gauge | `name` |
+| `mscluster_cluster_CrossSubnetDelay`                        | Controls how long the cluster network driver waits in milliseconds between sending Cluster Service heartbeats across subnets.                                                                                                                                          | gauge | `name` |
+| `mscluster_cluster_CrossSubnetThreshold`                    | Controls how many Cluster Service heartbeats can be missed across subnets before it determines that Cluster Service has stopped responding.                                                                                                                            | gauge | `name` |
+| `mscluster_cluster_CsvBalancer`                             | Whether automatic balancing for CSV is enabled.                                                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_DatabaseReadWriteMode`                   | Sets the database read and write mode.                                                                                                                                                                                                                                 | gauge | `name` |
+| `mscluster_cluster_DefaultNetworkRole`                      | Provides access to the cluster's DefaultNetworkRole property.                                                                                                                                                                                                          | gauge | `name` |
+| `mscluster_cluster_DetectedCloudPlatform`                   |                                                                                                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_DetectManagedEvents`                     |                                                                                                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_DetectManagedEventsThreshold`            |                                                                                                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_DisableGroupPreferredOwnerRandomization` |                                                                                                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_DrainOnShutdown`                         | Whether to drain the node when cluster service is being stopped.                                                                                                                                                                                                       | gauge | `name` |
+| `mscluster_cluster_DynamicQuorumEnabled`                    | Allows cluster service to adjust node weights as needed to increase availability.                                                                                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_EnableSharedVolumes`                     | Enables or disables cluster shared volumes on this cluster.                                                                                                                                                                                                            | gauge | `name` |
+| `mscluster_cluster_FixQuorum`                               | Provides access to the cluster's FixQuorum property, which specifies if the cluster is in a fix quorum state.                                                                                                                                                          | gauge | `name` |
+| `mscluster_cluster_GracePeriodEnabled`                      | Whether the node grace period feature of this cluster is enabled.                                                                                                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_GracePeriodTimeout`                      | The grace period timeout in milliseconds.                                                                                                                                                                                                                              | gauge | `name` |
+| `mscluster_cluster_GroupDependencyTimeout`                  | The timeout after which a group will be brought online despite unsatisfied dependencies                                                                                                                                                                                | gauge | `name` |
+| `mscluster_cluster_HangRecoveryAction`                      | Controls the action to take if the user-mode processes have stopped responding.                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_IgnorePersistentStateOnStartup`          | Provides access to the cluster's IgnorePersistentStateOnStartup property, which specifies whether the cluster will bring online groups that were online when the cluster was shut down.                                                                                | gauge | `name` |
+| `mscluster_cluster_LogResourceControls`                     | Controls the logging of resource controls.                                                                                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_LowerQuorumPriorityNodeId`               | Specifies the Node ID that has a lower priority when voting for quorum is performed. If the quorum vote is split 50/50%, the specified node's vote would be ignored to break the tie. If this is not set then the cluster will pick a node at random to break the tie. | gauge | `name` |
+| `mscluster_cluster_MaxNumberOfNodes`                        | Indicates the maximum number of nodes that may participate in the Cluster.                                                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_MessageBufferLength`                     | The maximum unacknowledged message count for GEM.                                                                                                                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_MinimumNeverPreemptPriority`             | Groups with this priority or higher cannot be preempted.                                                                                                                                                                                                               | gauge | `name` |
+| `mscluster_cluster_MinimumPreemptorPriority`                | Minimum priority a cluster group must have to be able to preempt another group.                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_NetftIPSecEnabled`                       | Whether IPSec is enabled for cluster internal traffic.                                                                                                                                                                                                                 | gauge | `name` |
+| `mscluster_cluster_PlacementOptions`                        | Various option flags to modify default placement behavior.                                                                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_PlumbAllCrossSubnetRoutes`               | Plumbs all possible cross subnet routes to all nodes.                                                                                                                                                                                                                  | gauge | `name` |
+| `mscluster_cluster_PreventQuorum`                           | Whether the cluster will ignore group persistent state on startup.                                                                                                                                                                                                     | gauge | `name` |
+| `mscluster_cluster_QuarantineDuration`                      | The quarantine period timeout in milliseconds.                                                                                                                                                                                                                         | gauge | `name` |
+| `mscluster_cluster_QuarantineThreshold`                     | Number of node failures before it will be quarantined.                                                                                                                                                                                                                 | gauge | `name` |
+| `mscluster_cluster_QuorumArbitrationTimeMax`                | Controls the maximum time necessary to decide the Quorum owner node.                                                                                                                                                                                                   | gauge | `name` |
+| `mscluster_cluster_QuorumArbitrationTimeMin`                | Controls the minimum time necessary to decide the Quorum owner node.                                                                                                                                                                                                   | gauge | `name` |
+| `mscluster_cluster_QuorumLogFileSize`                       | This property is obsolete.                                                                                                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_QuorumTypeValue`                         | Get the current quorum type value. -1: Unknown; 1: Node; 2: FileShareWitness; 3: Storage; 4: None                                                                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_RequestReplyTimeout`                     | Controls the request reply time-out period.                                                                                                                                                                                                                            | gauge | `name` |
+| `mscluster_cluster_ResiliencyDefaultPeriod`                 | The default resiliency period, in seconds, for the cluster.                                                                                                                                                                                                            | gauge | `name` |
+| `mscluster_cluster_ResiliencyLevel`                         | The resiliency level for the cluster.                                                                                                                                                                                                                                  | gauge | `name` |
+| `mscluster_cluster_ResourceDllDeadlockPeriod`               | This property is obsolete.                                                                                                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_RootMemoryReserved`                      | Controls the amount of memory reserved for the parent partition on all cluster nodes.                                                                                                                                                                                  | gauge | `name` |
+| `mscluster_cluster_RouteHistoryLength`                      | The history length for routes to help finding network issues.                                                                                                                                                                                                          | gauge | `name` |
+| `mscluster_cluster_S2DBusTypes`                             | Bus types for storage spaces direct.                                                                                                                                                                                                                                   | gauge | `name` |
+| `mscluster_cluster_S2DCacheDesiredState`                    | Desired state of the storage spaces direct cache.                                                                                                                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_S2DCacheFlashReservePercent`             | Percentage of allocated flash space to utilize when caching.                                                                                                                                                                                                           | gauge | `name` |
+| `mscluster_cluster_S2DCachePageSizeKBytes`                  | Page size in KB used by S2D cache.                                                                                                                                                                                                                                     | gauge | `name` |
+| `mscluster_cluster_S2DEnabled`                              | Whether direct attached storage (DAS) is enabled.                                                                                                                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_S2DIOLatencyThreshold`                   | The I/O latency threshold for storage spaces direct.                                                                                                                                                                                                                   | gauge | `name` |
+| `mscluster_cluster_S2DOptimizations`                        | Optimization flags for storage spaces direct.                                                                                                                                                                                                                          | gauge | `name` |
+| `mscluster_cluster_SameSubnetDelay`                         | Controls how long the cluster network driver waits in milliseconds between sending Cluster Service heartbeats on the same subnet.                                                                                                                                      | gauge | `name` |
+| `mscluster_cluster_SameSubnetThreshold`                     | Controls how many Cluster Service heartbeats can be missed on the same subnet before it determines that Cluster Service has stopped responding.                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_SecurityLevel`                           | Controls the level of security that should apply to intracluster messages. 0: Clear Text; 1: Sign; 2: Encrypt                                                                                                                                                          | gauge | `name` |
+| `mscluster_cluster_SecurityLevelForStorage`                 |                                                                                                                                                                                                                                                                        | gauge | `name` |
+| `mscluster_cluster_SharedVolumeVssWriterOperationTimeout`   | CSV VSS Writer operation timeout in seconds.                                                                                                                                                                                                                           | gauge | `name` |
+| `mscluster_cluster_ShutdownTimeoutInMinutes`                | The maximum time in minutes allowed for cluster resources to come offline during cluster service shutdown.                                                                                                                                                             | gauge | `name` |
+| `mscluster_cluster_UseClientAccessNetworksForSharedVolumes` | Whether the use of client access networks for cluster shared volumes feature of this cluster is enabled. 0: Disabled; 1: Enabled; 2: Auto                                                                                                                              | gauge | `name` |
+| `mscluster_cluster_WitnessDatabaseWriteTimeout`             | Controls the maximum time in seconds that a cluster database write to a witness can take before the write is abandoned.                                                                                                                                                | gauge | `name` |
+| `mscluster_cluster_WitnessDynamicWeight`                    | The weight of the configured witness.                                                                                                                                                                                                                                  | gauge | `name` |
+| `mscluster_cluster_WitnessRestartInterval`                  | Controls the witness restart interval.                                                                                                                                                                                                                                 | gauge | `name` |
+
+### Network
+
+| Name                                | Description                                                                                                                                                                                                                                                             | Type  | Labels |
+|-------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|--------|
+| `mscluster_network_Characteristics` | Provides the characteristics of the network. The cluster defines characteristics only for resources. For a description of these characteristics, see [CLUSCTL_RESOURCE_GET_CHARACTERISTICS](https://msdn.microsoft.com/library/aa367466).                               | gauge | `name` |
+| `mscluster_network_Flags`           | Provides access to the flags set for the network. The cluster defines flags only for resources. For a description of these flags, see [CLUSCTL_RESOURCE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-flags). | gauge | `name` |
+| `mscluster_network_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.                                                                                                                        | gauge | `name` |
+| `mscluster_network_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                                                                                                             | gauge | `name` |
+| `mscluster_network_State`           | Provides the current state of the network. 1-1: Unknown; 0: Unavailable; 1: Down; 2: Partitioned; 3: Up                                                                                                                                                                 | gauge | `name` |
+
+### Network
+
+| Name                                   | Description                                                                                                                                                                                                                                        | Type  | Labels |
+|----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|--------|
+| `mscluster_node_BuildNumber`           | Provides access to the node's BuildNumber property.                                                                                                                                                                                                | gauge | `name` |
+| `mscluster_node_Characteristics`       | Provides access to the characteristics set for the node. For a list of possible characteristics, see [CLUSCTL_NODE_GET_CHARACTERISTICS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-node-get-characteristics). | gauge | `name` |
+| `mscluster_node_DetectedCloudPlatform` | The dynamic vote weight of the node adjusted by dynamic quorum feature.                                                                                                                                                                            | gauge | `name` |
+| `mscluster_node_DynamicWeight`         | The dynamic vote weight of the node adjusted by dynamic quorum feature.                                                                                                                                                                            | gauge | `name` |
+| `mscluster_node_Flags`                 | Provides access to the flags set for the node. For a list of possible characteristics, see [CLUSCTL_NODE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-node-get-flags).                               | gauge | `name` |
+| `mscluster_node_MajorVersion`          | Provides access to the node's MajorVersion property, which specifies the major portion of the Windows version installed.                                                                                                                           | gauge | `name` |
+| `mscluster_node_MinorVersion`          | Provides access to the node's MinorVersion property, which specifies the minor portion of the Windows version installed.                                                                                                                           | gauge | `name` |
+| `mscluster_node_NeedsPreventQuorum`    | Whether the cluster service on that node should be started with prevent quorum flag.                                                                                                                                                               | gauge | `name` |
+| `mscluster_node_NodeDrainStatus`       | The current node drain status of a node. 0: Not Initiated; 1: In Progress; 2: Completed; 3: Failed                                                                                                                                                 | gauge | `name` |
+| `mscluster_node_NodeHighestVersion`    | 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.                                                                        | gauge | `name` |
+| `mscluster_node_NodeLowestVersion`     | 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.                                                                          | gauge | `name` |
+| `mscluster_node_NodeWeight`            | The vote weight of the node.                                                                                                                                                                                                                       | gauge | `name` |
+| `mscluster_node_State`                 | Returns the current state of a node. -1: Unknown; 0: Up; 1: Down; 2: Paused; 3: Joining                                                                                                                                                            | gauge | `name` |
+| `mscluster_node_StatusInformation`     | The isolation or quarantine status of the node.                                                                                                                                                                                                    | gauge | `name` |
+
+### Resource
+
+| Name                                        | Description                                                                                                                                                                                                                                                                                                                                                                    | Type  | Labels                                     |
+|---------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|--------------------------------------------|
+| `mscluster_resource_Characteristics`        | Provides the characteristics of the object. The cluster defines characteristics only for resources. For a description of these characteristics, see [CLUSCTL_RESOURCE_GET_CHARACTERISTICS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-characteristics).                                                                      | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_DeadlockTimeout`        | Indicates the length of time to wait, in milliseconds, before declaring a deadlock in any call into a resource.                                                                                                                                                                                                                                                                | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_EmbeddedFailureAction`  | The time, in milliseconds, that a resource should remain in a failed state before the Cluster service attempts to restart it.                                                                                                                                                                                                                                                  | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_Flags`                  | Provides access to the flags set for the object. The cluster defines flags only for resources. For a description of these flags, see [CLUSCTL_RESOURCE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-flags).                                                                                                         | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_IsAlivePollInterval`    | 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.            | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_LooksAlivePollInterval` | 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. | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_MonitorProcessId`       | Provides the process ID of the resource host service that is currently hosting the resource.                                                                                                                                                                                                                                                                                   | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_OwnerNode`              | The node hosting the resource.                                                                                                                                                                                                                                                                                                                                                 | gauge | `type`, `owner_group`, `node_name`, `name` |
+| `mscluster_resource_PendingTimeout`         | 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.                                                                                                                                                | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_ResourceClass`          | Gets or sets the resource class of a resource. 0: Unknown; 1: Storage; 2: Network; 32768: Unknown                                                                                                                                                                                                                                                                              | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_RestartAction`          | Provides access to the resource's RestartAction property, which is the action to be taken by the Cluster Service if the resource fails.                                                                                                                                                                                                                                        | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_RestartDelay`           | Indicates the time delay before a failed resource is restarted.                                                                                                                                                                                                                                                                                                                | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_RestartPeriod`          | 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.                                                                                                                                                                             | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_RestartThreshold`       | 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.                                                                                   | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_RetryPeriodOnFailure`   | 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.                                                                                                                                                            | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_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                                                                                                                                                                                                       | gauge | `type`, `owner_group`, `name`              |
+| `mscluster_resource_Subclass`               | Provides the list of references to nodes that can be the owner of this resource.                                                                                                                                                                                                                                                                                               | gauge | `type`, `owner_group`, `name`              |
+
+## ResourceGroup
+
+| Name                                          | Description                                                                                                                                                                                                                                                                                              | Type  | Labels              |
+|-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|---------------------|
+| `mscluster_resourcegroup_AutoFailbackType`    | Provides access to the group's AutoFailbackType property.                                                                                                                                                                                                                                                | gauge | `name`              |
+| `mscluster_resourcegroup_Characteristics`     | Provides the characteristics of the group. The cluster defines characteristics only for resources. For a description of these characteristics, see [CLUSCTL_RESOURCE_GET_CHARACTERISTICS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-characteristics). | gauge | `name`              |
+| `mscluster_resourcegroup_ColdStartSetting`    | Indicates whether a group can start after a cluster cold start.                                                                                                                                                                                                                                          | gauge | `name`              |
+| `mscluster_resourcegroup_DefaultOwner`        | Number of the last node the resource group was activated on or explicitly moved to.                                                                                                                                                                                                                      | gauge | `name`              |
+| `mscluster_resourcegroup_FailbackWindowEnd`   | The FailbackWindowEnd property provides the latest time that the group can be moved back to the node identified as its preferred node.                                                                                                                                                                   | gauge | `name`              |
+| `mscluster_resourcegroup_FailbackWindowStart` | 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.                                                                                                                  | gauge | `name`              |
+| `mscluster_resourcegroup_FailoverPeriod`      | The FailoverPeriod property specifies a number of hours during which a maximum number of failover attempts, specified by the FailoverThreshold property, can occur.                                                                                                                                      | gauge | `name`              |
+| `mscluster_resourcegroup_FailoverThreshold`   | The FailoverThreshold property specifies the maximum number of failover attempts.                                                                                                                                                                                                                        | gauge | `name`              |
+| `mscluster_resourcegroup_Flags`               | Provides access to the flags set for the group. The cluster defines flags only for resources. For a description of these flags, see [CLUSCTL_RESOURCE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-flags).                                    | gauge | `name`              |
+| `mscluster_resourcegroup_GroupType`           | The Type of the resource group.                                                                                                                                                                                                                                                                          | gauge | `name`              |
+| `mscluster_resourcegroup_OwnerNode`           | The node hosting the resource group.                                                                                                                                                                                                                                                                     | gauge | `node_name`, `name` |
+| `mscluster_resourcegroup_Priority`            | Priority value of the resource group                                                                                                                                                                                                                                                                     | gauge | `name`              |
+| `mscluster_resourcegroup_ResiliencyPeriod`    | The resiliency period for this group, in seconds.                                                                                                                                                                                                                                                        | gauge | `name`              |
+| `mscluster_resourcegroup_State`               | The current state of the resource group. -1: Unknown; 0: Online; 1: Offline; 2: Failed; 3: Partial Online; 4: Pending                                                                                                                                                                                    | gauge | `name`              |
+| `mscluster_resourcegroup_UpdateDomain`        |                                                                                                                                                                                                                                                                                                          | gauge | `name`              |
+
+### Example metric
+Query the state of all cluster resource owned by node1
+```
+windows_mscluster_resource_owner_node{node_name="node1"}
+```
+
+## Useful queries
+Counts the number of Network Name cluster resource
+```
+count(windows_mscluster_resource_state{type="Network Name"})
+```
+
+## Alerting examples
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.mscluster_cluster.md

@@ -1,104 +0,0 @@
-# mscluster_cluster collector
-
-The MSCluster_Cluster class is a dynamic WMI class that represents a cluster.
-
-|||
--|-
-Metric name prefix  | `mscluster_cluster`
-Classes             | `MSCluster_Cluster`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`AddEvictDelay` | Provides access to the cluster's AddEvictDelay property, which is the number a seconds that a new node is delayed after an eviction of another node. | gauge | `name`
-`AdminAccessPoint` | The type of the cluster administrative access point. | gauge | `name`
-`AutoAssignNodeSite` | Determines whether or not the cluster will attempt to automatically assign nodes to sites based on networks and Active Directory Site information. | gauge | `name`
-`AutoBalancerLevel` | Determines the level of aggressiveness of AutoBalancer. | gauge | `name`
-`AutoBalancerMode` | Determines whether or not the auto balancer is enabled. | gauge | `name`
-`BackupInProgress` | Indicates whether a backup is in progress. | gauge | `name`
-`BlockCacheSize` | CSV BlockCache Size in MB. | gauge | `name`
-`ClusSvcHangTimeout` | Controls how long the cluster network driver waits between Failover Cluster Service heartbeats before it determines that the Failover Cluster Service has stopped responding. | gauge | `name`
-`ClusSvcRegroupOpeningTimeout` | Controls how long a node will wait on other nodes in the opening stage before deciding that they failed. | gauge | `name`
-`ClusSvcRegroupPruningTimeout` | Controls how long the membership leader will wait to reach full connectivity between cluster nodes. | gauge | `name`
-`ClusSvcRegroupStageTimeout` | Controls how long a node will wait on other nodes in a membership stage before deciding that they failed. | gauge | `name`
-`ClusSvcRegroupTickInMilliseconds` | Controls how frequently the membership algorithm is sending periodic membership messages. | gauge | `name`
-`ClusterEnforcedAntiAffinity` | Enables or disables hard enforcement of group anti-affinity classes. | gauge | `name`
-`ClusterFunctionalLevel` | The functional level the cluster is currently running in. | gauge | `name`
-`ClusterGroupWaitDelay` | Maximum time in seconds that a group waits for its preferred node to come online during cluster startup before coming online on a different node. | gauge | `name`
-`ClusterLogLevel` | Controls the level of cluster logging. | gauge | `name`
-`ClusterLogSize` | Controls the maximum size of the cluster log files on each of the nodes. | gauge | `name`
-`ClusterUpgradeVersion` | Specifies the upgrade version the cluster is currently running in. | gauge | `name`
-`CrossSiteDelay` | Controls how long the cluster network driver waits in milliseconds between sending Cluster Service heartbeats across sites. | gauge | `name`
-`CrossSiteThreshold` | Controls how many Cluster Service heartbeats can be missed across sites before it determines that Cluster Service has stopped responding. | gauge | `name`
-`CrossSubnetDelay` | Controls how long the cluster network driver waits in milliseconds between sending Cluster Service heartbeats across subnets. | gauge | `name`
-`CrossSubnetThreshold` | Controls how many Cluster Service heartbeats can be missed across subnets before it determines that Cluster Service has stopped responding. | gauge | `name`
-`CsvBalancer` | Whether automatic balancing for CSV is enabled. | gauge | `name`
-`DatabaseReadWriteMode` | Sets the database read and write mode. | gauge | `name`
-`DefaultNetworkRole` | Provides access to the cluster's DefaultNetworkRole property. | gauge | `name`
-`DetectedCloudPlatform` | | gauge | `name`
-`DetectManagedEvents` | | gauge | `name`
-`DetectManagedEventsThreshold` | | gauge | `name`
-`DisableGroupPreferredOwnerRandomization` | | gauge | `name`
-`DrainOnShutdown` | Whether to drain the node when cluster service is being stopped. | gauge | `name`
-`DynamicQuorumEnabled` | Allows cluster service to adjust node weights as needed to increase availability. | gauge | `name`
-`EnableSharedVolumes` | Enables or disables cluster shared volumes on this cluster. | gauge | `name`
-`FixQuorum` | Provides access to the cluster's FixQuorum property, which specifies if the cluster is in a fix quorum state. | gauge | `name`
-`GracePeriodEnabled` | Whether the node grace period feature of this cluster is enabled. | gauge | `name`
-`GracePeriodTimeout` | The grace period timeout in milliseconds. | gauge | `name`
-`GroupDependencyTimeout` | The timeout after which a group will be brought online despite unsatisfied dependencies | gauge | `name`
-`HangRecoveryAction` | Controls the action to take if the user-mode processes have stopped responding. | gauge | `name`
-`IgnorePersistentStateOnStartup` | Provides access to the cluster's IgnorePersistentStateOnStartup property, which specifies whether the cluster will bring online groups that were online when the cluster was shut down. | gauge | `name`
-`LogResourceControls` | Controls the logging of resource controls. | gauge | `name`
-`LowerQuorumPriorityNodeId` | Specifies the Node ID that has a lower priority when voting for quorum is performed. If the quorum vote is split 50/50%, the specified node's vote would be ignored to break the tie. If this is not set then the cluster will pick a node at random to break the tie. | gauge | `name`
-`MaxNumberOfNodes` | Indicates the maximum number of nodes that may participate in the Cluster. | gauge | `name`
-`MessageBufferLength` | The maximum unacknowledged message count for GEM. | gauge | `name`
-`MinimumNeverPreemptPriority` | Groups with this priority or higher cannot be preempted. | gauge | `name`
-`MinimumPreemptorPriority` | Minimum priority a cluster group must have to be able to preempt another group. | gauge | `name`
-`NetftIPSecEnabled` | Whether IPSec is enabled for cluster internal traffic. | gauge | `name`
-`PlacementOptions` | Various option flags to modify default placement behavior. | gauge | `name`
-`PlumbAllCrossSubnetRoutes` | Plumbs all possible cross subnet routes to all nodes. | gauge | `name`
-`PreventQuorum` | Whether the cluster will ignore group persistent state on startup. | gauge | `name`
-`QuarantineDuration` | The quarantine period timeout in milliseconds. | gauge | `name`
-`QuarantineThreshold` | Number of node failures before it will be quarantined. | gauge | `name`
-`QuorumArbitrationTimeMax` | Controls the maximum time necessary to decide the Quorum owner node. | gauge | `name`
-`QuorumArbitrationTimeMin` | Controls the minimum time necessary to decide the Quorum owner node. | gauge | `name`
-`QuorumLogFileSize` | This property is obsolete. | gauge | `name`
-`QuorumTypeValue` | Get the current quorum type value. -1: Unknown; 1: Node; 2: FileShareWitness; 3: Storage; 4: None | gauge | `name`
-`RequestReplyTimeout` | Controls the request reply time-out period. | gauge | `name`
-`ResiliencyDefaultPeriod` | The default resiliency period, in seconds, for the cluster. | gauge | `name`
-`ResiliencyLevel` | The resiliency level for the cluster. | gauge | `name`
-`ResourceDllDeadlockPeriod` | This property is obsolete. | gauge | `name`
-`RootMemoryReserved` | Controls the amount of memory reserved for the parent partition on all cluster nodes. | gauge | `name`
-`RouteHistoryLength` | The history length for routes to help finding network issues. | gauge | `name`
-`S2DBusTypes` | Bus types for storage spaces direct. | gauge | `name`
-`S2DCacheDesiredState` | Desired state of the storage spaces direct cache. | gauge | `name`
-`S2DCacheFlashReservePercent` | Percentage of allocated flash space to utilize when caching. | gauge | `name`
-`S2DCachePageSizeKBytes` | Page size in KB used by S2D cache. | gauge | `name`
-`S2DEnabled` | Whether direct attached storage (DAS) is enabled. | gauge | `name`
-`S2DIOLatencyThreshold` | The I/O latency threshold for storage spaces direct. | gauge | `name`
-`S2DOptimizations` | Optimization flags for storage spaces direct. | gauge | `name`
-`SameSubnetDelay` | Controls how long the cluster network driver waits in milliseconds between sending Cluster Service heartbeats on the same subnet. | gauge | `name`
-`SameSubnetThreshold` | Controls how many Cluster Service heartbeats can be missed on the same subnet before it determines that Cluster Service has stopped responding. | gauge | `name`
-`SecurityLevel` | Controls the level of security that should apply to intracluster messages. 0: Clear Text; 1: Sign; 2: Encrypt | gauge | `name`
-`SecurityLevelForStorage` | | gauge | `name`
-`SharedVolumeVssWriterOperationTimeout` | CSV VSS Writer operation timeout in seconds. | gauge | `name`
-`ShutdownTimeoutInMinutes` | The maximum time in minutes allowed for cluster resources to come offline during cluster service shutdown. | gauge | `name`
-`UseClientAccessNetworksForSharedVolumes` | Whether the use of client access networks for cluster shared volumes feature of this cluster is enabled. 0: Disabled; 1: Enabled; 2: Auto | gauge | `name`
-`WitnessDatabaseWriteTimeout` | Controls the maximum time in seconds that a cluster database write to a witness can take before the write is abandoned. | gauge | `name`
-`WitnessDynamicWeight` | The weight of the configured witness. | gauge | `name`
-`WitnessRestartInterval` | Controls the witness restart interval. | gauge | `name`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.mscluster_network.md

@@ -1,32 +0,0 @@
-# mscluster_network collector
-
-The MSCluster_Network class is a dynamic WMI class that represents cluster networks.
-
-|||
--|-
-Metric name prefix  | `mscluster_network`
-Classes             | `MSCluster_Network`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`Characteristics` | Provides the characteristics of the network. The cluster defines characteristics only for resources. For a description of these characteristics, see [CLUSCTL_RESOURCE_GET_CHARACTERISTICS](https://msdn.microsoft.com/library/aa367466).  | gauge | `name`
-`Flags` | Provides access to the flags set for the network. The cluster defines flags only for resources. For a description of these flags, see [CLUSCTL_RESOURCE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-flags). | gauge | `name`
-`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. | gauge | `name`
-`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  | gauge | `name`
-`State` | Provides the current state of the network. 1-1: Unknown; 0: Unavailable; 1: Down; 2: Partitioned; 3: Up | gauge | `name`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.mscluster_node.md

@@ -1,41 +0,0 @@
-# mscluster_node collector
-
-The MSCluster_Node class is a dynamic WMI class that represents a cluster node.
-
-|||
--|-
-Metric name prefix  | `mscluster_node`
-Classes             | `MSCluster_Node`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`BuildNumber` | Provides access to the node's BuildNumber property. | gauge | `name`
-`Characteristics` | Provides access to the characteristics set for the node. For a list of possible characteristics, see [CLUSCTL_NODE_GET_CHARACTERISTICS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-node-get-characteristics). | gauge | `name`
-`DetectedCloudPlatform` | The dynamic vote weight of the node adjusted by dynamic quorum feature. | gauge | `name`
-`DynamicWeight` | The dynamic vote weight of the node adjusted by dynamic quorum feature. | gauge | `name`
-`Flags` | Provides access to the flags set for the node. For a list of possible characteristics, see [CLUSCTL_NODE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-node-get-flags). | gauge | `name`
-`MajorVersion` | Provides access to the node's MajorVersion property, which specifies the major portion of the Windows version installed. | gauge | `name`
-`MinorVersion` | Provides access to the node's MinorVersion property, which specifies the minor portion of the Windows version installed. | gauge | `name`
-`NeedsPreventQuorum` | Whether the cluster service on that node should be started with prevent quorum flag. | gauge | `name`
-`NodeDrainStatus` | The current node drain status of a node. 0: Not Initiated; 1: In Progress; 2: Completed; 3: Failed | gauge | `name`
-`NodeHighestVersion` | 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. | gauge | `name`
-`NodeLowestVersion` | 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. | gauge | `name`
-`NodeWeight` | The vote weight of the node. | gauge | `name`
-`State` | Returns the current state of a node. -1: Unknown; 0: Up; 1: Down; 2: Paused; 3: Joining | gauge | `name`
-`StatusInformation` | The isolation or quarantine status of the node. | gauge | `name`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.mscluster_resource.md

@@ -1,50 +0,0 @@
-# mscluster_resource collector
-
-The MSCluster_resource class is a dynamic WMI class that represents a cluster resource.
-
-|||
--|-
-Metric name prefix  | `mscluster_resource`
-Classes             | `MSCluster_Resource`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`Characteristics` | Provides the characteristics of the object. The cluster defines characteristics only for resources. For a description of these characteristics, see [CLUSCTL_RESOURCE_GET_CHARACTERISTICS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-characteristics). | gauge | `type`, `owner_group`, `name`
-`DeadlockTimeout` | Indicates the length of time to wait, in milliseconds, before declaring a deadlock in any call into a resource. | gauge | `type`, `owner_group`, `name`
-`EmbeddedFailureAction` | The time, in milliseconds, that a resource should remain in a failed state before the Cluster service attempts to restart it. | gauge | `type`, `owner_group`, `name`
-`Flags` | Provides access to the flags set for the object. The cluster defines flags only for resources. For a description of these flags, see [CLUSCTL_RESOURCE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-flags). | gauge | `type`, `owner_group`, `name`
-`IsAlivePollInterval` | 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. | gauge | `type`, `owner_group`, `name`
-`LooksAlivePollInterval` | 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. | gauge | `type`, `owner_group`, `name`
-`MonitorProcessId` | Provides the process ID of the resource host service that is currently hosting the resource. | gauge | `type`, `owner_group`, `name`
-`OwnerNode` | The node hosting the resource. | gauge | `type`, `owner_group`, `node_name`, `name`
-`PendingTimeout` | 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. | gauge | `type`, `owner_group`, `name`
-`ResourceClass` | Gets or sets the resource class of a resource. 0: Unknown; 1: Storage; 2: Network; 32768: Unknown | gauge | `type`, `owner_group`, `name`
-`RestartAction` | Provides access to the resource's RestartAction property, which is the action to be taken by the Cluster Service if the resource fails. | gauge | `type`, `owner_group`, `name`
-`RestartDelay` | Indicates the time delay before a failed resource is restarted. | gauge | `type`, `owner_group`, `name`
-`RestartPeriod` | 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. | gauge | `type`, `owner_group`, `name`
-`RestartThreshold` | 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. | gauge | `type`, `owner_group`, `name`
-`RetryPeriodOnFailure` | 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. | gauge | `type`, `owner_group`, `name`
-`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 | gauge | `type`, `owner_group`, `name`
-`Subclass` | Provides the list of references to nodes that can be the owner of this resource. | gauge | `type`, `owner_group`, `name`
-
-### Example metric
-Query the state of all cluster resource owned by node1
-```
-windows_mscluster_resource_owner_node{node_name="node1"}
-```
-
-## Useful queries
-Counts the number of Network Name cluster resource
-```
-count(windows_mscluster_resource_state{type="Network Name"})
-```
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.mscluster_resourcegroup.md

@@ -1,48 +0,0 @@
-# mscluster_resourcegroup collector
-
-The MSCluster_ResourceGroup class is a dynamic WMI class that represents a cluster group.
-
-|||
--|-
-Metric name prefix  | `mscluster_resourcegroup`
-Classes             | `MSCluster_ResourceGroup`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`AutoFailbackType` | Provides access to the group's AutoFailbackType property. | gauge | `name`
-`Characteristics` | Provides the characteristics of the group. The cluster defines characteristics only for resources. For a description of these characteristics, see [CLUSCTL_RESOURCE_GET_CHARACTERISTICS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-characteristics). | gauge | `name`
-`ColdStartSetting` | Indicates whether a group can start after a cluster cold start. | gauge | `name`
-`DefaultOwner` | Number of the last node the resource group was activated on or explicitly moved to. | gauge | `name`
-`FailbackWindowEnd` | The FailbackWindowEnd property provides the latest time that the group can be moved back to the node identified as its preferred node. | gauge | `name`
-`FailbackWindowStart` | 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. | gauge | `name`
-`FailoverPeriod` | The FailoverPeriod property specifies a number of hours during which a maximum number of failover attempts, specified by the FailoverThreshold property, can occur. | gauge | `name`
-`FailoverThreshold` | The FailoverThreshold property specifies the maximum number of failover attempts. | gauge | `name`
-`Flags` | Provides access to the flags set for the group. The cluster defines flags only for resources. For a description of these flags, see [CLUSCTL_RESOURCE_GET_FLAGS](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/mscs/clusctl-resource-get-flags). | gauge | `name`
-`GroupType` | The Type of the resource group. | gauge | `name`
-`OwnerNode` | The node hosting the resource group. | gauge | `node_name`, `name`
-`Priority` | Priority value of the resource group | gauge | `name`
-`ResiliencyPeriod` | The resiliency period for this group, in seconds. | gauge | `name`
-`State` | The current state of the resource group. -1: Unknown; 0: Online; 1: Offline; 2: Failed; 3: Partial Online; 4: Pending | gauge | `name`
-`UpdateDomain` | | gauge | `name`
-
-### Example metric
-Query the state of all cluster group owned by node1
-```
-windows_mscluster_resourcegroup_owner_node{node_name="node1"}
-```
-
-## Useful queries
-Counts the number of cluster group by type
-```
-count_values("count", windows_mscluster_resourcegroup_group_type)
-```
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.msmq.md

@@ -2,26 +2,22 @@
 
 The msmq collector exposes metrics about the queues on a MSMQ server
 
-|||
--|-
-Metric name prefix  | `msmq`
-Classes             | `Win32_PerfRawData_MSMQ_MSMQQueue`
-Enabled by default? | No
+|                     |                      |
+|---------------------|----------------------|
+| Metric name prefix  | `msmq`               |
+| Spource             | Performance Counters |
+| Enabled by default? | No                   |
 
 ## Flags
 
-### `--collector.msmq.msmq-where`
-
-A WMI filter on which queues to include. `%` is a wildcard, and can be used to match on substrings.
-
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_msmq_bytes_in_journal_queue` | Size of queue journal in bytes | gauge | `name`
-`windows_msmq_bytes_in_queue` | Size of queue in bytes | gauge | `name`
-`windows_msmq_messages_in_journal_queue` | Count messages in queue journal | gauge | `name`
-`windows_msmq_messages_in_queue` | Count messages in queue | gauge | `name`
+| Name                                     | Description                     | Type  | Labels |
+|------------------------------------------|---------------------------------|-------|--------|
+| `windows_msmq_bytes_in_journal_queue`    | Size of queue journal in bytes  | gauge | `name` |
+| `windows_msmq_bytes_in_queue`            | Size of queue in bytes          | gauge | `name` |
+| `windows_msmq_messages_in_journal_queue` | Count messages in queue journal | gauge | `name` |
+| `windows_msmq_messages_in_queue`         | Count messages in queue         | gauge | `name` |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.mssql.md

@@ -16,246 +16,247 @@ Comma-separated list of MSSQL WMI classes to use. Supported values are `accessme
 
 ### `--collectors.mssql.class-print`
 
-If true, print available mssql WMI classes and exit.  Only displays if the mssql collector is enabled.
+If true, print available mssql WMI classes and exit.  Only displays if the mssql collector is enabled.fman`, `databases`, `dbreplica`, `genstats`, `locks`, `memmgr`, `sqlstats`, `sqlerrors`, `transactions`, and `waitstats`.
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_mssql_collector_duration_seconds` | The time taken for each sub-collector to return | gauge | `collector`, `mssql_instance`
-`windows_mssql_collector_success` | 1 if sub-collector succeeded, 0 otherwise | gauge | `collector`, `mssql_instance`
-`windows_mssql_accessmethods_au_batch_cleanups` | The total number of batches that were completed successfully by the background task that cleans up deferred dropped allocation units | counter | `mssql_instance`
-`windows_mssql_accessmethods_au_cleanups` | The total number of allocation units that were successfully dropped the background task that cleans up deferred dropped allocation units. Each allocation unit drop requires multiple batches | counter | `mssql_instance`
-`windows_mssql_accessmethods_by_reference_lob_creates` | The total count of large object (lob) values that were passed by reference. By-reference lobs are used in certain bulk operations to avoid the cost of passing them by value | counter | `mssql_instance`
-`windows_mssql_accessmethods_by_reference_lob_uses` | The total count of by-reference lob values that were used. By-reference lobs are used in certain bulk operations to avoid the cost of passing them by-value | counter | `mssql_instance`
-`windows_mssql_accessmethods_lob_read_aheads` | The total count of lob pages on which readahead was issued | counter | `mssql_instance`
-`windows_mssql_accessmethods_column_value_pulls` | The total count of column values that were pulled in-row from off-row | counter | `mssql_instance`
-`windows_mssql_accessmethods_column_value_pushes` | The total count of column values that were pushed from in-row to off-row | counter | `mssql_instance`
-`windows_mssql_accessmethods_deferred_dropped_aus` | The total number of allocation units waiting to be dropped by the background task that cleans up deferred dropped allocation units | gauge | `mssql_instance`
-`windows_mssql_accessmethods_deferred_dropped_rowsets` | The number of rowsets created as a result of aborted online index build operations that are waiting to be dropped by the background task that cleans up deferred dropped rowsets | gauge | `mssql_instance`
-`windows_mssql_accessmethods_dropped_rowset_cleanups` | The number of rowsets per second created as a result of aborted online index build operations that were successfully dropped by the background task that cleans up deferred dropped rowsets | counter | `mssql_instance`
-`windows_mssql_accessmethods_dropped_rowset_skips` | The number of rowsets per second created as a result of aborted online index build operations that were skipped by the background task that cleans up deferred dropped rowsets created | counter | `mssql_instance`
-`windows_mssql_accessmethods_extent_deallocations` | Number of extents deallocated per second in all databases in this instance of SQL Server | counter | `mssql_instance`
-`windows_mssql_accessmethods_extent_allocations` | Number of extents allocated per second in all databases in this instance of SQL Server | counter | `mssql_instance`
-`windows_mssql_accessmethods_au_batch_cleanup_failures` | The number of batches per second that failed and required retry, by the background task that cleans up deferred dropped allocation units. Failure could be due to lack of memory or disk space, hardware failure and other reasons | counter | `mssql_instance`
-`windows_mssql_accessmethods_leaf_page_cookie_failures` | The number of times that a leaf page cookie could not be used during an index search since changes happened on the leaf page. The cookie is used to speed up index search | counter | `mssql_instance`
-`windows_mssql_accessmethods_tree_page_cookie_failures` | The number of times that a tree page cookie could not be used during an index search since changes happened on the parent pages of those tree pages. The cookie is used to speed up index search | counter | `mssql_instance`
-`windows_mssql_accessmethods_forwarded_records` | Number of records per second fetched through forwarded record pointers | counter | `mssql_instance`
-`windows_mssql_accessmethods_free_space_page_fetches` | Number of pages fetched per second by free space scans. These scans search for free space within pages already allocated to an allocation unit, to satisfy requests to insert or modify record fragments | counter | `mssql_instance`
-`windows_mssql_accessmethods_free_space_scans` | Number of scans per second that were initiated to search for free space within pages already allocated to an allocation unit to insert or modify record fragment. Each scan may find multiple pages | counter | `mssql_instance`
-`windows_mssql_accessmethods_full_scans` | Number of unrestricted full scans per second. These can be either base-table or full-index scans | counter | `mssql_instance`
-`windows_mssql_accessmethods_index_searches` | Number of index searches per second. These are used to start a range scan, reposition a range scan, revalidate a scan point, fetch a single index record, and search down the index to locate where to insert a new row | counter | `mssql_instance`
-`windows_mssql_accessmethods_insysxact_waits` | Number of times a reader needs to wait for a page because the InSysXact bit is set | counter | `mssql_instance`
-`windows_mssql_accessmethods_lob_handle_creates` | Count of temporary lobs created | counter | `mssql_instance`
-`windows_mssql_accessmethods_lob_handle_destroys` | Count of temporary lobs destroyed | counter | `mssql_instance`
-`windows_mssql_accessmethods_lob_ss_provider_creates` | Count of LOB Storage Service Providers (LobSSP) created. One worktable created per LobSSP | counter | `mssql_instance`
-`windows_mssql_accessmethods_lob_ss_provider_destroys` | Count of LobSSP destroyed | counter | `mssql_instance`
-`windows_mssql_accessmethods_lob_ss_provider_truncations` | Count of LobSSP truncated | counter | `mssql_instance`
-`windows_mssql_accessmethods_mixed_page_allocations` | Number of pages allocated per second from mixed extents. These could be used for storing the IAM pages and the first eight pages that are allocated to an allocation unit | counter | `mssql_instance`
-`windows_mssql_accessmethods_page_compression_attempts` | Number of pages evaluated for page-level compression. Includes pages that were not compressed because significant savings could be achieved. Includes all objects in the instance of SQL Server | counter | `mssql_instance`
-`windows_mssql_accessmethods_page_deallocations` | Number of pages deallocated per second in all databases in this instance of SQL Server. These include pages from mixed extents and uniform extents | counter | `mssql_instance`
-`windows_mssql_accessmethods_page_allocations` | Number of pages allocated per second in all databases in this instance of SQL Server. These include pages allocations from both mixed extents and uniform extents | counter | `mssql_instance`
-`windows_mssql_accessmethods_page_compressions` | Number of data pages that are compressed by using PAGE compression. Includes all objects in the instance of SQL Server | counter | `mssql_instance`
-`windows_mssql_accessmethods_page_splits` | Number of page splits per second that occur as the result of overflowing index pages | counter | `mssql_instance`
-`windows_mssql_accessmethods_probe_scans` | Number of probe scans per second that are used to find at most one single qualified row in an index or base table directly | counter | `mssql_instance`
-`windows_mssql_accessmethods_range_scans` | Number of qualified range scans through indexes per second | counter | `mssql_instance`
-`windows_mssql_accessmethods_scan_point_revalidations` | Number of times per second that the scan point had to be revalidated to continue the scan | counter | `mssql_instance`
-`windows_mssql_accessmethods_ghost_record_skips` | Number of ghosted records per second skipped during scans | counter | `mssql_instance`
-`windows_mssql_accessmethods_table_lock_escalations` | Number of times locks on a table were escalated to the TABLE or HoBT granularity | counter | `mssql_instance`
-`windows_mssql_accessmethods_leaf_page_cookie_uses` | Number of times a leaf page cookie is used successfully during an index search since no change happened on the leaf page. The cookie is used to speed up index search | counter | `mssql_instance`
-`windows_mssql_accessmethods_tree_page_cookie_uses` | Number of times a tree page cookie is used successfully during an index search since no change happened on the parent page of the tree page. The cookie is used to speed up index search | counter | `mssql_instance`
-`windows_mssql_accessmethods_workfile_creates` | Number of work files created per second. For example, work files could be used to store temporary results for hash joins and hash aggregates | counter | `mssql_instance`
-`windows_mssql_accessmethods_worktables_creates` | Number of work tables created per second. For example, work tables could be used to store temporary results for query spool, lob variables, XML variables, and cursors | counter | `mssql_instance`
-`windows_mssql_accessmethods_worktables_from_cache_ratio` | Percentage of work tables created where the initial two pages of the work table were not allocated but were immediately available from the work table cache | counter | `mssql_instance`
-`windows_mssql_availreplica_received_from_replica_bytes` | Number of bytes received from the availability replica per second. Pings and status updates will generate network traffic even on databases with no user updates | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_sent_to_replica_bytes` | Number of bytes sent to the remote availability replica per second. On the primary replica this is the number of bytes sent to the secondary replica. On the secondary replica this is the number of bytes sent to the primary replica | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_sent_to_transport_bytes` | Actual number of bytes sent per second over the network to the remote availability replica. On the primary replica this is the number of bytes sent to the secondary replica. On the secondary replica this is the number of bytes sent to the primary replica | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_initiated_flow_controls` | Time in milliseconds that log stream messages waited for send flow control, in the last second | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_flow_control_wait_seconds` | Number of times flow-control initiated in the last second. Flow Control Time (ms/sec) divided by Flow Control/sec is the average time per wait | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_receives_from_replica` | Number of Always On messages received from thereplica per second | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_resent_messages` | Number of Always On messages resent in the last second | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_sends_to_replica` | Number of Always On messages sent to this availability replica per second | counter | `mssql_instance`, `replica`
-`windows_mssql_availreplica_sends_to_transport` | Actual number of Always On messages sent per second over the network to the remote availability replica | counter | `mssql_instance`, `replica`
-`windows_mssql_bufman_background_writer_pages` | Number of pages flushed to enforce the recovery interval settings | counter | `mssql_instance`
-`windows_mssql_bufman_buffer_cache_hit_ratio` | Indicates the percentage of pages found in the buffer cache without having to read from disk. The ratio is the total number of cache hits divided by the total number of cache lookups over the last few thousand page accesses | gauge | `mssql_instance`
-`windows_mssql_bufman_checkpoint_pages` | Indicates the number of pages flushed to disk per second by a checkpoint or other operation that require all dirty pages to be flushed | counter | `mssql_instance`
-`windows_mssql_bufman_database_pages` | Indicates the number of pages in the buffer pool with database content | gauge | `mssql_instance`
-`windows_mssql_bufman_extension_allocated_pages` | Total number of non-free cache pages in the buffer pool extension file | gauge | `mssql_instance`
-`windows_mssql_bufman_extension_free_pages` | Total number of free cache pages in the buffer pool extension file | gauge | `mssql_instance`
-`windows_mssql_bufman_extension_in_use_as_percentage` | _Not yet documented_ | gauge | `mssql_instance`
-`windows_mssql_bufman_extension_outstanding_io` | Percentage of the buffer pool extension paging file occupied by buffer manager pages | gauge | `mssql_instance`
-`windows_mssql_bufman_extension_page_evictions` | Number of pages evicted from the buffer pool extension file per second | counter | `mssql_instance`
-`windows_mssql_bufman_extension_page_reads` | Number of pages read from the buffer pool extension file per second | counter | `mssql_instance`
-`windows_mssql_bufman_extension_page_unreferenced_seconds` | Average seconds a page will stay in the buffer pool extension without references to it | gauge | `mssql_instance`
-`windows_mssql_bufman_extension_page_writes` | Number of pages written to the buffer pool extension file per second | counter | `mssql_instance`
-`windows_mssql_bufman_free_list_stalls` | Indicates the number of requests per second that had to wait for a free page | counter | `mssql_instance`
-`windows_mssql_bufman_integral_controller_slope` | The slope that integral controller for the buffer pool last used, times -10 billion | gauge | `mssql_instance`
-`windows_mssql_bufman_lazywrites` | Indicates the number of buffers written per second by the buffer manager's lazy writer | counter | `mssql_instance`
-`windows_mssql_bufman_page_life_expectancy_seconds` | Indicates the number of seconds a page will stay in the buffer pool without references | gauge | `mssql_instance`
-`windows_mssql_bufman_page_lookups` | Indicates the number of requests per second to find a page in the buffer pool | counter | `mssql_instance`
-`windows_mssql_bufman_page_reads` | Indicates the number of physical database page reads that are issued per second | counter | `mssql_instance`
-`windows_mssql_bufman_page_writes` | Indicates the number of physical database page writes that are issued per second | counter | `mssql_instance`
-`windows_mssql_bufman_read_ahead_pages` | Indicates the number of pages read per second in anticipation of use | counter | `mssql_instance`
-`windows_mssql_bufman_read_ahead_issuing_seconds` | Time (microseconds) spent issuing readahead | counter | `mssql_instance`
-`windows_mssql_bufman_target_pages` | Ideal number of pages in the buffer pool | gauge | `mssql_instance`
-`windows_mssql_dbreplica_database_flow_control_wait_seconds` | _Not yet documented_ | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_database_initiated_flow_controls` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_received_file_bytes` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_group_commits` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_group_commit_stall_seconds` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_apply_pending_queue` | _Not yet documented_ | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_apply_ready_queue` | _Not yet documented_ | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_compressed_bytes` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_decompressed_bytes` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_received_bytes` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_compression_cachehits` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_compression_cachemisses` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_compressions` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_decompressions` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_remaining_for_undo` | The amount of log, in bytes, remaining to complete the undo phase | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_log_send_queue` | Amount of log records in the log files of the primary database, in kilobytes, that haven't been sent to the secondary replica | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_mirrored_write_transactions` | Number of transactions that were written to the primary database and then waited to commit until the log was sent to the secondary database, in the last second | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_recovery_queue_records` | Amount of log records in the log files of the secondary replica that have not been redone | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_redo_blocks` | Number of times the redo thread was blocked on locks held by readers of the database | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_redo_remaining_bytes` | The amount of log, in kilobytes, remaining to be redone to finish the reverting phase | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_redone_bytes` | Amount of log records redone on the secondary database in the last second | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_redones` | _Not yet documented_ | counter | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_total_log_requiring_undo` | Total kilobytes of log that must be undone | gauge | `mssql_instance`, `replica`
-`windows_mssql_dbreplica_transaction_delay_seconds` | Delay in waiting for unterminated commit acknowledgment for all the current transactions | gauge | `mssql_instance`, `replica`
-`windows_mssql_databases_active_transactions` | Number of active transactions for the database | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_backup_restore_operations` | Read/write throughput for backup and restore operations of a database per second | counter | `mssql_instance`, `database`
-`windows_mssql_databases_bulk_copy_rows` | Number of rows bulk copied per second | counter | `mssql_instance`, `database`
-`windows_mssql_databases_bulk_copy_bytes` | Amount of data bulk copied (in kilobytes) per second | counter | `mssql_instance`, `database`
-`windows_mssql_databases_commit_table_entries` | he size (row count) of the in-memory portion of the commit table for the database | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_data_files_size_bytes` | Cumulative size (in kilobytes) of all the data files in the database including any automatic growth. Monitoring this counter is useful, for example, for determining the correct size of tempdb | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_dbcc_logical_scan_bytes` | Number of logical read scan bytes per second for database console commands (DBCC) | counter | `mssql_instance`, `database`
-`windows_mssql_databases_group_commit_stall_seconds` | Group stall time (microseconds) per second | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_flushed_bytes` | Total number of log bytes flushed | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_cache_hit_ratio` | Percentage of log cache reads satisfied from the log cache | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_cache_reads` | Reads performed per second through the log manager cache | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_files_size_bytes` | Cumulative size (in kilobytes) of all the transaction log files in the database | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_files_used_size_bytes` | The cumulative used size of all the log files in the database | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_flushes` | Total wait time (in milliseconds) to flush the log. On an Always On secondary database, this value indicates the wait time for log records to be hardened to disk | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_flush_waits` | Number of commits per second waiting for the log flush | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_flush_wait_seconds` | Number of commits per second waiting for the log flush | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_flush_write_seconds` | Time in milliseconds for performing writes of log flushes that were completed in the last second | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_growths` | Total number of times the transaction log for the database has been expanded | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_cache_misses` | Number of requests for which the log block was not available in the log pool | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_disk_reads` | Number of disk reads that the log pool issued to fetch log blocks | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_hash_deletes` | Rate of raw hash entry deletes from the Log Pool | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_hash_inserts` | Rate of raw hash entry inserts into the Log Pool | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_invalid_hash_entries` | Rate of hash lookups failing due to being invalid | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_log_scan_pushes` | Rate of Log block pushes by log scans, which may come from disk or memory | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_log_writer_pushes` | Rate of Log block pushes by log writer thread | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_empty_free_pool_pushes` | Rate of Log block push fails due to empty free pool | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_low_memory_pushes` | Rate of Log block push fails due to being low on memory | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_no_free_buffer_pushes` | Rate of Log block push fails due to free buffer unavailable | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_req_behind_trunc` | Log pool cache misses due to block requested being behind truncation LSN | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_requests_old_vlf` | Log Pool requests that were not in the last VLF of the log | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_requests` | The number of log-block requests processed by the log pool | counter | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_total_active_log_bytes` | Current total active log stored in the shared cache buffer manager in bytes | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_pool_total_shared_pool_bytes` | Current total memory usage of the shared cache buffer manager in bytes | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_shrinks` | Total number of log shrinks for this database | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_truncations` | The number of times the transaction log has been truncated (in Simple Recovery Model) | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_log_used_percent` | Percentage of space in the log that is in use | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_pending_repl_transactions` | Number of transactions in the transaction log of the publication database marked for replication, but not yet delivered to the distribution database | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_repl_transactions` | Number of transactions per second read out of the transaction log of the publication database and delivered to the distribution database | counter | `mssql_instance`, `database`
-`windows_mssql_databases_shrink_data_movement_bytes` | Amount of data being moved per second by autoshrink operations, or DBCC SHRINKDATABASE or DBCC SHRINKFILE statements | counter | `mssql_instance`, `database`
-`windows_mssql_databases_tracked_transactions` | Number of committed transactions recorded in the commit table for the database | counter | `mssql_instance`, `database`
-`windows_mssql_databases_transactions` | Number of transactions started for the database per second | counter | `mssql_instance`, `database`
-`windows_mssql_databases_write_transactions` | Number of transactions that wrote to the database and committed, in the last second | counter | `mssql_instance`, `database`
-`windows_mssql_databases_xtp_controller_dlc_fetch_latency_seconds` | Average latency in microseconds between log blocks entering the Direct Log Consumer and being retrieved by the XTP controller, per second | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_xtp_controller_dlc_peak_latency_seconds` | The largest recorded latency, in microseconds, of a fetch from the Direct Log Consumer by the XTP controller | gauge | `mssql_instance`, `database`
-`windows_mssql_databases_xtp_controller_log_processed_bytes` | The amount of log bytes processed by the XTP controller thread, per second | counter | `mssql_instance`, `database`
-`windows_mssql_databases_xtp_memory_used_bytes` | The amount of memory used by XTP in the database | gauge | `mssql_instance`, `database`
-`windows_mssql_genstats_active_temp_tables` | Number of temporary tables/table variables in use | gauge | `mssql_instance`
-`windows_mssql_genstats_connection_resets` | Total number of logins started from the connection pool | counter | `mssql_instance`
-`windows_mssql_genstats_event_notifications_delayed_drop` | Number of event notifications waiting to be dropped by a system thread | gauge | `mssql_instance`
-`windows_mssql_genstats_http_authenticated_requests` | Number of authenticated HTTP requests started per second | gauge | `mssql_instance`
-`windows_mssql_genstats_logical_connections` | Number of logical connections to the system | gauge | `mssql_instance`
-`windows_mssql_genstats_logins` | Total number of logins started per second. This does not include pooled connections | counter | `mssql_instance`
-`windows_mssql_genstats_logouts` | Total number of logout operations started per second | counter | `mssql_instance`
-`windows_mssql_genstats_mars_deadlocks` | Number of MARS deadlocks detected | gauge | `mssql_instance`
-`windows_mssql_genstats_non_atomic_yields` | Number of non-atomic yields per second | counter | `mssql_instance`
-`windows_mssql_genstats_blocked_processes` | Number of currently blocked processes | gauge | `mssql_instance`
-`windows_mssql_genstats_soap_empty_requests` | Number of empty SOAP requests started per second | gauge | `mssql_instance`
-`windows_mssql_genstats_soap_method_invocations` | Number of SOAP method invocations started per second | gauge | `mssql_instance`
-`windows_mssql_genstats_soap_session_initiate_requests` | Number of SOAP Session initiate requests started per second | gauge | `mssql_instance`
-`windows_mssql_genstats_soap_session_terminate_requests` | Number of SOAP Session terminate requests started per second | gauge | `mssql_instance`
-`windows_mssql_genstats_soapsql_requests` | Number of SOAP SQL requests started per second | gauge | `mssql_instance`
-`windows_mssql_genstats_soapwsdl_requests` | Number of SOAP Web Service Description Language requests started per second | gauge | `mssql_instance`
-`windows_mssql_genstats_sql_trace_io_provider_lock_waits` | Number of waits for the File IO Provider lock per second | gauge | `mssql_instance`
-`windows_mssql_genstats_tempdb_recovery_unit_ids_generated` | Number of duplicate tempdb recovery unit id generated | gauge | `mssql_instance`
-`windows_mssql_genstats_tempdb_rowset_ids_generated` | Number of duplicate tempdb rowset id generated | gauge | `mssql_instance`
-`windows_mssql_genstats_temp_tables_creations` | Number of temporary tables/table variables created per second | counter | `mssql_instance`
-`windows_mssql_genstats_temp_tables_awaiting_destruction` | Number of temporary tables/table variables waiting to be destroyed by the cleanup system thread | gauge | `mssql_instance`
-`windows_mssql_genstats_trace_event_notification_queue_size` | Number of trace event notification instances waiting in the internal queue to be sent through Service Broker | gauge | `mssql_instance`
-`windows_mssql_genstats_transactions` | Number of transaction enlistments (local, DTC, bound all combined) | gauge | `mssql_instance`
-`windows_mssql_genstats_user_connections` | Counts the number of users currently connected to SQL Server | gauge | `mssql_instance`
-`windows_mssql_locks_average_wait_seconds` | Average amount of wait time (in milliseconds) for each lock request that resulted in a wait | gauge | `mssql_instance`, `resource`
-`windows_mssql_locks_lock_requests` | Number of new locks and lock conversions per second requested from the lock manager | counter | `mssql_instance`, `resource`
-`windows_mssql_locks_lock_timeouts` | Number of lock requests per second that timed out, including requests for NOWAIT locks | counter | `mssql_instance`, `resource`
-`windows_mssql_locks_lock_timeouts_excluding_NOWAIT` | Number of lock requests per second that timed out, but excluding requests for NOWAIT locks | counter | `mssql_instance`, `resource`
-`windows_mssql_locks_lock_waits` | Total wait time (in milliseconds) for locks in the last second | counter | `mssql_instance`, `resource`
-`windows_mssql_locks_lock_wait_seconds` | Number of lock requests per second that required the caller to wait | gauge | `mssql_instance`, `resource`
-`windows_mssql_locks_deadlocks` | Number of lock requests per second that resulted in a deadlock | counter | `mssql_instance`, `resource`
-`windows_mssql_memmgr_connection_memory_bytes` | Specifies the total amount of dynamic memory the server is using for maintaining connections | gauge | `mssql_instance`
-`windows_mssql_memmgr_database_cache_memory_bytes` | Specifies the amount of memory the server is currently using for the database pages cache | gauge | `mssql_instance`
-`windows_mssql_memmgr_external_benefit_of_memory` | An internal estimation of the performance benefit from adding memory to a specific cache | gauge | `mssql_instance`
-`windows_mssql_memmgr_free_memory_bytes` | Specifies the amount of committed memory currently not used by the server | gauge | `mssql_instance`
-`windows_mssql_memmgr_granted_workspace_memory_bytes` | Specifies the total amount of memory currently granted to executing processes, such as hash, sort, bulk copy, and index creation operations | gauge | `mssql_instance`
-`windows_mssql_memmgr_lock_blocks` | Specifies the current number of lock blocks in use on the server (refreshed periodically). A lock block represents an individual locked resource, such as a table, page, or row | gauge | `mssql_instance`
-`windows_mssql_memmgr_allocated_lock_blocks` | Specifies the current number of allocated lock blocks. At server startup, the number of allocated lock blocks plus the number of allocated lock owner blocks depends on the SQL Server Locks configuration option. If more lock blocks are needed, the value increases | gauge | `mssql_instance`
-`windows_mssql_memmgr_lock_memory_bytes` | Specifies the total amount of dynamic memory the server is using for locks | gauge | `mssql_instance`
-`windows_mssql_memmgr_lock_owner_blocks` | Specifies the current number of allocated lock owner blocks. At server startup, the number of allocated lock owner blocks and the number of allocated lock blocks depend on the SQL Server Locks configuration option. If more lock owner blocks are needed, the value increases dynamically | gauge | `mssql_instance`
-`windows_mssql_memmgr_allocated_lock_owner_blocks` | _Not yet documented_ | gauge | `mssql_instance`
-`windows_mssql_memmgr_log_pool_memory_bytes` | Total amount of dynamic memory the server is using for Log Pool | gauge | `mssql_instance`
-`windows_mssql_memmgr_maximum_workspace_memory_bytes` | Indicates the maximum amount of memory available for executing processes, such as hash, sort, bulk copy, and index creation operations | gauge | `mssql_instance`
-`windows_mssql_memmgr_outstanding_memory_grants` | Specifies the total number of processes that have successfully acquired a workspace memory grant | gauge | `mssql_instance`
-`windows_mssql_memmgr_pending_memory_grants` | Specifies the total number of processes waiting for a workspace memory grant | gauge | `mssql_instance`
-`windows_mssql_memmgr_optimizer_memory_bytes` | Specifies the total amount of dynamic memory the server is using for query optimization | gauge | `mssql_instance`
-`windows_mssql_memmgr_reserved_server_memory_bytes` | ndicates the amount of memory the server has reserved for future usage. This counter shows the current unused amount of memory initially granted that is shown in Granted Workspace Memory | gauge | `mssql_instance`
-`windows_mssql_memmgr_sql_cache_memory_bytes` | Specifies the total amount of dynamic memory the server is using for the dynamic SQL cache | gauge | `mssql_instance`
-`windows_mssql_memmgr_stolen_server_memory_bytes` | Specifies the amount of memory the server is using for purposes other than database pages | gauge | `mssql_instance`
-`windows_mssql_memmgr_target_server_memory_bytes` | Indicates the ideal amount of memory the server can consume | gauge | `mssql_instance`
-`windows_mssql_memmgr_total_server_memory_bytes` | Specifies the amount of memory the server has committed using the memory manager | gauge | `mssql_instance`
-`windows_mssql_sqlstats_auto_parameterization_attempts` | Number of failed auto-parameterization attempts per second. This should be small. Note that auto-parameterizations are also known as simple parameterizations in later versions of SQL Server | counter | `mssql_instance`
-`windows_mssql_sqlstats_batch_requests` | _Not yet documented_ | counter | `mssql_instance`
-`windows_mssql_sqlstats_failed_auto_parameterization_attempts` | _Not yet documented_ | counter | `mssql_instance`
-`windows_mssql_sqlstats_forced_parameterizations` | Number of successful forced parameterizations per second | counter | `mssql_instance`
-`windows_mssql_sqlstats_guided_plan_executions` | Number of plan executions per second in which the query plan has been generated by using a plan guide | counter | `mssql_instance`
-`windows_mssql_sqlstats_misguided_plan_executions` | Number of plan executions per second in which a plan guide could not be honored during plan generation | counter | `mssql_instance`
-`windows_mssql_sqlstats_safe_auto_parameterization_attempts` | Number of safe auto-parameterization attempts per second | counter | `mssql_instance`
-`windows_mssql_sqlstats_sql_attentions` | Number of attentions per second | counter | `mssql_instance`
-`windows_mssql_sqlstats_sql_compilations` | Number of SQL compilations per second | counter | `mssql_instance`
-`windows_mssql_sqlstats_sql_recompilations` | Number of statement recompiles per second | counter | `mssql_instance`
-`windows_mssql_sqlstats_unsafe_auto_parameterization_attempts` | Number of unsafe auto-parameterization attempts per second. | counter | `mssql_instance`
-`windows_mssql_sql_errors_total` | Information for all errors | counter | `mssql_instance`, `resource`
-`windows_mssql_transactions_tempdb_free_space_bytes` | The amount of space (in kilobytes) available in tempdb | gauge | `mssql_instance`
-`windows_mssql_transactions_longest_transaction_running_seconds` | The length of time (in seconds) since the start of the transaction that has been active longer than any other current transaction | gauge | `mssql_instance`
-`windows_mssql_transactions_nonsnapshot_version_active_total` | The number of currently active transactions that are not using snapshot isolation level and have made data modifications that have generated row versions in the tempdb version store | counter | `mssql_instance`
-`windows_mssql_transactions_snapshot_active_total` | The number of currently active transactions using the snapshot isolation level | counter | `mssql_instance`
-`windows_mssql_transactions_active` | The number of currently active transactions of all types | gauge | `mssql_instance`
-`windows_mssql_transactions_update_conflicts_total` | The percentage of those transactions using the snapshot isolation level that have encountered update conflicts within the last second | counter | `mssql_instance`
-`windows_mssql_transactions_update_snapshot_active_total` | The number of currently active transactions using the snapshot isolation level and have modified data | counter | `mssql_instance`
-`windows_mssql_transactions_version_cleanup_rate_bytes` | The rate (in kilobytes per second) at which row versions are removed from the snapshot isolation version store in tempdb | gauge | `mssql_instance`
-`windows_mssql_transactions_version_generation_rate_bytes` | The rate (in kilobytes per second) at which new row versions are added to the snapshot isolation version store in tempdb | gauge | `mssql_instance`
-`windows_mssql_transactions_version_store_size_bytes` | he amount of space (in kilobytes) in tempdb being used to store snapshot isolation level row versions | gauge | `mssql_instance`
-`windows_mssql_transactions_version_store_units` | The number of active allocation units in the snapshot isolation version store in tempdb | counter | `mssql_instance`
-`windows_mssql_transactions_version_store_creation_units` | The number of allocation units that have been created in the snapshot isolation store since the instance of the Database Engine was started | counter | `mssql_instance`
-`windows_mssql_transactions_version_store_truncation_units` | The number of allocation units that have been removed from the snapshot isolation store since the instance of the Database Engine was started | counter | `mssql_instance`
-`windows_mssql_waitstats_lock_waits` | Statistics for processes waiting on a lock | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_memory_grant_queue_waits` | Statistics for processes waiting for memory grant to become available | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_thread_safe_memory_objects_waits` | Statistics for processes waiting on thread-safe memory allocators | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_log_write_waits` | Statistics for processes waiting for log buffer to be written | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_log_buffer_waits` | Statistics for processes waiting for log buffer to be available | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_network_io_waits` | Statistics relevant to wait on network I/O | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_page_io_latch_waits` | Statistics relevant to page I/O latches | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_page_latch_waits` | Statistics relevant to page latches, not including I/O latches | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_nonpage_latch_waits` | Statistics relevant to non-page latches | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_wait_for_the_worker_waits` | Statistics relevant to processes waiting for worker to become available | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_workspace_synchronization_waits` | Statistics relevant to processes synchronizing access to workspace | gauge | `mssql_instance`, `item`
-`windows_mssql_waitstats_transaction_ownership_waits` | Statistics relevant to processes synchronizing access to transaction | gauge | `mssql_instance`, `item`
+| Name                                                               | Description                                                                                                                                                                                                                                                                                  | Type    | Labels                        |
+|--------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-------------------------------|
+| `windows_mssql_collector_duration_seconds`                         | The time taken for each sub-collector to return                                                                                                                                                                                                                                              | gauge   | `collector`, `mssql_instance` |
+| `windows_mssql_collector_success`                                  | 1 if sub-collector succeeded, 0 otherwise                                                                                                                                                                                                                                                    | gauge   | `collector`, `mssql_instance` |
+| `windows_mssql_accessmethods_au_batch_cleanups`                    | The total number of batches that were completed successfully by the background task that cleans up deferred dropped allocation units                                                                                                                                                         | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_au_cleanups`                          | The total number of allocation units that were successfully dropped the background task that cleans up deferred dropped allocation units. Each allocation unit drop requires multiple batches                                                                                                | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_by_reference_lob_creates`             | The total count of large object (lob) values that were passed by reference. By-reference lobs are used in certain bulk operations to avoid the cost of passing them by value                                                                                                                 | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_by_reference_lob_uses`                | The total count of by-reference lob values that were used. By-reference lobs are used in certain bulk operations to avoid the cost of passing them by-value                                                                                                                                  | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_lob_read_aheads`                      | The total count of lob pages on which readahead was issued                                                                                                                                                                                                                                   | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_column_value_pulls`                   | The total count of column values that were pulled in-row from off-row                                                                                                                                                                                                                        | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_column_value_pushes`                  | The total count of column values that were pushed from in-row to off-row                                                                                                                                                                                                                     | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_deferred_dropped_aus`                 | The total number of allocation units waiting to be dropped by the background task that cleans up deferred dropped allocation units                                                                                                                                                           | gauge   | `mssql_instance`              |
+| `windows_mssql_accessmethods_deferred_dropped_rowsets`             | The number of rowsets created as a result of aborted online index build operations that are waiting to be dropped by the background task that cleans up deferred dropped rowsets                                                                                                             | gauge   | `mssql_instance`              |
+| `windows_mssql_accessmethods_dropped_rowset_cleanups`              | The number of rowsets per second created as a result of aborted online index build operations that were successfully dropped by the background task that cleans up deferred dropped rowsets                                                                                                  | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_dropped_rowset_skips`                 | The number of rowsets per second created as a result of aborted online index build operations that were skipped by the background task that cleans up deferred dropped rowsets created                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_extent_deallocations`                 | Number of extents deallocated per second in all databases in this instance of SQL Server                                                                                                                                                                                                     | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_extent_allocations`                   | Number of extents allocated per second in all databases in this instance of SQL Server                                                                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_au_batch_cleanup_failures`            | The number of batches per second that failed and required retry, by the background task that cleans up deferred dropped allocation units. Failure could be due to lack of memory or disk space, hardware failure and other reasons                                                           | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_leaf_page_cookie_failures`            | The number of times that a leaf page cookie could not be used during an index search since changes happened on the leaf page. The cookie is used to speed up index search                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_tree_page_cookie_failures`            | The number of times that a tree page cookie could not be used during an index search since changes happened on the parent pages of those tree pages. The cookie is used to speed up index search                                                                                             | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_forwarded_records`                    | Number of records per second fetched through forwarded record pointers                                                                                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_free_space_page_fetches`              | Number of pages fetched per second by free space scans. These scans search for free space within pages already allocated to an allocation unit, to satisfy requests to insert or modify record fragments                                                                                     | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_free_space_scans`                     | Number of scans per second that were initiated to search for free space within pages already allocated to an allocation unit to insert or modify record fragment. Each scan may find multiple pages                                                                                          | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_full_scans`                           | Number of unrestricted full scans per second. These can be either base-table or full-index scans                                                                                                                                                                                             | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_index_searches`                       | Number of index searches per second. These are used to start a range scan, reposition a range scan, revalidate a scan point, fetch a single index record, and search down the index to locate where to insert a new row                                                                      | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_insysxact_waits`                      | Number of times a reader needs to wait for a page because the InSysXact bit is set                                                                                                                                                                                                           | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_lob_handle_creates`                   | Count of temporary lobs created                                                                                                                                                                                                                                                              | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_lob_handle_destroys`                  | Count of temporary lobs destroyed                                                                                                                                                                                                                                                            | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_lob_ss_provider_creates`              | Count of LOB Storage Service Providers (LobSSP) created. One worktable created per LobSSP                                                                                                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_lob_ss_provider_destroys`             | Count of LobSSP destroyed                                                                                                                                                                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_lob_ss_provider_truncations`          | Count of LobSSP truncated                                                                                                                                                                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_mixed_page_allocations`               | Number of pages allocated per second from mixed extents. These could be used for storing the IAM pages and the first eight pages that are allocated to an allocation unit                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_page_compression_attempts`            | Number of pages evaluated for page-level compression. Includes pages that were not compressed because significant savings could be achieved. Includes all objects in the instance of SQL Server                                                                                              | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_page_deallocations`                   | Number of pages deallocated per second in all databases in this instance of SQL Server. These include pages from mixed extents and uniform extents                                                                                                                                           | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_page_allocations`                     | Number of pages allocated per second in all databases in this instance of SQL Server. These include pages allocations from both mixed extents and uniform extents                                                                                                                            | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_page_compressions`                    | Number of data pages that are compressed by using PAGE compression. Includes all objects in the instance of SQL Server                                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_page_splits`                          | Number of page splits per second that occur as the result of overflowing index pages                                                                                                                                                                                                         | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_probe_scans`                          | Number of probe scans per second that are used to find at most one single qualified row in an index or base table directly                                                                                                                                                                   | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_range_scans`                          | Number of qualified range scans through indexes per second                                                                                                                                                                                                                                   | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_scan_point_revalidations`             | Number of times per second that the scan point had to be revalidated to continue the scan                                                                                                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_ghost_record_skips`                   | Number of ghosted records per second skipped during scans                                                                                                                                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_table_lock_escalations`               | Number of times locks on a table were escalated to the TABLE or HoBT granularity                                                                                                                                                                                                             | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_leaf_page_cookie_uses`                | Number of times a leaf page cookie is used successfully during an index search since no change happened on the leaf page. The cookie is used to speed up index search                                                                                                                        | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_tree_page_cookie_uses`                | Number of times a tree page cookie is used successfully during an index search since no change happened on the parent page of the tree page. The cookie is used to speed up index search                                                                                                     | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_workfile_creates`                     | Number of work files created per second. For example, work files could be used to store temporary results for hash joins and hash aggregates                                                                                                                                                 | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_worktables_creates`                   | Number of work tables created per second. For example, work tables could be used to store temporary results for query spool, lob variables, XML variables, and cursors                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_accessmethods_worktables_from_cache_ratio`          | Percentage of work tables created where the initial two pages of the work table were not allocated but were immediately available from the work table cache                                                                                                                                  | counter | `mssql_instance`              |
+| `windows_mssql_availreplica_received_from_replica_bytes`           | Number of bytes received from the availability replica per second. Pings and status updates will generate network traffic even on databases with no user updates                                                                                                                             | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_sent_to_replica_bytes`                 | Number of bytes sent to the remote availability replica per second. On the primary replica this is the number of bytes sent to the secondary replica. On the secondary replica this is the number of bytes sent to the primary replica                                                       | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_sent_to_transport_bytes`               | Actual number of bytes sent per second over the network to the remote availability replica. On the primary replica this is the number of bytes sent to the secondary replica. On the secondary replica this is the number of bytes sent to the primary replica                               | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_initiated_flow_controls`               | Time in milliseconds that log stream messages waited for send flow control, in the last second                                                                                                                                                                                               | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_flow_control_wait_seconds`             | Number of times flow-control initiated in the last second. Flow Control Time (ms/sec) divided by Flow Control/sec is the average time per wait                                                                                                                                               | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_receives_from_replica`                 | Number of Always On messages received from thereplica per second                                                                                                                                                                                                                             | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_resent_messages`                       | Number of Always On messages resent in the last second                                                                                                                                                                                                                                       | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_sends_to_replica`                      | Number of Always On messages sent to this availability replica per second                                                                                                                                                                                                                    | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_availreplica_sends_to_transport`                    | Actual number of Always On messages sent per second over the network to the remote availability replica                                                                                                                                                                                      | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_bufman_background_writer_pages`                     | Number of pages flushed to enforce the recovery interval settings                                                                                                                                                                                                                            | counter | `mssql_instance`              |
+| `windows_mssql_bufman_buffer_cache_hit_ratio`                      | Indicates the percentage of pages found in the buffer cache without having to read from disk. The ratio is the total number of cache hits divided by the total number of cache lookups over the last few thousand page accesses                                                              | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_checkpoint_pages`                            | Indicates the number of pages flushed to disk per second by a checkpoint or other operation that require all dirty pages to be flushed                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_bufman_database_pages`                              | Indicates the number of pages in the buffer pool with database content                                                                                                                                                                                                                       | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_extension_allocated_pages`                   | Total number of non-free cache pages in the buffer pool extension file                                                                                                                                                                                                                       | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_extension_free_pages`                        | Total number of free cache pages in the buffer pool extension file                                                                                                                                                                                                                           | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_extension_in_use_as_percentage`              | _Not yet documented_                                                                                                                                                                                                                                                                         | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_extension_outstanding_io`                    | Percentage of the buffer pool extension paging file occupied by buffer manager pages                                                                                                                                                                                                         | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_extension_page_evictions`                    | Number of pages evicted from the buffer pool extension file per second                                                                                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_bufman_extension_page_reads`                        | Number of pages read from the buffer pool extension file per second                                                                                                                                                                                                                          | counter | `mssql_instance`              |
+| `windows_mssql_bufman_extension_page_unreferenced_seconds`         | Average seconds a page will stay in the buffer pool extension without references to it                                                                                                                                                                                                       | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_extension_page_writes`                       | Number of pages written to the buffer pool extension file per second                                                                                                                                                                                                                         | counter | `mssql_instance`              |
+| `windows_mssql_bufman_free_list_stalls`                            | Indicates the number of requests per second that had to wait for a free page                                                                                                                                                                                                                 | counter | `mssql_instance`              |
+| `windows_mssql_bufman_integral_controller_slope`                   | The slope that integral controller for the buffer pool last used, times -10 billion                                                                                                                                                                                                          | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_lazywrites`                                  | Indicates the number of buffers written per second by the buffer manager's lazy writer                                                                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_bufman_page_life_expectancy_seconds`                | Indicates the number of seconds a page will stay in the buffer pool without references                                                                                                                                                                                                       | gauge   | `mssql_instance`              |
+| `windows_mssql_bufman_page_lookups`                                | Indicates the number of requests per second to find a page in the buffer pool                                                                                                                                                                                                                | counter | `mssql_instance`              |
+| `windows_mssql_bufman_page_reads`                                  | Indicates the number of physical database page reads that are issued per second                                                                                                                                                                                                              | counter | `mssql_instance`              |
+| `windows_mssql_bufman_page_writes`                                 | Indicates the number of physical database page writes that are issued per second                                                                                                                                                                                                             | counter | `mssql_instance`              |
+| `windows_mssql_bufman_read_ahead_pages`                            | Indicates the number of pages read per second in anticipation of use                                                                                                                                                                                                                         | counter | `mssql_instance`              |
+| `windows_mssql_bufman_read_ahead_issuing_seconds`                  | Time (microseconds) spent issuing readahead                                                                                                                                                                                                                                                  | counter | `mssql_instance`              |
+| `windows_mssql_bufman_target_pages`                                | Ideal number of pages in the buffer pool                                                                                                                                                                                                                                                     | gauge   | `mssql_instance`              |
+| `windows_mssql_dbreplica_database_flow_control_wait_seconds`       | _Not yet documented_                                                                                                                                                                                                                                                                         | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_database_initiated_flow_controls`         | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_received_file_bytes`                      | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_group_commits`                            | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_group_commit_stall_seconds`               | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_apply_pending_queue`                  | _Not yet documented_                                                                                                                                                                                                                                                                         | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_apply_ready_queue`                    | _Not yet documented_                                                                                                                                                                                                                                                                         | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_compressed_bytes`                     | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_decompressed_bytes`                   | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_received_bytes`                       | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_compression_cachehits`                | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_compression_cachemisses`              | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_compressions`                         | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_decompressions`                       | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_remaining_for_undo`                   | The amount of log, in bytes, remaining to complete the undo phase                                                                                                                                                                                                                            | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_log_send_queue`                           | Amount of log records in the log files of the primary database, in kilobytes, that haven't been sent to the secondary replica                                                                                                                                                                | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_mirrored_write_transactions`              | Number of transactions that were written to the primary database and then waited to commit until the log was sent to the secondary database, in the last second                                                                                                                              | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_recovery_queue_records`                   | Amount of log records in the log files of the secondary replica that have not been redone                                                                                                                                                                                                    | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_redo_blocks`                              | Number of times the redo thread was blocked on locks held by readers of the database                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_redo_remaining_bytes`                     | The amount of log, in kilobytes, remaining to be redone to finish the reverting phase                                                                                                                                                                                                        | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_redone_bytes`                             | Amount of log records redone on the secondary database in the last second                                                                                                                                                                                                                    | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_redones`                                  | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_total_log_requiring_undo`                 | Total kilobytes of log that must be undone                                                                                                                                                                                                                                                   | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_dbreplica_transaction_delay_seconds`                | Delay in waiting for unterminated commit acknowledgment for all the current transactions                                                                                                                                                                                                     | gauge   | `mssql_instance`, `replica`   |
+| `windows_mssql_databases_active_transactions`                      | Number of active transactions for the database                                                                                                                                                                                                                                               | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_backup_restore_operations`                | Read/write throughput for backup and restore operations of a database per second                                                                                                                                                                                                             | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_bulk_copy_rows`                           | Number of rows bulk copied per second                                                                                                                                                                                                                                                        | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_bulk_copy_bytes`                          | Amount of data bulk copied (in kilobytes) per second                                                                                                                                                                                                                                         | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_commit_table_entries`                     | he size (row count) of the in-memory portion of the commit table for the database                                                                                                                                                                                                            | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_data_files_size_bytes`                    | Cumulative size (in kilobytes) of all the data files in the database including any automatic growth. Monitoring this counter is useful, for example, for determining the correct size of tempdb                                                                                              | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_dbcc_logical_scan_bytes`                  | Number of logical read scan bytes per second for database console commands (DBCC)                                                                                                                                                                                                            | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_group_commit_stall_seconds`               | Group stall time (microseconds) per second                                                                                                                                                                                                                                                   | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_flushed_bytes`                        | Total number of log bytes flushed                                                                                                                                                                                                                                                            | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_cache_hit_ratio`                      | Percentage of log cache reads satisfied from the log cache                                                                                                                                                                                                                                   | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_cache_reads`                          | Reads performed per second through the log manager cache                                                                                                                                                                                                                                     | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_files_size_bytes`                     | Cumulative size (in kilobytes) of all the transaction log files in the database                                                                                                                                                                                                              | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_files_used_size_bytes`                | The cumulative used size of all the log files in the database                                                                                                                                                                                                                                | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_flushes`                              | Total wait time (in milliseconds) to flush the log. On an Always On secondary database, this value indicates the wait time for log records to be hardened to disk                                                                                                                            | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_flush_waits`                          | Number of commits per second waiting for the log flush                                                                                                                                                                                                                                       | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_flush_wait_seconds`                   | Number of commits per second waiting for the log flush                                                                                                                                                                                                                                       | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_flush_write_seconds`                  | Time in milliseconds for performing writes of log flushes that were completed in the last second                                                                                                                                                                                             | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_growths`                              | Total number of times the transaction log for the database has been expanded                                                                                                                                                                                                                 | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_cache_misses`                    | Number of requests for which the log block was not available in the log pool                                                                                                                                                                                                                 | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_disk_reads`                      | Number of disk reads that the log pool issued to fetch log blocks                                                                                                                                                                                                                            | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_hash_deletes`                    | Rate of raw hash entry deletes from the Log Pool                                                                                                                                                                                                                                             | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_hash_inserts`                    | Rate of raw hash entry inserts into the Log Pool                                                                                                                                                                                                                                             | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_invalid_hash_entries`            | Rate of hash lookups failing due to being invalid                                                                                                                                                                                                                                            | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_log_scan_pushes`                 | Rate of Log block pushes by log scans, which may come from disk or memory                                                                                                                                                                                                                    | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_log_writer_pushes`               | Rate of Log block pushes by log writer thread                                                                                                                                                                                                                                                | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_empty_free_pool_pushes`          | Rate of Log block push fails due to empty free pool                                                                                                                                                                                                                                          | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_low_memory_pushes`               | Rate of Log block push fails due to being low on memory                                                                                                                                                                                                                                      | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_no_free_buffer_pushes`           | Rate of Log block push fails due to free buffer unavailable                                                                                                                                                                                                                                  | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_req_behind_trunc`                | Log pool cache misses due to block requested being behind truncation LSN                                                                                                                                                                                                                     | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_requests_old_vlf`                | Log Pool requests that were not in the last VLF of the log                                                                                                                                                                                                                                   | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_requests`                        | The number of log-block requests processed by the log pool                                                                                                                                                                                                                                   | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_total_active_log_bytes`          | Current total active log stored in the shared cache buffer manager in bytes                                                                                                                                                                                                                  | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_pool_total_shared_pool_bytes`         | Current total memory usage of the shared cache buffer manager in bytes                                                                                                                                                                                                                       | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_shrinks`                              | Total number of log shrinks for this database                                                                                                                                                                                                                                                | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_truncations`                          | The number of times the transaction log has been truncated (in Simple Recovery Model)                                                                                                                                                                                                        | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_log_used_percent`                         | Percentage of space in the log that is in use                                                                                                                                                                                                                                                | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_pending_repl_transactions`                | Number of transactions in the transaction log of the publication database marked for replication, but not yet delivered to the distribution database                                                                                                                                         | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_repl_transactions`                        | Number of transactions per second read out of the transaction log of the publication database and delivered to the distribution database                                                                                                                                                     | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_shrink_data_movement_bytes`               | Amount of data being moved per second by autoshrink operations, or DBCC SHRINKDATABASE or DBCC SHRINKFILE statements                                                                                                                                                                         | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_tracked_transactions`                     | Number of committed transactions recorded in the commit table for the database                                                                                                                                                                                                               | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_transactions`                             | Number of transactions started for the database per second                                                                                                                                                                                                                                   | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_write_transactions`                       | Number of transactions that wrote to the database and committed, in the last second                                                                                                                                                                                                          | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_xtp_controller_dlc_fetch_latency_seconds` | Average latency in microseconds between log blocks entering the Direct Log Consumer and being retrieved by the XTP controller, per second                                                                                                                                                    | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_xtp_controller_dlc_peak_latency_seconds`  | The largest recorded latency, in microseconds, of a fetch from the Direct Log Consumer by the XTP controller                                                                                                                                                                                 | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_databases_xtp_controller_log_processed_bytes`       | The amount of log bytes processed by the XTP controller thread, per second                                                                                                                                                                                                                   | counter | `mssql_instance`, `database`  |
+| `windows_mssql_databases_xtp_memory_used_bytes`                    | The amount of memory used by XTP in the database                                                                                                                                                                                                                                             | gauge   | `mssql_instance`, `database`  |
+| `windows_mssql_genstats_active_temp_tables`                        | Number of temporary tables/table variables in use                                                                                                                                                                                                                                            | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_connection_resets`                         | Total number of logins started from the connection pool                                                                                                                                                                                                                                      | counter | `mssql_instance`              |
+| `windows_mssql_genstats_event_notifications_delayed_drop`          | Number of event notifications waiting to be dropped by a system thread                                                                                                                                                                                                                       | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_http_authenticated_requests`               | Number of authenticated HTTP requests started per second                                                                                                                                                                                                                                     | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_logical_connections`                       | Number of logical connections to the system                                                                                                                                                                                                                                                  | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_logins`                                    | Total number of logins started per second. This does not include pooled connections                                                                                                                                                                                                          | counter | `mssql_instance`              |
+| `windows_mssql_genstats_logouts`                                   | Total number of logout operations started per second                                                                                                                                                                                                                                         | counter | `mssql_instance`              |
+| `windows_mssql_genstats_mars_deadlocks`                            | Number of MARS deadlocks detected                                                                                                                                                                                                                                                            | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_non_atomic_yields`                         | Number of non-atomic yields per second                                                                                                                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_genstats_blocked_processes`                         | Number of currently blocked processes                                                                                                                                                                                                                                                        | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_soap_empty_requests`                       | Number of empty SOAP requests started per second                                                                                                                                                                                                                                             | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_soap_method_invocations`                   | Number of SOAP method invocations started per second                                                                                                                                                                                                                                         | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_soap_session_initiate_requests`            | Number of SOAP Session initiate requests started per second                                                                                                                                                                                                                                  | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_soap_session_terminate_requests`           | Number of SOAP Session terminate requests started per second                                                                                                                                                                                                                                 | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_soapsql_requests`                          | Number of SOAP SQL requests started per second                                                                                                                                                                                                                                               | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_soapwsdl_requests`                         | Number of SOAP Web Service Description Language requests started per second                                                                                                                                                                                                                  | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_sql_trace_io_provider_lock_waits`          | Number of waits for the File IO Provider lock per second                                                                                                                                                                                                                                     | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_tempdb_recovery_unit_ids_generated`        | Number of duplicate tempdb recovery unit id generated                                                                                                                                                                                                                                        | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_tempdb_rowset_ids_generated`               | Number of duplicate tempdb rowset id generated                                                                                                                                                                                                                                               | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_temp_tables_creations`                     | Number of temporary tables/table variables created per second                                                                                                                                                                                                                                | counter | `mssql_instance`              |
+| `windows_mssql_genstats_temp_tables_awaiting_destruction`          | Number of temporary tables/table variables waiting to be destroyed by the cleanup system thread                                                                                                                                                                                              | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_trace_event_notification_queue_size`       | Number of trace event notification instances waiting in the internal queue to be sent through Service Broker                                                                                                                                                                                 | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_transactions`                              | Number of transaction enlistments (local, DTC, bound all combined)                                                                                                                                                                                                                           | gauge   | `mssql_instance`              |
+| `windows_mssql_genstats_user_connections`                          | Counts the number of users currently connected to SQL Server                                                                                                                                                                                                                                 | gauge   | `mssql_instance`              |
+| `windows_mssql_instance_info `                                               | Returns information about the MSSQL server running on port 1433                                                                                                                                                                                                                              | gauge   | `version`                     |
+| `windows_mssql_locks_average_wait_seconds`                         | Average amount of wait time (in milliseconds) for each lock request that resulted in a wait                                                                                                                                                                                                  | gauge   | `mssql_instance`, `resource`  |
+| `windows_mssql_locks_lock_requests`                                | Number of new locks and lock conversions per second requested from the lock manager                                                                                                                                                                                                          | counter | `mssql_instance`, `resource`  |
+| `windows_mssql_locks_lock_timeouts`                                | Number of lock requests per second that timed out, including requests for NOWAIT locks                                                                                                                                                                                                       | counter | `mssql_instance`, `resource`  |
+| `windows_mssql_locks_lock_timeouts_excluding_NOWAIT`               | Number of lock requests per second that timed out, but excluding requests for NOWAIT locks                                                                                                                                                                                                   | counter | `mssql_instance`, `resource`  |
+| `windows_mssql_locks_lock_waits`                                   | Total wait time (in milliseconds) for locks in the last second                                                                                                                                                                                                                               | counter | `mssql_instance`, `resource`  |
+| `windows_mssql_locks_lock_wait_seconds`                            | Number of lock requests per second that required the caller to wait                                                                                                                                                                                                                          | gauge   | `mssql_instance`, `resource`  |
+| `windows_mssql_locks_deadlocks`                                    | Number of lock requests per second that resulted in a deadlock                                                                                                                                                                                                                               | counter | `mssql_instance`, `resource`  |
+| `windows_mssql_memmgr_connection_memory_bytes`                     | Specifies the total amount of dynamic memory the server is using for maintaining connections                                                                                                                                                                                                 | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_database_cache_memory_bytes`                 | Specifies the amount of memory the server is currently using for the database pages cache                                                                                                                                                                                                    | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_external_benefit_of_memory`                  | An internal estimation of the performance benefit from adding memory to a specific cache                                                                                                                                                                                                     | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_free_memory_bytes`                           | Specifies the amount of committed memory currently not used by the server                                                                                                                                                                                                                    | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_granted_workspace_memory_bytes`              | Specifies the total amount of memory currently granted to executing processes, such as hash, sort, bulk copy, and index creation operations                                                                                                                                                  | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_lock_blocks`                                 | Specifies the current number of lock blocks in use on the server (refreshed periodically). A lock block represents an individual locked resource, such as a table, page, or row                                                                                                              | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_allocated_lock_blocks`                       | Specifies the current number of allocated lock blocks. At server startup, the number of allocated lock blocks plus the number of allocated lock owner blocks depends on the SQL Server Locks configuration option. If more lock blocks are needed, the value increases                       | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_lock_memory_bytes`                           | Specifies the total amount of dynamic memory the server is using for locks                                                                                                                                                                                                                   | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_lock_owner_blocks`                           | Specifies the current number of allocated lock owner blocks. At server startup, the number of allocated lock owner blocks and the number of allocated lock blocks depend on the SQL Server Locks configuration option. If more lock owner blocks are needed, the value increases dynamically | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_allocated_lock_owner_blocks`                 | _Not yet documented_                                                                                                                                                                                                                                                                         | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_log_pool_memory_bytes`                       | Total amount of dynamic memory the server is using for Log Pool                                                                                                                                                                                                                              | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_maximum_workspace_memory_bytes`              | Indicates the maximum amount of memory available for executing processes, such as hash, sort, bulk copy, and index creation operations                                                                                                                                                       | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_outstanding_memory_grants`                   | Specifies the total number of processes that have successfully acquired a workspace memory grant                                                                                                                                                                                             | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_pending_memory_grants`                       | Specifies the total number of processes waiting for a workspace memory grant                                                                                                                                                                                                                 | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_optimizer_memory_bytes`                      | Specifies the total amount of dynamic memory the server is using for query optimization                                                                                                                                                                                                      | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_reserved_server_memory_bytes`                | ndicates the amount of memory the server has reserved for future usage. This counter shows the current unused amount of memory initially granted that is shown in Granted Workspace Memory                                                                                                   | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_sql_cache_memory_bytes`                      | Specifies the total amount of dynamic memory the server is using for the dynamic SQL cache                                                                                                                                                                                                   | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_stolen_server_memory_bytes`                  | Specifies the amount of memory the server is using for purposes other than database pages                                                                                                                                                                                                    | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_target_server_memory_bytes`                  | Indicates the ideal amount of memory the server can consume                                                                                                                                                                                                                                  | gauge   | `mssql_instance`              |
+| `windows_mssql_memmgr_total_server_memory_bytes`                   | Specifies the amount of memory the server has committed using the memory manager                                                                                                                                                                                                             | gauge   | `mssql_instance`              |
+| `windows_mssql_sqlstats_auto_parameterization_attempts`            | Number of failed auto-parameterization attempts per second. This should be small. Note that auto-parameterizations are also known as simple parameterizations in later versions of SQL Server                                                                                                | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_batch_requests`                            | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_failed_auto_parameterization_attempts`     | _Not yet documented_                                                                                                                                                                                                                                                                         | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_forced_parameterizations`                  | Number of successful forced parameterizations per second                                                                                                                                                                                                                                     | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_guided_plan_executions`                    | Number of plan executions per second in which the query plan has been generated by using a plan guide                                                                                                                                                                                        | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_misguided_plan_executions`                 | Number of plan executions per second in which a plan guide could not be honored during plan generation                                                                                                                                                                                       | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_safe_auto_parameterization_attempts`       | Number of safe auto-parameterization attempts per second                                                                                                                                                                                                                                     | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_sql_attentions`                            | Number of attentions per second                                                                                                                                                                                                                                                              | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_sql_compilations`                          | Number of SQL compilations per second                                                                                                                                                                                                                                                        | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_sql_recompilations`                        | Number of statement recompiles per second                                                                                                                                                                                                                                                    | counter | `mssql_instance`              |
+| `windows_mssql_sqlstats_unsafe_auto_parameterization_attempts`     | Number of unsafe auto-parameterization attempts per second.                                                                                                                                                                                                                                  | counter | `mssql_instance`              |
+| `windows_mssql_sql_errors_total`                                   | Information for all errors                                                                                                                                                                                                                                                                   | counter | `mssql_instance`, `resource`  |
+| `windows_mssql_transactions_tempdb_free_space_bytes`               | The amount of space (in kilobytes) available in tempdb                                                                                                                                                                                                                                       | gauge   | `mssql_instance`              |
+| `windows_mssql_transactions_longest_transaction_running_seconds`   | The length of time (in seconds) since the start of the transaction that has been active longer than any other current transaction                                                                                                                                                            | gauge   | `mssql_instance`              |
+| `windows_mssql_transactions_nonsnapshot_version_active_total`      | The number of currently active transactions that are not using snapshot isolation level and have made data modifications that have generated row versions in the tempdb version store                                                                                                        | counter | `mssql_instance`              |
+| `windows_mssql_transactions_snapshot_active_total`                 | The number of currently active transactions using the snapshot isolation level                                                                                                                                                                                                               | counter | `mssql_instance`              |
+| `windows_mssql_transactions_active`                                | The number of currently active transactions of all types                                                                                                                                                                                                                                     | gauge   | `mssql_instance`              |
+| `windows_mssql_transactions_update_conflicts_total`                | The percentage of those transactions using the snapshot isolation level that have encountered update conflicts within the last second                                                                                                                                                        | counter | `mssql_instance`              |
+| `windows_mssql_transactions_update_snapshot_active_total`          | The number of currently active transactions using the snapshot isolation level and have modified data                                                                                                                                                                                        | counter | `mssql_instance`              |
+| `windows_mssql_transactions_version_cleanup_rate_bytes`            | The rate (in kilobytes per second) at which row versions are removed from the snapshot isolation version store in tempdb                                                                                                                                                                     | gauge   | `mssql_instance`              |
+| `windows_mssql_transactions_version_generation_rate_bytes`         | The rate (in kilobytes per second) at which new row versions are added to the snapshot isolation version store in tempdb                                                                                                                                                                     | gauge   | `mssql_instance`              |
+| `windows_mssql_transactions_version_store_size_bytes`              | he amount of space (in kilobytes) in tempdb being used to store snapshot isolation level row versions                                                                                                                                                                                        | gauge   | `mssql_instance`              |
+| `windows_mssql_transactions_version_store_units`                   | The number of active allocation units in the snapshot isolation version store in tempdb                                                                                                                                                                                                      | counter | `mssql_instance`              |
+| `windows_mssql_transactions_version_store_creation_units`          | The number of allocation units that have been created in the snapshot isolation store since the instance of the Database Engine was started                                                                                                                                                  | counter | `mssql_instance`              |
+| `windows_mssql_transactions_version_store_truncation_units`        | The number of allocation units that have been removed from the snapshot isolation store since the instance of the Database Engine was started                                                                                                                                                | counter | `mssql_instance`              |
+| `windows_mssql_waitstats_lock_waits`                               | Statistics for processes waiting on a lock                                                                                                                                                                                                                                                   | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_memory_grant_queue_waits`                 | Statistics for processes waiting for memory grant to become available                                                                                                                                                                                                                        | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_thread_safe_memory_objects_waits`         | Statistics for processes waiting on thread-safe memory allocators                                                                                                                                                                                                                            | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_log_write_waits`                          | Statistics for processes waiting for log buffer to be written                                                                                                                                                                                                                                | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_log_buffer_waits`                         | Statistics for processes waiting for log buffer to be available                                                                                                                                                                                                                              | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_network_io_waits`                         | Statistics relevant to wait on network I/O                                                                                                                                                                                                                                                   | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_page_io_latch_waits`                      | Statistics relevant to page I/O latches                                                                                                                                                                                                                                                      | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_page_latch_waits`                         | Statistics relevant to page latches, not including I/O latches                                                                                                                                                                                                                               | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_nonpage_latch_waits`                      | Statistics relevant to non-page latches                                                                                                                                                                                                                                                      | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_wait_for_the_worker_waits`                | Statistics relevant to processes waiting for worker to become available                                                                                                                                                                                                                      | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_workspace_synchronization_waits`          | Statistics relevant to processes synchronizing access to workspace                                                                                                                                                                                                                           | gauge   | `mssql_instance`, `item`      |
+| `windows_mssql_waitstats_transaction_ownership_waits`              | Statistics relevant to processes synchronizing access to transaction                                                                                                                                                                                                                         | gauge   | `mssql_instance`, `item`      |
 
 ### Example metric
 
@@ -311,4 +312,4 @@ groups:
       summary: "SQl EXpress Database size exceeded 10GB"
       description: "The database size has grown larger than 10GB. Instance: {{ $labels.instance }}"
 
-```
+```

docs/collector.netframework.md

@@ -0,0 +1,113 @@
+# netframework collector
+
+The netframework collector exposes metrics about dotnet framework.
+
+|                         |                                                                                                                                                                                                                                                                                                                                                                                                        |
+|-------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Metric name prefix**  | `netframework_clrexceptions`                                                                                                                                                                                                                                                                                                                                                                           |
+| **Classes**             | `Win32_PerfRawData_NETFramework_NETCLRExceptions`, `Win32_PerfRawData_NETFramework_NETCLRInterop`, `Win32_PerfRawData_NETFramework_NETCLRJit`, `Win32_PerfRawData_NETFramework_NETCLRLoading`, `Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads`, `Win32_PerfRawData_NETFramework_NETCLRMemory`, `Win32_PerfRawData_NETFramework_NETCLRRemoting`, `Win32_PerfRawData_NETFramework_NETCLRSecurity` |
+| **Enabled by default?** | No                                                                                                                                                                                                                                                                                                                                                                                                     |
+
+## Flags
+
+None
+
+## Metrics
+
+### CLR Exceptions
+
+| Name                                                            | Description                                                                                                                                                                               | Type    | Labels    |
+|-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrexceptions_exceptions_thrown_total`    | Displays the total number of exceptions thrown since the application started. This includes both .NET exceptions and unmanaged exceptions that are converted into .NET exceptions.        | counter | `process` |
+| `windows_netframework_clrexceptions_exceptions_filters_total`   | Displays the total number of .NET exception filters executed. An exception filter evaluates regardless of whether an exception is handled.                                                | counter | `process` |
+| `windows_netframework_clrexceptions_exceptions_finallys_total`  | Displays the total number of finally blocks executed. Only the finally blocks executed for an exception are counted; finally blocks on normal code paths are not counted by this counter. | counter | `process` |
+| `windows_netframework_clrexceptions_throw_to_catch_depth_total` | Displays the total number of stack frames traversed, from the frame that threw the exception to the frame that handled the exception.                                                     | counter | `process` |
+
+### CLR Interop
+
+| Name                                                          | Description                                                                                                                                                                                                                                        | Type    | Labels    |
+|---------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrinterop_com_callable_wrappers_total` | Displays the current number of COM callable wrappers (CCWs). A CCW is a proxy for a managed object being referenced from an unmanaged COM client.                                                                                                  | counter | `process` |
+| `windows_netframework_clrinterop_interop_marshalling_total`   | Displays the total number of times arguments and return values have been marshaled from managed to unmanaged code, and vice versa, since the application started.                                                                                  | counter | `process` |
+| `windows_netframework_clrinterop_interop_stubs_created_total` | Displays the current number of stubs created by the common language runtime. Stubs are responsible for marshaling arguments and return values from managed to unmanaged code, and vice versa, during a COM interop call or a platform invoke call. | counter | `process` |
+
+### CLR JIT
+
+| Name                                                      | Description                                                                                                                                                                                                           | Type    | Labels    |
+|-----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrjit_jit_methods_total`           | Displays the total number of methods JIT-compiled since the application started. This counter does not include pre-JIT-compiled methods.                                                                              | counter | `process` |
+| `windows_netframework_clrjit_jit_time_percent`            | Displays the percentage of time spent in JIT compilation. This counter is updated at the end of every JIT compilation phase. A JIT compilation phase occurs when a method and its dependencies are compiled.          | gauge   | `process` |
+| `windows_netframework_clrjit_jit_standard_failures_total` | Displays the peak number of methods the JIT compiler has failed to compile since the application started. This failure can occur if the MSIL cannot be verified or if there is an internal error in the JIT compiler. | counter | `process` |
+| `windows_netframework_clrjit_jit_il_bytes_total`          | Displays the total number of Microsoft intermediate language (MSIL) bytes compiled by the just-in-time (JIT) compiler since the application started                                                                   | counter | `process` |
+
+### CLR Loading
+
+| Name                                                        | Description                                                                                                                                                                                                                                 | Type    | Labels    |
+|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrloading_loader_heap_size_bytes`    | Displays the current size, in bytes, of the memory committed by the class loader across all application domains. Committed memory is the physical space reserved in the disk paging file.                                                   | gauge   | `process` |
+| `windows_netframework_clrloading_appdomains_loaded_current` | Displays the current number of application domains loaded in this application.                                                                                                                                                              | gauge   | `process` |
+| `windows_netframework_clrloading_assemblies_loaded_current` | Displays the current number of assemblies loaded across all application domains in the currently running application. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once. | gauge   | `process` |
+| `windows_netframework_clrloading_classes_loaded_current`    | Displays the current number of classes loaded in all assemblies.                                                                                                                                                                            | gauge   | `process` |
+| `windows_netframework_clrloading_appdomains_loaded_total`   | Displays the peak number of application domains loaded since the application started.                                                                                                                                                       | counter | `process` |
+| `windows_netframework_clrloading_appdomains_unloaded_total` | Displays the total number of application domains unloaded since the application started. If an application domain is loaded and unloaded multiple times, this counter increments each time the application domain is unloaded.              | counter | `process` |
+| `windows_netframework_clrloading_assemblies_loaded_total`   | Displays the total number of assemblies loaded since the application started. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once.                                         | counter | `process` |
+| `windows_netframework_clrloading_classes_loaded_total`      | Displays the cumulative number of classes loaded in all assemblies since the application started.                                                                                                                                           | counter | `process` |
+| `windows_netframework_clrloading_class_load_failures_total` | Displays the peak number of classes that have failed to load since the application started.                                                                                                                                                 | counter | `process` |
+
+### CLR Locks and Threads
+
+| Name                                                                 | Description                                                                                                                                                                                                                                                                                                                       | Type    | Labels    |
+|----------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrlocksandthreads_current_queue_length`       | Displays the total number of threads that are currently waiting to acquire a managed lock in the application.                                                                                                                                                                                                                     | gauge   | `process` |
+| `windows_netframework_clrlocksandthreads_current_logical_threads`    | Displays the number of current managed thread objects in the application. This counter maintains the count of both running and stopped threads.                                                                                                                                                                                   | gauge   | `process` |
+| `windows_netframework_clrlocksandthreads_physical_threads_current`   | Displays the number of native operating system threads created and owned by the common language runtime to act as underlying threads for managed thread objects. This counter's value does not include the threads used by the runtime in its internal operations; it is a subset of the threads in the operating system process. | gauge   | `process` |
+| `windows_netframework_clrlocksandthreads_recognized_threads_current` | Displays the number of threads that are currently recognized by the runtime. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once.                                                                              | gauge   | `process` |
+| `windows_netframework_clrlocksandthreads_recognized_threads_total`   | Displays the total number of threads that have been recognized by the runtime since the application started. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once.                                              | counter | `process` |
+| `windows_netframework_clrlocksandthreads_queue_length_total`         | Displays the total number of threads that waited to acquire a managed lock since the application started.                                                                                                                                                                                                                         | counter | `process` |
+| `windows_netframework_clrlocksandthreads_contentions_total`          | Displays the total number of times that threads in the runtime have attempted to acquire a managed lock unsuccessfully.                                                                                                                                                                                                           | counter | `process` |
+
+### CLR Memory
+
+| Name                                                     | Description                                                                                                                                                                                                                                                       | Type    | Labels    |
+|----------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrmemory_allocated_bytes_total`   | Displays the total number of bytes allocated on the garbage collection heap.                                                                                                                                                                                      | counter | `process` |
+| `windows_netframework_clrmemory_finalization_survivors`  | Displays the number of garbage-collected objects that survive a collection because they are waiting to be finalized.                                                                                                                                              | gauge   | `process` |
+| `windows_netframework_clrmemory_heap_size_bytes`         | Displays the maximum bytes that can be allocated; it does not indicate the current number of bytes allocated.                                                                                                                                                     | gauge   | `process` |
+| `windows_netframework_clrmemory_promoted_bytes`          | Displays the bytes that were promoted from the generation to the next one during the last GC. Memory is promoted when it survives a garbage collection.                                                                                                           | gauge   | `process` |
+| `windows_netframework_clrmemory_number_gc_handles`       | Displays the current number of garbage collection handles in use. Garbage collection handles are handles to resources external to the common language runtime and the managed environment.                                                                        | gauge   | `process` |
+| `windows_netframework_clrmemory_collections_total`       | Displays the number of times the generation objects are garbage collected since the application started.                                                                                                                                                          | counter | `process` |
+| `windows_netframework_clrmemory_induced_gc_total`        | Displays the peak number of times garbage collection was performed because of an explicit call to GC.Collect.                                                                                                                                                     | counter | `process` |
+| `windows_netframework_clrmemory_number_pinned_objects`   | Displays the number of pinned objects encountered in the last garbage collection.                                                                                                                                                                                 | gauge   | `process` |
+| `windows_netframework_clrmemory_number_sink_blocksinuse` | Displays the current number of synchronization blocks in use. Synchronization blocks are per-object data structures allocated for storing synchronization information. They hold weak references to managed objects and must be scanned by the garbage collector. | gauge   | `process` |
+| `windows_netframework_clrmemory_committed_bytes`         | Displays the amount of virtual memory, in bytes, currently committed by the garbage collector. Committed memory is the physical memory for which space has been reserved in the disk paging file.                                                                 | gauge   | `process` |
+| `windows_netframework_clrmemory_reserved_bytes`          | Displays the amount of virtual memory, in bytes, currently reserved by the garbage collector. Reserved memory is the virtual memory space reserved for the application when no disk or main memory pages have been used.                                          | gauge   | `process` |
+| `windows_netframework_clrmemory_gc_time_percent`         | Displays the percentage of time that was spent performing a garbage collection in the last sample.                                                                                                                                                                | gauge   | `process` |
+
+### CLR Remoting
+
+| Name                                                            | Description                                                                                                         | Type    | Labels    |
+|-----------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrremoting_channels_total`               | Displays the total number of remoting channels registered across all application domains since application started. | counter | `process` |
+| `windows_netframework_clrremoting_context_bound_classes_loaded` | Displays the current number of context-bound classes that are loaded.                                               | gauge   | `process` |
+| `windows_netframework_clrremoting_context_bound_objects_total`  | Displays the total number of context-bound objects allocated.                                                       | counter | `process` |
+| `windows_netframework_clrremoting_context_proxies_total`        | Displays the total number of remoting proxy objects in this process since it started.                               | counter | `process` |
+| `windows_netframework_clrremoting_contexts`                     | Displays the current number of remoting contexts in the application.                                                | gauge   | `process` |
+| `windows_netframework_clrremoting_remote_calls_total`           | Displays the total number of remote procedure calls invoked since the application started.                          | counter | `process` |
+
+### CLR Security
+
+| Name                                                      | Description                                                                                               | Type    | Labels    |
+|-----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|---------|-----------|
+| `windows_netframework_clrsecurity_link_time_checks_total` | Displays the total number of link-time code access security checks since the application started.         | counter | `process` |
+| `windows_netframework_clrsecurity_rt_checks_time_percent` | Displays the percentage of time spent performing runtime code access security checks in the last sample.  | gauge   | `process` |
+| `windows_netframework_clrsecurity_stack_walk_depth`       | Displays the depth of the stack during that last runtime code access security check.                      | gauge   | `process` |
+| `windows_netframework_clrsecurity_runtime_checks_total`   | Displays the total number of runtime code access security checks performed since the application started. | counter | `process` |
+
+### Example metric
+_This collector does not yet have explained examples, we would appreciate your help adding them!_
+
+## Useful queries
+_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
+
+## Alerting examples
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrexceptions.md

@@ -1,31 +0,0 @@
-# netframework_clrexceptions collector
-
-The netframework_clrexceptions collector exposes metrics about CLR exceptions in the dotnet framework.
-
-|||
--|-
-Metric name prefix  | `netframework_clrexceptions`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRExceptions`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrexceptions_exceptions_thrown_total` | Displays the total number of exceptions thrown since the application started. This includes both .NET exceptions and unmanaged exceptions that are converted into .NET exceptions. | counter | `process`
-`windows_netframework_clrexceptions_exceptions_filters_total` | Displays the total number of .NET exception filters executed. An exception filter evaluates regardless of whether an exception is handled. | counter | `process`
-`windows_netframework_clrexceptions_exceptions_finallys_total` | Displays the total number of finally blocks executed. Only the finally blocks executed for an exception are counted; finally blocks on normal code paths are not counted by this counter. | counter | `process`
-`windows_netframework_clrexceptions_throw_to_catch_depth_total` | Displays the total number of stack frames traversed, from the frame that threw the exception to the frame that handled the exception. | counter | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrinterop.md

@@ -1,30 +0,0 @@
-# netframework_clrinterop collector
-
-The netframework_clrinterop collector exposes metrics about interop between the dotnet framework and outside components.
-
-|||
--|-
-Metric name prefix  | `netframework_clrinterop`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRInterop`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrinterop_com_callable_wrappers_total` | Displays the current number of COM callable wrappers (CCWs). A CCW is a proxy for a managed object being referenced from an unmanaged COM client. | counter | `process`
-`windows_netframework_clrinterop_interop_marshalling_total` | Displays the total number of times arguments and return values have been marshaled from managed to unmanaged code, and vice versa, since the application started. | counter | `process`
-`windows_netframework_clrinterop_interop_stubs_created_total` | Displays the current number of stubs created by the common language runtime. Stubs are responsible for marshaling arguments and return values from managed to unmanaged code, and vice versa, during a COM interop call or a platform invoke call. | counter | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrjit.md

@@ -1,31 +0,0 @@
-# netframework_clrjit collector
-
-The netframework_clrjit collector exposes metrics about the dotnet Just-in-Time compiler.
-
-|||
--|-
-Metric name prefix  | `netframework_clrjit`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRJit`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrjit_jit_methods_total` | Displays the total number of methods JIT-compiled since the application started. This counter does not include pre-JIT-compiled methods. | counter | `process`
-`windows_netframework_clrjit_jit_time_percent` | Displays the percentage of time spent in JIT compilation. This counter is updated at the end of every JIT compilation phase. A JIT compilation phase occurs when a method and its dependencies are compiled. | gauge | `process`
-`windows_netframework_clrjit_jit_standard_failures_total` | Displays the peak number of methods the JIT compiler has failed to compile since the application started. This failure can occur if the MSIL cannot be verified or if there is an internal error in the JIT compiler. | counter | `process`
-`windows_netframework_clrjit_jit_il_bytes_total` | Displays the total number of Microsoft intermediate language (MSIL) bytes compiled by the just-in-time (JIT) compiler since the application started | counter | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrloading.md

@@ -1,36 +0,0 @@
-# netframework_clrloading collector
-
-The netframework_clrloading collector exposes metrics about the dotnet loader.
-
-|||
--|-
-Metric name prefix  | `netframework_clrloading`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRLoading`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrloading_loader_heap_size_bytes` | Displays the current size, in bytes, of the memory committed by the class loader across all application domains. Committed memory is the physical space reserved in the disk paging file. | gauge | `process`
-`windows_netframework_clrloading_appdomains_loaded_current` | Displays the current number of application domains loaded in this application. | gauge | `process`
-`windows_netframework_clrloading_assemblies_loaded_current` | Displays the current number of assemblies loaded across all application domains in the currently running application. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once. | gauge | `process`
-`windows_netframework_clrloading_classes_loaded_current` | Displays the current number of classes loaded in all assemblies. | gauge | `process`
-`windows_netframework_clrloading_appdomains_loaded_total` | Displays the peak number of application domains loaded since the application started. | counter | `process`
-`windows_netframework_clrloading_appdomains_unloaded_total` | Displays the total number of application domains unloaded since the application started. If an application domain is loaded and unloaded multiple times, this counter increments each time the application domain is unloaded. | counter | `process`
-`windows_netframework_clrloading_assemblies_loaded_total` | Displays the total number of assemblies loaded since the application started. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once. | counter | `process`
-`windows_netframework_clrloading_classes_loaded_total` | Displays the cumulative number of classes loaded in all assemblies since the application started. | counter | `process`
-`windows_netframework_clrloading_class_load_failures_total` | Displays the peak number of classes that have failed to load since the application started. | counter | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrlocksandthreads.md

@@ -1,34 +0,0 @@
-# netframework_clrlocksandthreads collector
-
-The netframework_clrlocksandthreads collector exposes metrics about locks and threads in dotnet applications.
-
-|||
--|-
-Metric name prefix  | `netframework_clrlocksandthreads`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrlocksandthreads_current_queue_length` | Displays the total number of threads that are currently waiting to acquire a managed lock in the application. | gauge | `process`
-`windows_netframework_clrlocksandthreads_current_logical_threads` | Displays the number of current managed thread objects in the application. This counter maintains the count of both running and stopped threads.  | gauge | `process`
-`windows_netframework_clrlocksandthreads_physical_threads_current` | Displays the number of native operating system threads created and owned by the common language runtime to act as underlying threads for managed thread objects. This counter's value does not include the threads used by the runtime in its internal operations; it is a subset of the threads in the operating system process. | gauge | `process`
-`windows_netframework_clrlocksandthreads_recognized_threads_current` | Displays the number of threads that are currently recognized by the runtime. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once. | gauge | `process`
-`windows_netframework_clrlocksandthreads_recognized_threads_total` | Displays the total number of threads that have been recognized by the runtime since the application started. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once. | counter | `process`
-`windows_netframework_clrlocksandthreads_queue_length_total` | Displays the total number of threads that waited to acquire a managed lock since the application started. | counter | `process`
-`windows_netframework_clrlocksandthreads_contentions_total` | Displays the total number of times that threads in the runtime have attempted to acquire a managed lock unsuccessfully. | counter | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrmemory.md

@@ -1,39 +0,0 @@
-# netframework_clrmemory collector
-
-The netframework_clrmemory collector exposes metrics about memory in dotnet applications.
-
-|||
--|-
-Metric name prefix  | `netframework_clrmemory`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRMemory`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrmemory_allocated_bytes_total` | Displays the total number of bytes allocated on the garbage collection heap. | counter | `process`
-`windows_netframework_clrmemory_finalization_survivors` | Displays the number of garbage-collected objects that survive a collection because they are waiting to be finalized. | gauge | `process`
-`windows_netframework_clrmemory_heap_size_bytes` | Displays the maximum bytes that can be allocated; it does not indicate the current number of bytes allocated. | gauge | `process`
-`windows_netframework_clrmemory_promoted_bytes` | Displays the bytes that were promoted from the generation to the next one during the last GC. Memory is promoted when it survives a garbage collection. | gauge | `process`
-`windows_netframework_clrmemory_number_gc_handles` | Displays the current number of garbage collection handles in use. Garbage collection handles are handles to resources external to the common language runtime and the managed environment. | gauge | `process`
-`windows_netframework_clrmemory_collections_total` | Displays the number of times the generation objects are garbage collected since the application started. | counter | `process`
-`windows_netframework_clrmemory_induced_gc_total` | Displays the peak number of times garbage collection was performed because of an explicit call to GC.Collect. | counter | `process`
-`windows_netframework_clrmemory_number_pinned_objects` | Displays the number of pinned objects encountered in the last garbage collection. | gauge | `process`
-`windows_netframework_clrmemory_number_sink_blocksinuse` | Displays the current number of synchronization blocks in use. Synchronization blocks are per-object data structures allocated for storing synchronization information. They hold weak references to managed objects and must be scanned by the garbage collector. | gauge | `process`
-`windows_netframework_clrmemory_committed_bytes` | Displays the amount of virtual memory, in bytes, currently committed by the garbage collector. Committed memory is the physical memory for which space has been reserved in the disk paging file. | gauge | `process`
-`windows_netframework_clrmemory_reserved_bytes` | Displays the amount of virtual memory, in bytes, currently reserved by the garbage collector. Reserved memory is the virtual memory space reserved for the application when no disk or main memory pages have been used. | gauge | `process`
-`windows_netframework_clrmemory_gc_time_percent` | Displays the percentage of time that was spent performing a garbage collection in the last sample. | gauge | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrremoting.md

@@ -1,33 +0,0 @@
-# netframework_clrremoting collector
-
-The netframework_clrremoting collector exposes metrics about dotnet remoting.
-
-|||
--|-
-Metric name prefix  | `netframework_clrremoting`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRRemoting`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrremoting_channels_total` | Displays the total number of remoting channels registered across all application domains since application started. | counter | `process`
-`windows_netframework_clrremoting_context_bound_classes_loaded` | Displays the current number of context-bound classes that are loaded. | gauge | `process`
-`windows_netframework_clrremoting_context_bound_objects_total` | Displays the total number of context-bound objects allocated. | counter | `process`
-`windows_netframework_clrremoting_context_proxies_total` | Displays the total number of remoting proxy objects in this process since it started. | counter | `process`
-`windows_netframework_clrremoting_contexts` | Displays the current number of remoting contexts in the application. | gauge | `process`
-`windows_netframework_clrremoting_remote_calls_total` | Displays the total number of remote procedure calls invoked since the application started. | counter | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.netframework_clrsecurity.md

@@ -1,31 +0,0 @@
-# netframework_clrsecurity collector
-
-The netframework_clrsecurity collector exposes metrics about security checks in dotnet applications
-
-|||
--|-
-Metric name prefix  | `netframework_clrsecurity`
-Classes             | `Win32_PerfRawData_NETFramework_NETCLRSecurity`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_netframework_clrsecurity_link_time_checks_total` | Displays the total number of link-time code access security checks since the application started. | counter | `process`
-`windows_netframework_clrsecurity_rt_checks_time_percent` | Displays the percentage of time spent performing runtime code access security checks in the last sample. | gauge | `process`
-`windows_netframework_clrsecurity_stack_walk_depth` | Displays the depth of the stack during that last runtime code access security check. | gauge | `process`
-`windows_netframework_clrsecurity_runtime_checks_total` | Displays the total number of runtime code access security checks performed since the application started. | counter | `process`
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.os.md

@@ -14,58 +14,24 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_os_info` | Contains full product name & version in labels. Note that the `major_version` for Windows 11 is "10"; a build number greater than 22000 represents Windows 11. | gauge | `product`, `version`, `major_version`, `minor_version`, `build_number`
-`windows_os_paging_limit_bytes` | Total number of bytes that can be stored in the operating system paging files. 0 (zero) indicates that there are no paging files | gauge | None
-`windows_os_paging_free_bytes` | Number of bytes that can be mapped into the operating system paging files without causing any other pages to be swapped out | gauge | None
-`windows_os_physical_memory_free_bytes` | Bytes of physical memory currently unused and available | gauge | None
-`windows_os_time` | Current time as reported by the operating system, in [Unix time](https://en.wikipedia.org/wiki/Unix_time). See [time.Unix()](https://golang.org/pkg/time/#Unix) for details | gauge | None
-`windows_os_timezone` | Current timezone as reported by the operating system. See [time.Zone()](https://golang.org/pkg/time/#Time.Zone) for details | gauge | `timezone`
-`windows_os_processes` | Number of process contexts currently loaded or running on the operating system | gauge | None
-`windows_os_processes_limit` | Maximum number of process contexts the operating system can support. The default value set by the provider is 4294967295 (0xFFFFFFFF) | gauge | None
-`windows_os_process_memory_limit_bytes` | Maximum number of bytes of memory that can be allocated to a process | gauge | None
-`windows_os_users` | Number of user sessions for which the operating system is storing state information currently. For a list of current active logon sessions, see [`logon`](collector.logon.md) | gauge | None
-`windows_os_virtual_memory_bytes` | Bytes of virtual memory | gauge | None
-`windows_os_visible_memory_bytes` | Total bytes of physical memory available to the operating system. This value does not necessarily indicate the true amount of physical memory, but what is reported to the operating system as available to it | gauge | None
-`windows_os_virtual_memory_free_bytes` | Bytes of virtual memory currently unused and available | gauge | None
+| Name                  | Description                                                                                                                                                    | Type  | Labels                                                                 |
+|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|------------------------------------------------------------------------|
+| `windows_os_hostname` | Labelled system hostname information as provided by ComputerSystem.DNSHostName and ComputerSystem.Domain                                                       | gauge | `domain`, `fqdn`, `hostname`                                           |
+| `windows_os_info`     | Contains full product name & version in labels. Note that the `major_version` for Windows 11 is "10"; a build number greater than 22000 represents Windows 11. | gauge | `product`, `version`, `major_version`, `minor_version`, `build_number` |
 
 ### Example metric
-Show current number of processes
+
 ```
-windows_os_processes{instance="localhost"}
+# HELP windows_os_hostname Labelled system hostname information as provided by ComputerSystem.DNSHostName and ComputerSystem.Domain
+# TYPE windows_os_hostname gauge
+windows_os_hostname{domain="",fqdn="PC",hostname="PC"} 1
+# HELP windows_os_info Contains full product name & version in labels. Note that the "major_version" for Windows 11 is \\"10\\"; a build number greater than 22000 represents Windows 11.
+# TYPE windows_os_info gauge
+windows_os_info{build_number="19045",major_version="10",minor_version="0",product="Windows 10 Pro",revision="4842",version="10.0.19045"} 1
 ```
 
 ## Useful queries
-Find all devices not set to UTC timezone
-```
-windows_os_timezone{timezone != "UTC"}
-```
-
-Show memory usage for instance (%)
-```
-100 - 100 * windows_os_physical_memory_free_bytes{instance="localhost"} / windows_cs_physical_memory_bytes{instance="localhost"}
-```
+_This collector does not yet have useful queries, we would appreciate your help adding them!_
 
 ## Alerting examples
-**prometheus.rules**
-```yaml
-# Alert on hosts that have exhausted all available physical memory
-- alert: MemoryExhausted
-  expr: windows_os_physical_memory_free_bytes == 0
-  for: 10m
-  labels:
-    severity: high
-  annotations:
-    summary: "Host {{ $labels.instance }} is out of memory"
-    description: "{{ $labels.instance }} has exhausted all available physical memory"
-
-# Alert on hosts with greater than 90% memory usage
-- alert: MemoryLow
-  expr: 100 - 100 * windows_os_physical_memory_free_bytes / windows_cs_physical_memory_bytes > 90
-  for: 10m
-  labels:
-    severity: warning
-  annotations:
-    summary: "Memory usage for host {{ $labels.instance }} is greater than 90%"
-```
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.pagefile.md

@@ -0,0 +1,38 @@
+# pagefile collector
+
+The pagefile collector exposes metrics about the pagefile usage
+
+|||
+-|-
+Metric name prefix  | `pagefile`
+Classes             | [`Win32_OperatingSystem`](https://msdn.microsoft.com/en-us/library/aa394239)
+Enabled by default? | Yes
+
+## Flags
+
+None
+
+## Metrics
+
+| Name                           | Description                                                                                                                 | Type  | Labels |
+|--------------------------------|-----------------------------------------------------------------------------------------------------------------------------|-------|--------|
+| `windows_pagefile_free_bytes`  | Number of bytes that can be mapped into the operating system paging files without causing any other pages to be swapped out | gauge | `file` |
+| `windows_pagefile_limit_bytes` | Number of bytes that can be stored in the operating system paging files. 0 (zero) indicates that there are no paging files  | gauge | `file` |
+
+
+### Example metric
+
+```
+# HELP windows_pagefile_free_bytes OperatingSystem.FreeSpaceInPagingFiles
+# TYPE windows_pagefile_free_bytes gauge
+windows_pagefile_free_bytes{file="C:\\pagefile.sys"} 6.025797632e+09
+# HELP windows_pagefile_limit_bytes OperatingSystem.SizeStoredInPagingFiles
+# TYPE windows_pagefile_limit_bytes gauge
+windows_pagefile_limit_bytes{file="C:\\pagefile.sys"} 6.442450944e+09
+```
+
+## Useful queries
+_This collector does not yet have useful queries, we would appreciate your help adding them!_
+
+## Alerting examples
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.performancecounter.md

@@ -0,0 +1,233 @@
+# performancecounter collector
+
+The performancecounter collector exposes any configured metric.
+
+|                     |                         |
+|---------------------|-------------------------|
+| Metric name prefix  | `performancecounter`              |
+| Data source         | Performance Data Helper |
+| Enabled by default? | No                      |
+
+## Flags
+
+
+### `--collector.performancecounter.objects`
+
+Objects is a list of objects to collect metrics from. The value takes the form of a JSON array of strings.
+YAML is supported.
+
+The collector supports only English-named counter. Localized counter-names aren’t supported.
+
+> [!CAUTION]
+> If you are using a configuration file, the value must be kept as a string.
+>
+> Use a `|-` to keep the value as a string.
+
+#### Example
+
+```yaml
+collector:
+  performancecounter:
+    objects: |-
+      - name: memory
+        object: "Memory"
+        counters:
+          - name: "Cache Faults/sec"
+            type: "counter" # optional
+```
+
+#### Schema
+
+YAML:
+
+<details>
+<summary>Click to expand YAML schema</summary>
+
+```yaml
+- name: cpu # free text name
+  object: "Processor Information" # Performance counter object name
+  instances: ["*"]
+  instance_label: "core"
+  counters:
+    - name: "% Processor Time"
+      metric: windows_performancecounter_processor_information_processor_time # optional
+      labels:
+        state: active
+    - name: "% Idle Time"
+      metric: windows_performancecounter_processor_information_processor_time # optional
+      labels:
+        state: idle
+- name: memory
+  object: "Memory"
+  counters:
+    - name: "Cache Faults/sec"
+      type: "counter" # optional
+```
+
+</details>
+
+<details>
+<summary>Click to expand JSON schema</summary>
+
+```json
+[
+  {
+    "name": "cpu",
+    "object": "Processor Information",
+    "instances": [
+      "*"
+    ],
+    "instance_label": "core",
+    "counters": [
+      {
+        "name": "% Processor Time",
+        "metric": "windows_performancecounter_processor_information_processor_time",
+        "labels": {
+          "state": "active"
+        }
+      },
+      {
+        "name": "% Idle Time",
+        "metric": "windows_performancecounter_processor_information_processor_time",
+        "labels": {
+          "state": "idle"
+        }
+      }
+    ]
+  },
+  {
+    "name": "memory",
+    "object": "Memory",
+    "counters": [
+      {
+        "name": "Cache Faults/sec",
+        "type": "counter"
+      }
+    ]
+  }
+]
+```
+</details>
+
+#### name
+
+The name is used to identify the object in the logs and metrics.
+Must unique across all objects.
+
+#### object
+
+ObjectName is the Object to query for, like Processor, DirectoryServices, LogicalDisk or similar.
+
+The collector supports only english named counter. Localized counter-names are not supported.
+
+#### instances
+
+The instances key (this is an array) declares the instances of a counter you would like returned, it can be one or more values.
+
+Example: Instances = `["C:","D:","E:"]`
+
+This will return only for the instances C:, D: and E: where relevant. To get all instances of a Counter, use `["*"]` only.
+
+Some Objects like `Memory` do not have instances to select from at all. In this case, the `instances` key can be omitted.
+
+#### counters
+
+List of counters to collect from the object. See the counters sub-schema for more information.
+
+#### counters Sub-Schema
+
+##### name
+
+The name of the counter to collect.
+
+##### metric
+
+It indicates the name of the metric to be exposed. If not specified, the metric name will be generated based on the object name and the counter name.
+
+This key is optional.
+
+##### type
+
+It indicates the type of the counter. The value can be `counter` or `gauge`.
+If not specified, the windows_exporter will try to determine the type based on the counter type.
+
+This key is optional.
+
+##### labels
+
+Labels is a map of key-value pairs that will be added as labels to the metric.
+
+### Example
+
+```
+# HELP windows_performancecounter_memory_cache_faults_sec
+# TYPE windows_performancecounter_memory_cache_faults_sec counter
+windows_performancecounter_memory_cache_faults_sec 7.028097e+06
+# HELP windows_performancecounter_processor_information_processor_time
+# TYPE windows_performancecounter_processor_information_processor_time counter
+windows_performancecounter_processor_information_processor_time{core="0,0",state="active"} 8.3809375e+10
+windows_performancecounter_processor_information_processor_time{core="0,0",state="idle"} 8380.9375
+windows_performancecounter_processor_information_processor_time{core="0,1",state="active"} 8.2868125e+10
+windows_performancecounter_processor_information_processor_time{core="0,1",state="idle"} 8286.8125
+windows_performancecounter_processor_information_processor_time{core="0,10",state="active"} 9.720046875e+10
+windows_performancecounter_processor_information_processor_time{core="0,10",state="idle"} 9720.046875
+windows_performancecounter_processor_information_processor_time{core="0,11",state="active"} 9.994921875e+10
+windows_performancecounter_processor_information_processor_time{core="0,11",state="idle"} 9994.921875
+windows_performancecounter_processor_information_processor_time{core="0,12",state="active"} 1.014403125e+11
+windows_performancecounter_processor_information_processor_time{core="0,12",state="idle"} 10144.03125
+windows_performancecounter_processor_information_processor_time{core="0,13",state="active"} 1.0155453125e+11
+windows_performancecounter_processor_information_processor_time{core="0,13",state="idle"} 10155.453125
+windows_performancecounter_processor_information_processor_time{core="0,14",state="active"} 1.01290625e+11
+windows_performancecounter_processor_information_processor_time{core="0,14",state="idle"} 10129.0625
+windows_performancecounter_processor_information_processor_time{core="0,15",state="active"} 1.0134890625e+11
+windows_performancecounter_processor_information_processor_time{core="0,15",state="idle"} 10134.890625
+windows_performancecounter_processor_information_processor_time{core="0,16",state="active"} 1.01405625e+11
+windows_performancecounter_processor_information_processor_time{core="0,16",state="idle"} 10140.5625
+windows_performancecounter_processor_information_processor_time{core="0,17",state="active"} 1.0153421875e+11
+windows_performancecounter_processor_information_processor_time{core="0,17",state="idle"} 10153.421875
+windows_performancecounter_processor_information_processor_time{core="0,18",state="active"} 1.0086390625e+11
+windows_performancecounter_processor_information_processor_time{core="0,18",state="idle"} 10086.390625
+windows_performancecounter_processor_information_processor_time{core="0,19",state="active"} 1.0123453125e+11
+windows_performancecounter_processor_information_processor_time{core="0,19",state="idle"} 10123.453125
+windows_performancecounter_processor_information_processor_time{core="0,2",state="active"} 8.3548125e+10
+windows_performancecounter_processor_information_processor_time{core="0,2",state="idle"} 8354.8125
+windows_performancecounter_processor_information_processor_time{core="0,20",state="active"} 1.011703125e+11
+windows_performancecounter_processor_information_processor_time{core="0,20",state="idle"} 10117.03125
+windows_performancecounter_processor_information_processor_time{core="0,21",state="active"} 1.0140984375e+11
+windows_performancecounter_processor_information_processor_time{core="0,21",state="idle"} 10140.984375
+windows_performancecounter_processor_information_processor_time{core="0,22",state="active"} 1.014615625e+11
+windows_performancecounter_processor_information_processor_time{core="0,22",state="idle"} 10146.15625
+windows_performancecounter_processor_information_processor_time{core="0,23",state="active"} 1.0145125e+11
+windows_performancecounter_processor_information_processor_time{core="0,23",state="idle"} 10145.125
+windows_performancecounter_processor_information_processor_time{core="0,3",state="active"} 8.488953125e+10
+windows_performancecounter_processor_information_processor_time{core="0,3",state="idle"} 8488.953125
+windows_performancecounter_processor_information_processor_time{core="0,4",state="active"} 9.338234375e+10
+windows_performancecounter_processor_information_processor_time{core="0,4",state="idle"} 9338.234375
+windows_performancecounter_processor_information_processor_time{core="0,5",state="active"} 9.776453125e+10
+windows_performancecounter_processor_information_processor_time{core="0,5",state="idle"} 9776.453125
+windows_performancecounter_processor_information_processor_time{core="0,6",state="active"} 9.736265625e+10
+windows_performancecounter_processor_information_processor_time{core="0,6",state="idle"} 9736.265625
+windows_performancecounter_processor_information_processor_time{core="0,7",state="active"} 9.959375e+10
+windows_performancecounter_processor_information_processor_time{core="0,7",state="idle"} 9959.375
+windows_performancecounter_processor_information_processor_time{core="0,8",state="active"} 9.939421875e+10
+windows_performancecounter_processor_information_processor_time{core="0,8",state="idle"} 9939.421875
+windows_performancecounter_processor_information_processor_time{core="0,9",state="active"} 1.0059484375e+11
+windows_performancecounter_processor_information_processor_time{core="0,9",state="idle"} 10059.484375
+```
+> [!NOTE]
+> If you are using a configuration file, the value must be keep as string.
+
+Example:
+
+```yaml
+collector:
+  performancecounter:
+    objects: |
+```
+
+
+## Metrics
+
+The perfdata collector returns metrics based on the user configuration.
+The metrics are named based on the object name and the counter name.
+The instance name is added as a label to the metric.

docs/collector.process.md

@@ -35,13 +35,8 @@ metrics.
 
 Enables IIS process name queries. IIS process names are combined with their app pool name to form the `process` label.
 
-Disabled by default, and can be enabled with `--collector.process.iis=true`.
+Disabled by default, and can be enabled with `--collector.process.iis`. NOTE: Just plain parameter without `true`.
 
-### `--collector.process.report-owner`
-
-Enables reporting of the process owner. This is a potentially expensive operation.
-
-Disabled by default, and can be enabled with `--collector.process.report-owner`.
 
 ### Example
 To match all firefox processes: `--collector.process.include="firefox.*"`.
@@ -49,7 +44,7 @@ Note that multiple processes with the same name will be disambiguated by
 Windows by adding a number suffix, such as `firefox#2`. Your [regexp](https://en.wikipedia.org/wiki/Regular_expression) must take
 these suffixes into consideration.
 
-:warning: The regexp is case-sensitive, so `--collector.process.include="FIREFOX.*"` will **NOT** match a process named `firefox` . 
+:warning: The regexp is case-sensitive, so `--collector.process.include="FIREFOX.*"` will **NOT** match a process named `firefox` .
 
 To specify multiple names, use the pipe `|` character:
 ```
@@ -74,23 +69,24 @@ w3wp_Test
 
 ## Metrics
 
-| Name                                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels                                                          |
-|---------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------------------------------------------------------------|
-| `windows_process_start_time`                | Time of process start                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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.                                                                                                                                                                      | counter | `process`, `process_id`, `creating_process_id`, `owner`, `mode` |
-| `windows_process_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.                                                                                                                                                                                                                                                                                                                                                                                                                                                   | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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.                                                                                                                                                                                                                                                                     | counter | `process`, `process_id`, `creating_process_id`, `owner`, `mode` |
-| `windows_process_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.                                                                                                                                                                                                                                                                              | counter | `process`, `process_id`, `creating_process_id`, `owner`, `mode` |
-| `windows_process_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.                                                                                                                                                                                                                      | counter | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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.                                                                                                                                                                                                                                                                      | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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. | gauge   | `process`, `process_id`, `creating_process_id`, `owner`, `pool` |
-| `windows_process_priority_base`             | Current base priority of this process. Threads within a process can raise and lower their own base priority relative to the process base priority of the process.                                                                                                                                                                                                                                                                                                                                                                                                                   | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_private_bytes`             | Current number of bytes this process has allocated that cannot be shared with other processes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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.                                                                                                                                                                                                                                                                                                                                                             | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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.                                                                                                                                                                                                                                                                                 | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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.                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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. 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 will then be soft-faulted back into the Working Set before they leave main memory.                                                                              | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
-| `windows_process_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. 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.                                                                                 | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| Name                                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels                                                                                |
+|---------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|---------------------------------------------------------------------------------------|
+| `windows_process_info`                      | A metric with a constant '1' value labeled with process information                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | gauge   | `process`, `process_id`, `creating_process_id`, `process_group_id`,`owner`, `cmdline` |
+| `windows_process_start_time`                | Time of process start                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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.                                                                                                                                                                      | counter | `process`, `process_id`, `mode`                                                       |
+| `windows_process_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.                                                                                                                                                                                                                                                                                                                                                                                                                                                   | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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.                                                                                                                                                                                                                                                                     | counter | `process`, `process_id`, `mode`                                                       |
+| `windows_process_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.                                                                                                                                                                                                                                                                              | counter | `process`, `process_id`, `mode`                                                       |
+| `windows_process_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.                                                                                                                                                                                                                      | counter | `process`, `process_id`                                                               |
+| `windows_process_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.                                                                                                                                                                                                                                                                      | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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. | gauge   | `process`, `process_id`, `pool`                                                       |
+| `windows_process_priority_base`             | Current base priority of this process. Threads within a process can raise and lower their own base priority relative to the process base priority of the process.                                                                                                                                                                                                                                                                                                                                                                                                                   | gauge   | `process`, `process_id`                                                               |
+| `windows_process_private_bytes`             | Current number of bytes this process has allocated that cannot be shared with other processes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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.                                                                                                                                                                                                                                                                                                                                                             | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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.                                                                                                                                                                                                                                                                                 | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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.                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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. 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 will then be soft-faulted back into the Working Set before they leave main memory.                                                                              | gauge   | `process`, `process_id`                                                               |
+| `windows_process_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. 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.                                                                                 | gauge   | `process`, `process_id`                                                               |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.service.md

@@ -2,47 +2,24 @@
 
 The service collector exposes metrics about Windows Services
 
-The collector exists in 2 different version. Version 1 is using WMI to query all services and is able to provide additional
-information. Version 2 is a more efficient solution by directly connecting to the service manager, but is not able to
-provide additional information like `run_as` or start configuration
-
-## Flags
-
-### `--collector.service.services-where`
-
-A WMI filter on which services to include. Recommended to keep down number of returned metrics.
-
-Example: `--collector.service.services-where="Name='windows_exporter'"`
-
-Example config win_exporter.yml for multiple services: `services-where: Name='SQLServer' OR Name='Couchbase' OR Name='Spooler' OR Name='ActiveMQ'`
-
-### `--collector.service.use-api`
-
-Uses API calls instead of WMI for performance optimization. **Note** the previous flag (`--collector.service.services-where`) won't have any effect on this mode.
-
-### `--collector.service.v2`
-
-Version 2 of the service collector. Is using API calls for performance optimization. **Note** the previous flag (`--collector.service.services-where`) won't have any effect on this mode.
-For additional performance reasons, it doesn't provide any additional information like `run_as` or start configuration.
-
-# collector V1
-
 |||
 -|-
 Metric name prefix  | `service`
-Classes             | [`Win32_Service`](https://msdn.microsoft.com/en-us/library/aa394418(v=vs.85).aspx)
+Classes             | none
 Enabled by default? | Yes
 
+## Flags
+
+None
+
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_service_info` | Contains service information in labels, constant 1 | gauge | name, display_name, process_id, run_as
-`windows_service_state` | The state of the service, 1 if the current state, 0 otherwise | gauge | name, state
-`windows_service_start_mode` | The start mode of the service, 1 if the current start mode, 0 otherwise | gauge | name, start_mode
-`windows_service_status` | The status of the service, 1 if the current status, 0 otherwise | gauge | name, status
-
-For the values of the `state`, `start_mode`, `status` and `run_as` labels, see below.
+| Name                         | Description                                                                                   | Type  | Labels                                |
+|------------------------------|-----------------------------------------------------------------------------------------------|-------|---------------------------------------|
+| `windows_service_info`       | Contains service information run as user in labels, constant 1                                | gauge | name, display_name, path_name, run_as |
+| `windows_service_start_mode` | The start mode of the service, 1 if the current start mode, 0 otherwise                       | gauge | name, start_mode                      |
+| `windows_service_state`      | The state of the service, 1 if the current state, 0 otherwise                                 | gauge | name, state                           |
+| `windows_service_process`    | Process of started service. The value is the creation time of the process as a unix timestamp | gauge | name, process_id                      |
 
 ### States
 
@@ -65,81 +42,50 @@ A service can have the following start modes:
 - `manual`
 - `disabled`
 
-### Status (not available in API mode)
-
-A service can have any of the following statuses:
-- `ok`
-- `error`
-- `degraded`
-- `unknown`
-- `pred fail`
-- `starting`
-- `stopping`
-- `service`
-- `stressed`
-- `nonrecover`
-- `no contact`
-- `lost comm`
-
 Note that there is some overlap with service state.
 
 ### Run As
 
 Account name under which a service runs. Depending on the service type, the account name may be in the form of "DomainName\Username" or UPN format ("Username@DomainName").
 
-It corresponds to the `StartName` attribute of the `Win32_Service` class.
-`StartName` attribute can be NULL and in such case the label is reported as an empty string. Notice that if the attribute is NULL the service is logged on as the `LocalSystem` account or, for kernel or system-level drive, it runs with a default object name created by the I/O system based on the service name, for example, DWDOM\Admin.
-
-### Example metric
-Lists the services that have a 'disabled' start mode.
-```
-windows_service_start_mode{exported_name=~"(mssqlserver|sqlserveragent)",start_mode="disabled"}
-```
-
-## Useful queries
-Counts the number of Microsoft SQL Server/Agent Processes
-```
-count(windows_service_state{exported_name=~"(sqlserveragent|mssqlserver)",state="running"})
-```
-
-# collector V2
-
-
-|||
--|-
-Metric name prefix  | `service`
-Classes             | none
-Enabled by default? | No
-
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_service_state` | The state of the service, 1 if the current state, 0 otherwise | gauge | name, display_name, state
-
-### States
-
-A service can be in the following states:
-- `stopped`
-- `start pending`
-- `stop pending`
-- `running`
-- `continue pending`
-- `pause pending`
-- `paused`
-- `unknown`
-
 ### Example metric
 
 ```
-windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="continue pending"} 0
-windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="pause pending"} 0
-windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="paused"} 0
-windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="running"} 0
-windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="start pending"} 0
-windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="stop pending"} 0
-windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="stopped"} 1
+# HELP windows_service_info A metric with a constant '1' value labeled with service information
+# TYPE windows_service_info gauge
+windows_service_info{display_name="Declared Configuration(DC) service",name="dcsvc",path_name="C:\\WINDOWS\\system32\\svchost.exe -k netsvcs -p",run_as="LocalSystem"} 1
+windows_service_info{display_name="Designs",name="Themes",path_name="C:\\WINDOWS\\System32\\svchost.exe -k netsvcs -p",run_as="LocalSystem"} 1
+# HELP windows_service_process Process of started service. The value is the creation time of the process as a unix timestamp.
+# TYPE windows_service_process gauge
+windows_service_process{name="Themes",process_id="2856"} 1.7244891e+09
+# HELP windows_service_start_mode The start mode of the service (StartMode)
+# TYPE windows_service_start_mode gauge
+windows_service_start_mode{name="Themes",start_mode="auto"} 1
+windows_service_start_mode{name="Themes",start_mode="boot"} 0
+windows_service_start_mode{name="Themes",start_mode="disabled"} 0
+windows_service_start_mode{name="Themes",start_mode="manual"} 0
+windows_service_start_mode{name="Themes",start_mode="system"} 0
+windows_service_start_mode{name="dcsvc",start_mode="auto"} 0
+windows_service_start_mode{name="dcsvc",start_mode="boot"} 0
+windows_service_start_mode{name="dcsvc",start_mode="disabled"} 0
+windows_service_start_mode{name="dcsvc",start_mode="manual"} 1
+windows_service_start_mode{name="dcsvc",start_mode="system"} 0
+# HELP windows_service_state The state of the service (State)
+# TYPE windows_service_state gauge
+windows_service_state{name="Themes",state="continue pending"} 0
+windows_service_state{name="Themes",state="pause pending"} 0
+windows_service_state{name="Themes",state="paused"} 0
+windows_service_state{name="Themes",state="running"} 1
+windows_service_state{name="Themes",state="start pending"} 0
+windows_service_state{name="Themes",state="stop pending"} 0
+windows_service_state{name="Themes",state="stopped"} 0
+windows_service_state{name="dcsvc",state="continue pending"} 0
+windows_service_state{name="dcsvc",state="pause pending"} 0
+windows_service_state{name="dcsvc",state="paused"} 0
+windows_service_state{name="dcsvc",state="running"} 0
+windows_service_state{name="dcsvc",state="start pending"} 0
+windows_service_state{name="dcsvc",state="stop pending"} 0
+windows_service_state{name="dcsvc",state="stopped"} 1
 ```
 
 ## Useful queries
@@ -163,8 +109,8 @@ groups:
     labels:
       severity: high
     annotations:
-      summary: "Service {{ $labels.exported_name }} down"
-      description: "Service {{ $labels.exported_name }} on instance {{ $labels.instance }} has been down for more than 3 minutes."
+      summary: "Service {{ $labels.name }} down"
+      description: "Service {{ $labels.name }} on instance {{ $labels.instance }} has been down for more than 3 minutes."
 
   # Sends an alert when the 'mssqlserver' service is not in the running state for 3 minutes.
   - alert: SQL Server DOWN
@@ -173,7 +119,7 @@ groups:
     labels:
       severity: high
     annotations:
-      summary: "Service {{ $labels.exported_name }} down"
-      description: "Service {{ $labels.exported_name }} on instance {{ $labels.instance }} has been down for more than 3 minutes."
+      summary: "Service {{ $labels.name }} down"
+      description: "Service {{ $labels.name }} on instance {{ $labels.instance }} has been down for more than 3 minutes."
 ```
 In this example, `instance` is the target label of the host. So each alert will be processed per host, which is then used in the alert description.

docs/collector.system.md

@@ -5,8 +5,7 @@ The system collector exposes metrics about ...
 |||
 -|-
 Metric name prefix  | `system`
-Data source         | Perflib
-Classes             | [`Win32_PerfRawData_PerfOS_System`](https://web.archive.org/web/20050830140516/http://msdn.microsoft.com/library/en-us/wmisdk/wmi/win32_perfrawdata_perfos_system.asp)
+Data source         | Performance Counters
 Enabled by default? | Yes
 
 ## Flags
@@ -15,14 +14,18 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_system_context_switches_total` | Total number of [context switches](https://en.wikipedia.org/wiki/Context_switch) | counter | None
-`windows_system_exception_dispatches_total` | Total exceptions dispatched by the system | counter | None
-`windows_system_processor_queue_length` | Number of threads in the processor queue. There is a single queue for processor time even on computers with multiple processors. | gauge | None
-`windows_system_system_calls_total` | Total combined calls to Windows NT system service routines by all processes running on the computer | counter | None
-`windows_system_system_up_time` | Time of last boot of system | gauge | None
-`windows_system_threads` | Number of Windows system [threads](https://en.wikipedia.org/wiki/Thread_(computing)) | gauge | None
+| Name                                         | Description                                                                                                                                                                                                       | Type    | Labels |
+|----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_system_boot_time_timestamp_seconds` | Unix timestamp of last system boot                                                                                                                                                                                | gauge   | None   |
+| `windows_system_context_switches_total`      | Total number of [context switches](https://en.wikipedia.org/wiki/Context_switch)                                                                                                                                  | counter | None   |
+| `windows_system_exception_dispatches_total`  | Total exceptions dispatched by the system                                                                                                                                                                         | counter | None   |
+| `windows_system_processes`                   | Number of process contexts currently loaded or running on the operating system                                                                                                                                    | gauge   | None   |
+| `windows_system_process_limit`               | The size of the user-mode portion of the virtual address space of the calling process, in bytes. This value depends on the type of process, the type of processor, and the configuration of the operating system. | gauge   | None   |
+| `windows_system_processor_queue_length`      | Number of threads in the processor queue. There is a single queue for processor time even on computers with multiple processors.                                                                                  | gauge   | None   |
+| `windows_system_system_calls_total`          | Total combined calls to Windows NT system service routines by all processes running on the computer                                                                                                               | counter | None   |
+| `windows_system_threads`                     | Number of Windows system [threads](https://en.wikipedia.org/wiki/Thread_(computing))                                                                                                                              | gauge   | None   |
+
+
 
 ### Example metric
 Show current number of system threads
@@ -30,10 +33,15 @@ Show current number of system threads
 windows_system_threads{instance="localhost"}
 ```
 
+Show current number of processes
+```
+windows_system_processes{instance="localhost"}
+```
+
 ## Useful queries
 Find hosts that have rebooted in the last 24 hours
 ```
-time() - windows_system_system_up_time < 86400
+time() - windows_system_boot_time_timestamp_seconds < 86400
 ```
 
 ## Alerting examples

docs/collector.tcp.md

@@ -1,12 +1,11 @@
 # tcp collector
 
-The tcp collector exposes metrics about the TCP/IPv4 network stack.
+The tcp collector exposes metrics about the TCP network stack.
 
 |||
 -|-
 Metric name prefix  | `tcp`
 Data source         | Perflib
-Classes             | [`Win32_PerfRawData_Tcpip_TCPv4`](https://msdn.microsoft.com/en-us/library/aa394341(v=vs.85).aspx), Win32_PerfRawData_Tcpip_TCPv6
 Enabled by default? | No
 
 ## Flags
@@ -15,17 +14,18 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_tcp_connection_failures_total` | Number of times TCP connections have made a direct transition to the CLOSED state from the SYN-SENT state or the SYN-RCVD state, plus the number of times TCP connections have made a direct transition from the SYN-RCVD state to the LISTEN state | counter | af
-`windows_tcp_connections_active_total` |  Number of times TCP connections have made a direct transition from the CLOSED state to the SYN-SENT state.| counter | af
-`windows_tcp_connections_established` | Number of TCP connections for which the current state is either ESTABLISHED or CLOSE-WAIT. | gauge | af
-`windows_tcp_connections_passive_total` | Number of times TCP connections have made a direct transition from the LISTEN state to the SYN-RCVD state. | counter | af
-`windows_tcp_connections_reset_total` | Connections Reset is the number of times TCP connections have made a direct transition to the CLOSED state from either the ESTABLISHED state or the CLOSE-WAIT state. | counter | af
-`windows_tcp_segments_total` | Total segments sent or received using the TCP protocol | counter | af
-`windows_tcp_segments_received_total` | Total segments received, including those received in error. This count includes segments received on currently established connections | counter | af
-`windows_tcp_segments_retransmitted_total` | Total segments retransmitted. That is, segments transmitted that contain one or more previously transmitted bytes | counter | af
-`windows_tcp_segments_sent_total` | Total segments sent, including those on current connections, but excluding those containing *only* retransmitted bytes | counter | af
+| Name                                       | Description                                                                                                                                                                                                                                         | Type    | Labels |
+|--------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_tcp_connection_failures_total`    | Number of times TCP connections have made a direct transition to the CLOSED state from the SYN-SENT state or the SYN-RCVD state, plus the number of times TCP connections have made a direct transition from the SYN-RCVD state to the LISTEN state | counter | af     |
+| `windows_tcp_connections_active_total`     | Number of times TCP connections have made a direct transition from the CLOSED state to the SYN-SENT state.                                                                                                                                          | counter | af     |
+| `windows_tcp_connections_established`      | Number of TCP connections for which the current state is either ESTABLISHED or CLOSE-WAIT.                                                                                                                                                          | gauge   | af     |
+| `windows_tcp_connections_passive_total`    | Number of times TCP connections have made a direct transition from the LISTEN state to the SYN-RCVD state.                                                                                                                                          | counter | af     |
+| `windows_tcp_connections_reset_total`      | Connections Reset is the number of times TCP connections have made a direct transition to the CLOSED state from either the ESTABLISHED state or the CLOSE-WAIT state.                                                                               | counter | af     |
+| `windows_tcp_segments_total`               | Total segments sent or received using the TCP protocol                                                                                                                                                                                              | counter | af     |
+| `windows_tcp_segments_received_total`      | Total segments received, including those received in error. This count includes segments received on currently established connections                                                                                                              | counter | af     |
+| `windows_tcp_segments_retransmitted_total` | Total segments retransmitted. That is, segments transmitted that contain one or more previously transmitted bytes                                                                                                                                   | counter | af     |
+| `windows_tcp_segments_sent_total`          | Total segments sent, including those on current connections, but excluding those containing *only* retransmitted bytes                                                                                                                              | counter | af     |
+| `windows_tcp_connections_state_count`      | Number of TCP connections by state among: CLOSED, LISTENING, SYN_SENT, SYN_RECEIVED, ESTABLISHED, FIN_WAIT1, FIN_WAIT2, CLOSE_WAIT, CLOSING, LAST_ACK, TIME_WAIT, DELETE_TCB                                                                        | gauge   | af     |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.teradici_pcoip.md

@@ -1,64 +0,0 @@
-# teradici_pcoip collector
-
-The teradici_pcoip collector exposes metrics relating to Teradici PCoIP sessions
-
-|||
--|-
-Metric name prefix  | `teradici_pcoip`
-Classes             | `Win32_PerfRawData_TeradiciPerf_PCoIPSessionAudioStatistics`, `Win32_PerfRawData_TeradiciPerf_PCoIPSessionGeneralStatistics`,`Win32_PerfRawData_TeradiciPerf_PCoIPSessionImagingStatistics`,`Win32_PerfRawData_TeradiciPerf_PCoIPSessionNetworkStatistics`,`Win32_PerfRawData_TeradiciPerf_PCoIPSessionUsbStatistics`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_teradici_pcoip_audio_bytes_received_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_audio_bytes_sent_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_audio_rx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_audio_tx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_audio_tx_bw_limit_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_bytes_received_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_bytes_sent_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_packets_received_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_packets_sent_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_rx_packets_lost_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_session_duration_seconds_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_tx_packets_lost_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_imaging_active_min_quality` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_imaging_apex2800_offload` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_imaging_bytes_received_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_imaging_bytes_sent_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_imaging_decoder_capability_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_imaging_encoded_frames_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_imaging_megapixel_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_imaging_negative_acks_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_imaging_rx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_imaging_svga_devtap_frames_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_imaging_tx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_round_trip_latency_ms` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_rx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_rx_bw_peak_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_rx_packet_loss_percent` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_rx_packet_loss_percent_base` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_tx_bw_active_limit_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_tx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_tx_bw_limit_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_tx_packet_loss_percent` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_tx_packet_loss_percent_base` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_usb_bytes_received_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_usb_bytes_sent_total` | _Not yet documented_ | counter | None
-`windows_teradici_pcoip_usb_rx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-`windows_teradici_pcoip_usb_tx_bw_kbit_persec` | _Not yet documented_ | gauge | None
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.terminal_services.md

@@ -19,7 +19,6 @@ None
 | Name                                                             | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels          |
 |------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------------|
 | `windows_terminal_services_session_info`                         | Info about active WTS sessions                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | host,user,state |
-| `windows_terminal_services_local_session_count`                  | Number of local Terminal Services sessions.                                                                                                                                                                                                                                                                                                                                                                                                                                                         | gauge   | `session`       |
 | `windows_terminal_services_connection_broker_performance_total`* | The total number of connections handled by the Connection Brokers since the service started.                                                                                                                                                                                                                                                                                                                                                                                                        | counter | `connection`    |
 | `windows_terminal_services_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.                                                                                                                                                                                                                                                                                                                                                    | gauge   | `session_name`  |
 | `windows_terminal_services_page_fault_total`                     | Rate at which page faults occur in the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. The page may not be retrieved from disk if it is on the standby list and therefore already in main memory. The page also may not be retrieved if it is in use by another process which shares the page.                                                                                                  | counter | `session_name`  |

docs/collector.textfile.md

@@ -6,7 +6,7 @@ The textfile collector exposes metrics from files written by other processes.
 -|-
 Metric name prefix  | `textfile`
 Classes             | None
-Enabled by default? | Yes
+Enabled by default? | No
 
 ## Flags
 

docs/collector.time.md

@@ -5,26 +5,32 @@ If the Windows Time Service is stopped after collection has started, collector m
 
 Please note the Time Service perflib counters are only available on [Windows Server 2016 or newer](https://docs.microsoft.com/en-us/windows-server/networking/windows-time-service/windows-server-2016-improvements).
 
-|||
--|-
-Metric name prefix  | `time`
-Data source         | Perflib
-Enabled by default? | No
+|                     |        |
+|---------------------|--------|
+| Metric name prefix  | `time` |
+| Data source         | PDH    |
+| Enabled by default? | No     |
 
 ## Flags
 
-None
+### `--collectors.time.enabled`
+Comma-separated list of collectors to use, for example: `--collectors.time.enabled=ntp,system_time`.
+Matching is case-sensitive.
+
+
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_time_clock_frequency_Adjustment_ppb_total` | Total adjustment made to the local system clock frequency by W32Time in parts per billion (PPB) units. 1 PPB adjustment implies the system clock was adjusted at a rate of 1 nanosecond per second (1 ns/s). The smallest possible adjustment can vary and is expected to be in the order of 100's of PPB. | counter | None
-`windows_time_computed_time_offset_seconds` | Absolute time offset between the system clock and the chosen time source, in seconds. | counter | None
-`windows_time_ntp_client_time_sources` | Active number of NTP Time sources being used by the client. This is a count of active, distinct IP addresses of time servers that are responding to this client's requests. | gauge | None
-`windows_time_ntp_round_trip_delay_seconds` | Total roundtrip delay experienced by the NTP client in receiving a response from the server for the most recent request, in seconds. This is the time elapsed on the NTP client between transmitting a request to the NTP server and receiving a valid response from the server. | gauge | None
-`windows_time_ntp_server_outgoing_responses_total` | Total number of requests responded to by the NTP server. | counter | None
-`windows_time_ntp_server_incoming_requests_total` | Total number of requests received by the NTP server. | counter | None
+| Name                                                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type    | Labels     |
+|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|------------|
+| `windows_time_clock_frequency_adjustment_ppb_total` | Total adjustment made to the local system clock frequency by W32Time in parts per billion (PPB) units. 1 PPB adjustment implies the system clock was adjusted at a rate of 1 nanosecond per second (1 ns/s). The smallest possible adjustment can vary and is expected to be in the order of 100's of PPB.                                                                                                                                                                                                                                                                                                                                                                                                            | counter | None       |
+| `windows_time_computed_time_offset_seconds`         | The absolute time offset between the system clock and the chosen time source, as computed by the W32Time service in microseconds. When a new valid sample is available, the computed time is updated with the time offset indicated by the sample. This time is the actual time offset of the local clock. W32Time initiates clock correction by using this offset and updates the computed time in between samples with the remaining time offset that needs to be applied to the local clock. Clock accuracy can be tracked by using this performance counter with a low polling interval (for example, 256 seconds or less) and looking for the counter value to be smaller than the desired clock accuracy limit. | gauge   | None       |
+| `windows_time_ntp_client_time_sources`              | Active number of NTP Time sources being used by the client. This is a count of active, distinct IP addresses of time servers that are responding to this client's requests.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | gauge   | None       |
+| `windows_time_ntp_round_trip_delay_seconds`         | Total roundtrip delay experienced by the NTP client in receiving a response from the server for the most recent request, in seconds. This is the time elapsed on the NTP client between transmitting a request to the NTP server and receiving a valid response from the server.                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | None       |
+| `windows_time_ntp_server_outgoing_responses_total`  | Total number of requests responded to by the NTP server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | counter | None       |
+| `windows_time_ntp_server_incoming_requests_total`   | Total number of requests received by the NTP server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | counter | None       |
+| `windows_time_current_timestamp_seconds`            | Current time as reported by the operating system, in [Unix time](https://en.wikipedia.org/wiki/Unix_time). See [time.Unix()](https://golang.org/pkg/time/#Unix) for details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | gauge   | None       |
+| `windows_time_timezone`                             | Current timezone as reported by the operating system.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | gauge   | `timezone` |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.udp.md

@@ -0,0 +1,31 @@
+# udp collector
+
+The udp collector exposes metrics about the UDP network stack.
+
+|||
+-|-
+Metric name prefix  | `udp`
+Data source         | Perflib
+Enabled by default? | No
+
+## Flags
+
+None
+
+## Metrics
+
+| Name                                          | Description                                                                                                                            | Type    | Labels |
+|-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_udp_datagram_datagram_no_port_total` | Number of received UDP datagrams for which there was no application at the destination port                                            | counter | af     |
+| `windows_udp_datagram_received_errors_total`  | Number of received UDP datagrams that could not be delivered for reasons other than the lack of an application at the destination port | counter | af     |
+| `windows_udp_datagram_received_total`         | Number of UDP datagrams segments received                                                                                              | counter | af     |
+| `windows_udp_datagram_sent_total`             | Number of UDP datagrams segments sent                                                                                                  | counter | af     |
+
+### Example metric
+_This collector does not yet have explained examples, we would appreciate your help adding them!_
+
+## Useful queries
+_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
+
+## Alerting examples
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.update.md

@@ -0,0 +1,48 @@
+# update collector
+
+The update collector exposes the Windows Update service metrics. Note that the Windows Update service (`wuauserv`) must be running, else metric collection will fail.
+
+The Windows Update service is responsible for managing the installation of updates for the operating system and other Microsoft software. The service can be configured to automatically download and install updates, or to notify the user when updates are available.
+
+
+|                     |                        |
+|---------------------|------------------------|
+| Metric name prefix  | `update`               |
+| Data source         | Windows Update service |
+| Enabled by default? | No                     |
+
+## Flags
+
+### `--collector.updates.online`
+Whether to search for updates online. If set to `false`, the collector will only list updates that are already found by the Windows Update service.
+Set to `true` to search for updates online, which will take longer to complete.
+
+### `--collector.updates.scrape-interval`
+Define the interval of scraping Windows Update information
+
+## Metrics
+
+| Name                           | Description                                   | Type  | Labels                        |
+|--------------------------------|-----------------------------------------------|-------|-------------------------------|
+| `windows_updates_pending_info` | Expose information single pending update item | gauge | `category`,`severity`,`title` |
+| `windows_updates_scrape_query_duration_seconds` | Duration of the last scrape query to the Windows Update API | gauge |  |
+| `windows_updates_scrape_timestamp_seconds` | Timestamp of the last scrape | gauge |  |
+
+### Example metrics
+```
+# HELP windows_updates_pending Pending Windows Updates
+# TYPE windows_updates_pending gauge
+windows_updates_pending{category="Drivers",severity="",title="Intel Corporation - Bluetooth - 23.60.5.10"} 1
+# HELP windows_updates_scrape_query_duration_seconds Duration of the last scrape query to the Windows Update API
+# TYPE windows_updates_scrape_query_duration_seconds gauge
+windows_updates_scrape_query_duration_seconds 2.8161838
+# HELP windows_updates_scrape_timestamp_seconds Timestamp of the last scrape
+# TYPE windows_updates_scrape_timestamp_seconds gauge
+windows_updates_scrape_timestamp_seconds 1.727539734e+09
+```
+
+## Useful queries
+_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
+
+## Alerting examples
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.vmware.md

@@ -2,11 +2,11 @@
 
 The vmware collector exposes metrics about a VMware guest VM
 
-|||
--|-
-Metric name prefix  | `vmware`
-Classes             | `Win32_PerfRawData_vmGuestLib_VMem`, `Win32_PerfRawData_vmGuestLib_VCPU`
-Enabled by default? | No
+|                     |                      |
+|---------------------|----------------------|
+| Metric name prefix  | `vmware`             |
+| Source              | Performance counters |
+| Enabled by default? | No                   |
 
 ## Flags
 
@@ -14,27 +14,27 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_vmware_mem_active_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_ballooned_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_limit_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_mapped_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_overhead_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_reservation_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_shared_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_shared_saved_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_shares` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_swapped_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_target_size_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_mem_used_bytes` | _Not yet documented_ | gauge | None
-`windows_vmware_cpu_limit_mhz` | _Not yet documented_ | gauge | None
-`windows_vmware_cpu_reservation_mhz` | _Not yet documented_ | gauge | None
-`windows_vmware_cpu_shares` | _Not yet documented_ | gauge | None
-`windows_vmware_cpu_stolen_seconds_total` | _Not yet documented_ | counter | None
-`windows_vmware_cpu_time_seconds_total` | _Not yet documented_ | counter | None
-`windows_vmware_effective_vm_speed_mhz` | _Not yet documented_ | gauge | None
-`windows_vmware_host_processor_speed_mhz` | _Not yet documented_ | gauge | None
+| Name                                        | Description                                                                                                                                                                                                                                                                                                                                 | Type    | Labels |
+|---------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_vmware_mem_active_bytes`           | The estimated amount of memory the virtual machine is actively using.                                                                                                                                                                                                                                                                       | gauge   | None   |
+| `windows_vmware_mem_ballooned_bytes`        | The amount of memory that has been reclaimed from this virtual machine via the VMware Memory Balloon mechanism.                                                                                                                                                                                                                             | gauge   | None   |
+| `windows_vmware_mem_limit_bytes`            | The maximum amount of memory that is allowed to the virtual machine. Assigning a Memory Limit ensures that this virtual machine never consumes more than a certain amount of the allowed memory. By limiting the amount of memory consumed, a portion of this shared resource is allowed to other virtual machines.                         | gauge   | None   |
+| `windows_vmware_mem_mapped_bytes`           | The mapped memory size of this virtual machine. This is the current total amount of guest memory that is backed by physical memory. Note that this number may include pages of memory shared between multiple virtual machines and thus may be an overestimate of the amount of physical host memory consumed by this virtual machine.      | gauge   | None   |
+| `windows_vmware_mem_overhead_bytes`         | The amount of overhead memory associated with this virtual machine consumed on the host system.                                                                                                                                                                                                                                             | gauge   | None   |
+| `windows_vmware_mem_reservation_bytes`      | The minimum amount of memory that is guaranteed to the virtual machine. Assigning a Memory Reservation ensures that even as other virtual machines on the same host consume memory, there is still a certain minimum amount for this virtual machine.                                                                                       | gauge   | None   |
+| `windows_vmware_mem_shared_bytes`           | The amount of physical memory associated with this virtual machine that is copy-on-write (COW) shared on the host.                                                                                                                                                                                                                          | gauge   | None   |
+| `windows_vmware_mem_shared_saved_bytes`     | The estimated amount of physical memory on the host saved from copy-on-write (COW) shared guest physical memory.                                                                                                                                                                                                                            | gauge   | None   |
+| `windows_vmware_mem_shares`                 | The number of memory shares allocated to the virtual machine.                                                                                                                                                                                                                                                                               | gauge   | None   |
+| `windows_vmware_mem_swapped_bytes`          | The amount of memory associated with this virtual machine that has been swapped by ESX.                                                                                                                                                                                                                                                     | gauge   | None   |
+| `windows_vmware_mem_target_size_bytes`      | Memory Target Size                                                                                                                                                                                                                                                                                                                          | gauge   | None   |
+| `windows_vmware_mem_used_bytes`             | The estimated amount of physical host memory currently consumed for this virtual machine’s physical memory.                                                                                                                                                                                                                                 | gauge   | None   |
+| `windows_vmware_cpu_limit_mhz`              | The maximum processing power in MHz allowed to the virtual machine. Assigning a CPU Limit ensures that this virtual machine never consumes more than a certain amount of the available processor power. By limiting the amount of processing power consumed, a portion of the processing power becomes available to other virtual machines. | gauge   | None   |
+| `windows_vmware_cpu_reservation_mhz`        | The minimum processing power in MHz available to the virtual machine. Assigning a CPU Reservation ensures that even as other virtual machines on the same host consume shared processing power, there is still a certain minimum amount for this virtual machine.                                                                           | gauge   | None   |
+| `windows_vmware_cpu_shares`                 | The number of CPU shares allocated to the virtual machine.                                                                                                                                                                                                                                                                                  | gauge   | None   |
+| `windows_vmware_cpu_stolen_seconds_total`   | The time that the VM was runnable but not scheduled to run                                                                                                                                                                                                                                                                                  | counter | None   |
+| `windows_vmware_cpu_time_seconds_total`     | Current load of the VM’s virtual processor                                                                                                                                                                                                                                                                                                  | counter | None   |
+| `windows_vmware_cpu_effective_vm_speed_mhz` | The effective speed of the VM’s virtual CPU                                                                                                                                                                                                                                                                                                 | gauge   | None   |
+| `windows_vmware_host_processor_speed_mhz`   | Host Processor speed                                                                                                                                                                                                                                                                                                                        | gauge   | None   |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.vmware_blast.md

@@ -1,98 +0,0 @@
-# vmware_blast collector
-
-The vmware_blast collector exposes metrics relating to VMware Blast sessions
-
-|||
--|-
-Metric name prefix  | `vmware_blast`
-Classes             | `Win32_PerfRawData_Counters_VMwareBlastAudioCounters`,`Win32_PerfRawData_Counters_VMwareBlastCDRCounters`,`Win32_PerfRawData_Counters_VMwareBlastClipboardCounters`,`Win32_PerfRawData_Counters_VMwareBlastHTML5MMRCounters`,`Win32_PerfRawData_Counters_VMwareBlastImagingCounters`,`Win32_PerfRawData_Counters_VMwareBlastRTAVCounters`,`Win32_PerfRawData_Counters_VMwareBlastSerialPortandScannerCounters`,`Win32_PerfRawData_Counters_VMwareBlastSessionCounters`,`Win32_PerfRawData_Counters_VMwareBlastSkypeforBusinessControlCounters`,`Win32_PerfRawData_Counters_VMwareBlastThinPrintCounters`,`Win32_PerfRawData_Counters_VMwareBlastUSBCounters`,`Win32_PerfRawData_Counters_VMwareBlastWindowsMediaMMRCounters`
-Enabled by default? | No
-
-## Flags
-
-None
-
-## Metrics
-
-Some of these metrics may not be collected, depending on the installation options chosen when installing the Horizon agent
-
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_vmware_blast_audio_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_audio_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_audio_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_audio_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_cdr_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_cdr_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_cdr_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_cdr_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_clipboard_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_clipboard_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_clipboard_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_clipboard_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_html5_mmr_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_html5_mmr_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_html5_mmr_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_html5_mmr_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_dirty_frames_per_second` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_imaging_fbc_rate` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_imaging_frames_per_second` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_imaging_poll_rate` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_imaging_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_dirty_frames_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_fbc_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_frames_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_poll_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_imaging_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_rtav_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_rtav_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_rtav_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_rtav_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_serial_port_and_scanner_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_serial_port_and_scanner_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_serial_port_and_scanner_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_serial_port_and_scanner_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_automatic_reconnect_count_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_cumlative_received_bytes_over_tcp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_cumlative_received_bytes_over_udp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_cumlative_transmitted_bytes_over_tcp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_cumlative_transmitted_bytes_over_udp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_estimated_bandwidth_uplink` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_session_instantaneous_received_bytes_over_tcp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_instantaneous_received_bytes_over_udp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_instantaneous_transmitted_bytes_over_tcp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_instantaneous_transmitted_bytes_over_udp_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_jitter_uplink` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_session_packet_loss_uplink` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_session_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_rtt` | _Not yet documented_ | gauge | None
-`windows_vmware_blast_session_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_session_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_skype_for_business_control_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_skype_for_business_control_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_skype_for_business_control_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_skype_for_business_control_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_thinprint_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_thinprint_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_thinprint_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_thinprint_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_usb_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_usb_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_usb_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_usb_transmitted_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_windows_media_mmr_received_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_windows_media_mmr_received_packets_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_windows_media_mmr_transmitted_bytes_total` | _Not yet documented_ | counter | None
-`windows_vmware_blast_windows_media_mmr_transmitted_packets_total` | _Not yet documented_ | counter | None
-
-### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
-
-## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
-
-## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/example_config.yml

@@ -4,7 +4,7 @@ collectors:
   enabled: cpu,cs,logical_disk,net,os,service,system
 collector:
   service:
-    services-where: Name='windows_exporter'
+    include: "windows_exporter"
   scheduled_task:
     include: /Microsoft/.+
 log:

exporter.go

@@ -1,318 +0,0 @@
-//go:build windows
-
-//go:generate go run github.com/tc-hib/go-winres@v0.3.3 make --product-version=git-tag --file-version=git-tag --arch=amd64,arm64
-
-package main
-
-//goland:noinspection GoUnsortedImport
-//nolint:gofumpt
-import (
-	// Its important that we do these first so that we can register with the Windows service control ASAP to avoid timeouts.
-	"github.com/prometheus-community/windows_exporter/pkg/initiate"
-
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/pprof"
-	"os"
-	"os/signal"
-	"os/user"
-	"runtime"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/windows_exporter/pkg/collector"
-	"github.com/prometheus-community/windows_exporter/pkg/config"
-	winlog "github.com/prometheus-community/windows_exporter/pkg/log"
-	"github.com/prometheus-community/windows_exporter/pkg/log/flag"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/utils"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-	"github.com/prometheus/common/version"
-	"github.com/prometheus/exporter-toolkit/web"
-	webflag "github.com/prometheus/exporter-toolkit/web/kingpinflag"
-	"golang.org/x/sys/windows"
-)
-
-// Same struct prometheus uses for their /version endpoint.
-// Separate copy to avoid pulling all of prometheus as a dependency.
-type prometheusVersion struct {
-	Version   string `json:"version"`
-	Revision  string `json:"revision"`
-	Branch    string `json:"branch"`
-	BuildUser string `json:"buildUser"`
-	BuildDate string `json:"buildDate"`
-	GoVersion string `json:"goVersion"`
-}
-
-// Mapping of priority names to uin32 values required by windows.SetPriorityClass.
-var priorityStringToInt = map[string]uint32{
-	"realtime":    windows.REALTIME_PRIORITY_CLASS,
-	"high":        windows.HIGH_PRIORITY_CLASS,
-	"abovenormal": windows.ABOVE_NORMAL_PRIORITY_CLASS,
-	"normal":      windows.NORMAL_PRIORITY_CLASS,
-	"belownormal": windows.BELOW_NORMAL_PRIORITY_CLASS,
-	"low":         windows.IDLE_PRIORITY_CLASS,
-}
-
-func setPriorityWindows(pid int, priority uint32) error {
-	// https://learn.microsoft.com/en-us/windows/win32/procthread/process-security-and-access-rights
-	handle, err := windows.OpenProcess(
-		windows.STANDARD_RIGHTS_REQUIRED|windows.SYNCHRONIZE|windows.SPECIFIC_RIGHTS_ALL,
-		false, uint32(pid),
-	)
-	if err != nil {
-		return err
-	}
-
-	if err = windows.SetPriorityClass(handle, priority); err != nil {
-		return err
-	}
-
-	if err = windows.CloseHandle(handle); err != nil {
-		return fmt.Errorf("failed to close handle: %w", err)
-	}
-
-	return nil
-}
-
-func main() {
-	app := kingpin.New("windows_exporter", "A metrics collector for Windows.")
-	var (
-		configFile = app.Flag(
-			"config.file",
-			"YAML configuration file to use. Values set in this file will be overridden by CLI flags.",
-		).String()
-		insecure_skip_verify = app.Flag(
-			"config.file.insecure-skip-verify",
-			"Skip TLS verification in loading YAML configuration.",
-		).Default("false").Bool()
-		webConfig   = webflag.AddFlags(app, ":9182")
-		metricsPath = app.Flag(
-			"telemetry.path",
-			"URL path for surfacing collected metrics.",
-		).Default("/metrics").String()
-		disableExporterMetrics = app.Flag(
-			"web.disable-exporter-metrics",
-			"Exclude metrics about the exporter itself (promhttp_*, process_*, go_*).",
-		).Bool()
-		maxRequests = app.Flag(
-			"telemetry.max-requests",
-			"Maximum number of concurrent requests. 0 to disable.",
-		).Default("5").Int()
-		enabledCollectors = app.Flag(
-			"collectors.enabled",
-			"Comma-separated list of collectors to use. Use '[defaults]' as a placeholder for all the collectors enabled by default.").
-			Default(types.DefaultCollectors).String()
-		printCollectors = app.Flag(
-			"collectors.print",
-			"If true, print available collectors and exit.",
-		).Bool()
-		timeoutMargin = app.Flag(
-			"scrape.timeout-margin",
-			"Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads.",
-		).Default("0.5").Float64()
-		debugEnabled = app.Flag(
-			"debug.enabled",
-			"If true, windows_exporter will expose debug endpoints under /debug/pprof.",
-		).Default("false").Bool()
-		processPriority = app.Flag(
-			"process.priority",
-			"Priority of the exporter process. Higher priorities may improve exporter responsiveness during periods of system load. Can be one of [\"realtime\", \"high\", \"abovenormal\", \"normal\", \"belownormal\", \"low\"]",
-		).Default("normal").String()
-	)
-
-	winlogConfig := &winlog.Config{}
-	flag.AddFlags(app, winlogConfig)
-
-	app.Version(version.Print("windows_exporter"))
-	app.HelpFlag.Short('h')
-
-	// Initialize collectors before loading and parsing CLI arguments
-	collectors := collector.NewWithFlags(app)
-
-	// Load values from configuration file(s). Executable flags must first be parsed, in order
-	// to load the specified file(s).
-	kingpin.MustParse(app.Parse(os.Args[1:]))
-	logger, err := winlog.New(winlogConfig)
-	if err != nil {
-		_ = level.Error(logger).Log("err", err)
-		os.Exit(1)
-	}
-
-	_ = level.Debug(logger).Log("msg", "Logging has Started")
-
-	if *configFile != "" {
-		resolver, err := config.NewResolver(*configFile, logger, *insecure_skip_verify)
-		if err != nil {
-			_ = level.Error(logger).Log("msg", "could not load config file", "err", err)
-			os.Exit(1)
-		}
-		err = resolver.Bind(app, os.Args[1:])
-		if err != nil {
-			_ = level.Error(logger).Log("err", err)
-			os.Exit(1)
-		}
-
-		// NOTE: This is temporary fix for issue #1092, calling kingpin.Parse
-		// twice makes slices flags duplicate its value, this clean up
-		// the first parse before the second call.
-		*webConfig.WebListenAddresses = (*webConfig.WebListenAddresses)[1:]
-
-		// Parse flags once more to include those discovered in configuration file(s).
-		kingpin.MustParse(app.Parse(os.Args[1:]))
-
-		logger, err = winlog.New(winlogConfig)
-		if err != nil {
-			_ = level.Error(logger).Log("err", err)
-			os.Exit(1)
-		}
-	}
-
-	if *printCollectors {
-		collectorNames := collector.Available()
-		sort.Strings(collectorNames)
-
-		fmt.Printf("Available collectors:\n") //nolint:forbidigo
-		for _, n := range collectorNames {
-			fmt.Printf(" - %s\n", n) //nolint:forbidigo
-		}
-
-		return
-	}
-
-	// Only set process priority if a non-default and valid value has been set
-	if *processPriority != "normal" && priorityStringToInt[*processPriority] != 0 {
-		_ = level.Debug(logger).Log("msg", "setting process priority to "+*processPriority)
-		err = setPriorityWindows(os.Getpid(), priorityStringToInt[*processPriority])
-		if err != nil {
-			_ = level.Error(logger).Log("msg", "failed to set process priority", "err", err)
-			os.Exit(1)
-		}
-	}
-
-	if err = wmi.InitWbem(logger); err != nil {
-		_ = level.Error(logger).Log("err", err)
-		os.Exit(1)
-	}
-
-	enabledCollectorList := utils.ExpandEnabledCollectors(*enabledCollectors)
-	collectors.Enable(enabledCollectorList)
-	collectors.SetLogger(logger)
-
-	// Initialize collectors before loading
-	err = collectors.Build()
-	if err != nil {
-		_ = level.Error(logger).Log("msg", "Couldn't load collectors", "err", err)
-		os.Exit(1)
-	}
-	err = collectors.SetPerfCounterQuery()
-	if err != nil {
-		_ = level.Error(logger).Log("msg", "Couldn't set performance counter query", "err", err)
-		os.Exit(1)
-	}
-
-	if u, err := user.Current(); err != nil {
-		_ = level.Warn(logger).Log("msg", "Unable to determine which user is running this exporter. More info: https://github.com/golang/go/issues/37348")
-	} else {
-		_ = level.Info(logger).Log("msg", fmt.Sprintf("Running as %v", u.Username))
-
-		if strings.Contains(u.Username, "ContainerAdministrator") || strings.Contains(u.Username, "ContainerUser") {
-			_ = level.Warn(logger).Log("msg", "Running as a preconfigured Windows Container user. This may mean you do not have Windows HostProcess containers configured correctly and some functionality will not work as expected.")
-		}
-	}
-
-	_ = level.Info(logger).Log("msg", fmt.Sprintf("Enabled collectors: %v", strings.Join(enabledCollectorList, ", ")))
-
-	mux := http.NewServeMux()
-	mux.HandleFunc(*metricsPath, withConcurrencyLimit(*maxRequests, collectors.BuildServeHTTP(*disableExporterMetrics, *timeoutMargin)))
-	mux.HandleFunc("/health", func(w http.ResponseWriter, _ *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		_, err := fmt.Fprintln(w, `{"status":"ok"}`)
-		if err != nil {
-			_ = level.Debug(logger).Log("msg", "Failed to write to stream", "err", err)
-		}
-	})
-	mux.HandleFunc("/version", func(w http.ResponseWriter, _ *http.Request) {
-		// we can't use "version" directly as it is a package, and not an object that
-		// can be serialized.
-		err := json.NewEncoder(w).Encode(prometheusVersion{
-			Version:   version.Version,
-			Revision:  version.Revision,
-			Branch:    version.Branch,
-			BuildUser: version.BuildUser,
-			BuildDate: version.BuildDate,
-			GoVersion: version.GoVersion,
-		})
-		if err != nil {
-			http.Error(w, fmt.Sprintf("error encoding JSON: %s", err), http.StatusInternalServerError)
-		}
-	})
-
-	if *debugEnabled {
-		mux.HandleFunc("/debug/pprof/", pprof.Index)
-		mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
-		mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
-		mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
-		mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
-	}
-
-	_ = level.Info(logger).Log("msg", "Starting windows_exporter", "version", version.Info())
-	_ = level.Info(logger).Log("msg", "Build context", "build_context", version.BuildContext())
-	_ = level.Debug(logger).Log("msg", "Go MAXPROCS", "procs", runtime.GOMAXPROCS(0))
-
-	server := &http.Server{
-		ReadHeaderTimeout: 5 * time.Second,
-		IdleTimeout:       60 * time.Second,
-		ReadTimeout:       5 * time.Second,
-		WriteTimeout:      10 * time.Minute,
-		Handler:           mux,
-	}
-
-	go func() {
-		if err := web.ListenAndServe(server, webConfig, logger); err != nil {
-			_ = level.Error(logger).Log("msg", "cannot start windows_exporter", "err", err)
-			os.Exit(1)
-		}
-	}()
-
-	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
-	defer stop()
-
-	select {
-	case <-ctx.Done():
-		_ = level.Info(logger).Log("msg", "Shutting down windows_exporter via kill signal")
-	case <-initiate.StopCh:
-		_ = level.Info(logger).Log("msg", "Shutting down windows_exporter via service control")
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	_ = server.Shutdown(ctx)
-
-	_ = level.Info(logger).Log("msg", "windows_exporter has shut down")
-}
-
-func withConcurrencyLimit(n int, next http.HandlerFunc) http.HandlerFunc {
-	if n <= 0 {
-		return next
-	}
-
-	sem := make(chan struct{}, n)
-	return func(w http.ResponseWriter, r *http.Request) {
-		select {
-		case sem <- struct{}{}:
-			defer func() { <-sem }()
-		default:
-			w.WriteHeader(http.StatusServiceUnavailable)
-			_, _ = w.Write([]byte("Too many concurrent requests"))
-			return
-		}
-		next(w, r)
-	}
-}

go.mod

@@ -1,53 +1,55 @@
 module github.com/prometheus-community/windows_exporter
 
-go 1.22
+go 1.23
 
 require (
-	github.com/Microsoft/hcsshim v0.12.5
+	github.com/Microsoft/hcsshim v0.12.9
 	github.com/alecthomas/kingpin/v2 v2.4.0
+	github.com/bmatcuk/doublestar/v4 v4.7.1
 	github.com/dimchansky/utfbom v1.1.1
-	github.com/go-kit/log v0.2.1
 	github.com/go-ole/go-ole v1.3.0
-	github.com/prometheus/client_golang v1.19.1
+	github.com/google/uuid v1.6.0
+	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.55.0
-	github.com/prometheus/exporter-toolkit v0.11.0
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/stretchr/testify v1.9.0
-	github.com/yusufpapurcu/wmi v1.2.4
-	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
-	golang.org/x/sys v0.24.0
+	github.com/prometheus/common v0.61.0
+	github.com/prometheus/exporter-toolkit v0.13.2
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/sys v0.28.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
-require github.com/pkg/errors v0.9.1
-
 require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/containerd/cgroups/v3 v3.0.2 // indirect
-	github.com/containerd/errdefs v0.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/containerd/cgroups/v3 v3.0.4 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/containerd/typeurl/v2 v2.2.3 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/mdlayher/socket v0.5.1 // indirect
+	github.com/mdlayher/vsock v1.2.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
-	google.golang.org/grpc v1.62.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/oauth2 v0.24.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
+	google.golang.org/grpc v1.68.0 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -2,23 +2,29 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/Microsoft/hcsshim v0.12.5 h1:bpTInLlDy/nDRWFVcefDZZ1+U8tS+rz3MxjKgu9boo0=
-github.com/Microsoft/hcsshim v0.12.5/go.mod h1:tIUGego4G1EN5Hb6KC90aDYiUI2dqLSTTOCjVNpOgZ8=
+github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg=
+github.com/Microsoft/hcsshim v0.12.9/go.mod h1:fJ0gkFAna6ukt0bLdKB8djt4XIJhF/vEPuoIWYVvZ8Y=
 github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
 github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
+github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vSQ6PWWSL9lK8qwHozUj03+zLoEB8O0=
+github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
+github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0=
-github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE=
-github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
-github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
+github.com/containerd/cgroups/v3 v3.0.4 h1:2fs7l3P0Qxb1nKWuJNFiwhp2CqiKzho71DQkDrHJIo4=
+github.com/containerd/cgroups/v3 v3.0.4/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
+github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=
+github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -30,18 +36,15 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
-github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -63,12 +66,24 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
+github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
+github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=
+github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnENvE+SE=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
@@ -77,15 +92,15 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
-github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
-github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
-github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
-github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q=
+github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
+github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
+github.com/prometheus/exporter-toolkit v0.13.2 h1:Z02fYtbqTMy2i/f+xZ+UK5jy/bl1Ex3ndzh06T/Q9DQ=
+github.com/prometheus/exporter-toolkit v0.13.2/go.mod h1:tCqnfx21q6qN1KA4U3Bfb8uWzXfijIrJz3/kTIqMV7g=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -95,78 +110,91 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
-github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
-github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
-golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
+golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
-golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
+golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
-google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
+google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -176,12 +204,11 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

installer/build.ps1

@@ -28,7 +28,7 @@ Copy-Item -Force $PathToExecutable Work/windows_exporter.exe
 Write-Verbose "Creating windows_exporter-${Version}-${Arch}.msi"
 $wixArch = @{"amd64" = "x64"; "arm64" = "arm64"}[$Arch]
 
-Invoke-Expression "wix build -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\windows_exporter.wxs -d Version=$($MsiVersion) -ext WixToolset.Firewall.wixext -ext WixToolset.Util.wixext"
+Invoke-Expression "wix build -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\files.wxs .\main.wxs -d ProductName=windows_exporter -d Version=$($MsiVersion) -ext WixToolset.Firewall.wixext -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext"
 
 Write-Verbose "Done!"
 Pop-Location

installer/files.wxs

@@ -0,0 +1,53 @@
+<!--
+  ~ Copyright 2024 The Prometheus Authors
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<Wix xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"
+     xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <DirectoryRef Id="APPLICATIONFOLDER">
+            <Component Transitive="yes">
+                <File Id="windows_exporter.exe" Name="windows_exporter.exe" Source="Work\windows_exporter.exe" KeyPath="yes" Vital="yes" Checksum="yes"/>
+                <ServiceInstall
+                    Id="InstallExporterService"
+                    Name="windows_exporter"
+                    DisplayName="windows_exporter"
+                    Description="Exports Prometheus metrics about the system"
+                    ErrorControl="normal"
+                    Start="auto"
+                    Type="ownProcess"
+                    Vital="yes"
+                    Arguments="[ConfigFileFlag] [CollectorsFlag] [ListenFlag] [MetricsPathFlag] [TextfileDirsFlag] [ExtraFlags]">
+                    <util:ServiceConfig
+                        ResetPeriodInDays="1"
+                        FirstFailureActionType="restart"
+                        SecondFailureActionType="restart"
+                        ThirdFailureActionType="restart"
+                        RestartServiceDelayInSeconds="60"
+                    />
+                    <ServiceDependency Id="wmiApSrv" />
+                </ServiceInstall>
+                <ServiceControl Id="ServiceStateControl" Name="windows_exporter" Remove="uninstall" Start="install" Stop="both"/>
+            </Component>
+            <Component Id="CreateTextfileDirectory" Directory="textfile_inputs" Guid="d03ef58a-9cbf-4165-ad39-d143e9b27e14">
+                <CreateFolder />
+            </Component>
+        </DirectoryRef>
+
+        <ComponentGroup Id="CG_Files">
+            <ComponentRef Id="windows_exporter.exe" />
+            <ComponentRef Id="CreateTextfileDirectory" />
+        </ComponentGroup>
+    </Fragment>
+</Wix>

installer/main.wxs

@@ -0,0 +1,236 @@
+<?xml version="1.0"?>
+
+<?ifndef Version?>
+<?error Version must be defined?>
+<?endif?>
+<?if $(sys.BUILDARCH) = x64 or $(sys.BUILDARCH) = arm64 ?>
+<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+<?else ?>
+<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+<?endif?>
+
+<!--
+  ~ Copyright 2024 The Prometheus Authors
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<Wix xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"
+     xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
+     xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Package UpgradeCode="66a6eb5b-1fc2-4b14-a362-5ceec6413308" Name="$(var.ProductName)" Version="$(var.Version)"
+             Manufacturer="prometheus-community" Language="1033" Scope="perMachine">
+        <SummaryInformation Manufacturer="prometheus-community" Description="$(var.ProductName) $(var.Version) installer" />
+
+        <Upgrade Id="66a6eb5b-1fc2-4b14-a362-5ceec6413308">
+            <UpgradeVersion IncludeMinimum="no"
+                            Minimum="$(var.Version)"
+                            OnlyDetect="no"
+                            Property="NEWERVERSIONDETECTED" />
+            <UpgradeVersion IncludeMaximum="yes"
+                            IncludeMinimum="yes"
+                            Maximum="$(var.Version)"
+                            Minimum="0.0.0.0"
+                            Property="OLDERVERSIONBEINGUPGRADED" />
+        </Upgrade>
+
+        <CustomAction Id="set_maintenance" Property="MAINTENANCE" Value="true" />
+
+        <!-- Set to reinstall all features. -->
+        <CustomAction Id="set_reinstall_all_property"
+                      Property="REINSTALL"
+                      Value="ALL" />
+        <!-- "amus" will force reinstall all files.
+             See https://docs.microsoft.com/en-us/windows/desktop/Msi/reinstallmode -->
+        <CustomAction Id="set_reinstallmode_property"
+                      Property="REINSTALLMODE"
+                      Value="amus" />
+        <SetProperty
+            Id="CreateConfigFile"
+            Value="&quot;[%ComSpec]&quot; /c TYPE NUL >>&quot;[ConfigFile_NonDefault][ConfigFile_Default]&quot;"
+            Before="CreateConfigFile"
+            Sequence="execute"
+            Condition="ConfigFile_NonDefault OR ConfigFile_Default"
+        />
+        <CustomAction
+            Id="CreateConfigFile"
+            BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
+            DllEntry="WixQuietExec"
+            Execute="deferred"
+            Return="check"
+            Impersonate="no"
+        />
+
+        <InstallExecuteSequence>
+            <!-- Set REINSTALL=all and REINSTALLMODE=amus if the user reruns the
+                 MSI, which will force reinstalling all files and services.  -->
+            <Custom Action="set_maintenance" Before="set_reinstall_all_property"
+                    Condition="Installed AND (NOT REMOVE) AND (NOT UPGRADINGPRODUCTCODE)"/>
+            <Custom Action="set_reinstall_all_property" Before="set_reinstallmode_property" Condition="MAINTENANCE"/>
+            <Custom Action="set_reinstallmode_property" Before="LaunchConditions" Condition="MAINTENANCE"/>
+            <Custom Action="CreateConfigFile" Before="InstallServices" Condition="ConfigFile_NonDefault OR ConfigFile_Default" />
+        </InstallExecuteSequence>
+
+        <Media Id="1" Cabinet="windows_exporter.cab" EmbedCab="yes"  />
+        <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." AllowSameVersionUpgrades="yes" />
+
+        <Property Id="ENABLED_COLLECTORS" Secure="yes" />
+        <SetProperty Id="CollectorsFlag" After="InstallFiles" Sequence="execute" Value="--collectors.enabled [ENABLED_COLLECTORS]" Condition="ENABLED_COLLECTORS" />
+
+        <Property Id="EXTRA_FLAGS" Secure="yes" />
+        <SetProperty Id="ExtraFlags" After="InstallFiles" Sequence="execute" Value="[EXTRA_FLAGS]" Condition="EXTRA_FLAGS" />
+
+        <Property Id="CONFIG_FILE" Secure="yes" Value="config.yaml" />
+        <SetProperty Id="ConfigFile_NonDefault" After="InstallFiles" Sequence="execute" Value="[CONFIG_FILE]" Condition="CONFIG_FILE AND CONFIG_FILE&lt;&gt;&quot;config.yaml&quot;" />
+        <SetProperty Id="ConfigFile_Default" After="InstallFiles" Sequence="execute" Value="[APPLICATIONFOLDER]config.yaml" Condition="CONFIG_FILE=&quot;config.yaml&quot;" />
+        <SetProperty Id="ConfigFileFlag" After="InstallFiles" Sequence="execute" Value="--config.file=&quot;[ConfigFile_NonDefault][ConfigFile_Default]&quot;" Condition="ConfigFile_NonDefault OR ConfigFile_Default" />
+
+        <Property Id="LISTEN_PORT" Secure="yes" Value="9182" />
+        <SetProperty Id="ListenFlag" After="InstallFiles" Sequence="execute" Value="--web.listen-address [LISTEN_ADDR]:[LISTEN_PORT]" Condition="LISTEN_ADDR&lt;&gt;&quot;&quot; OR LISTEN_PORT&lt;&gt;9182" />
+
+        <Property Id="METRICS_PATH" Secure="yes" />
+        <SetProperty Id="MetricsPathFlag" After="InstallFiles" Sequence="execute" Value="--telemetry.path [METRICS_PATH]" Condition="METRICS_PATH" />
+
+        <Property Id="REMOTE_ADDR" Secure="yes" />
+        <SetProperty Id="RemoteAddressFlag" After="InstallFiles" Sequence="execute" Value="[REMOTE_ADDR]" Condition="REMOTE_ADDR" />
+
+        <Property Id="TEXTFILE_DIRS" Secure="yes" />
+        <SetProperty Id="TextfileDirsFlag" After="InstallFiles" Sequence="execute" Value="--collector.textfile.directories [TEXTFILE_DIRS]" Condition="TEXTFILE_DIRS" />
+
+        <Property Id="ARPHELPLINK" Value="https://github.com/prometheus-community/windows_exporter/issues" />
+        <Property Id="ARPSIZE" Value="9000" />
+        <Property Id="ARPURLINFOABOUT" Value="https://github.com/prometheus-community/windows_exporter" />
+        <!--<Property Id="ARPNOMODIFY" Value="0" />-->
+        <!--<Property Id="ARPNOREPAIR" Value="1" />-->
+        <Property Id="START_MENU_FOLDER" Value="0" />
+        <Property Id="NOSTART" Value="0" />
+
+        <Feature
+            Id="DefaultFeature"
+            Level="1"
+            Title="$(var.ProductName) $(var.Version)"
+            Description="The binary and configuration files for $(var.ProductName)"
+            Display="expand"
+            ConfigurableDirectory="APPLICATIONFOLDER"
+            AllowAdvertise="no"
+            InstallDefault="local"
+            AllowAbsent="no"
+        >
+            <ComponentGroupRef Id="CG_Files" />
+
+            <Feature
+                Id="FirewallException"
+                Level="2"
+                Title="Firewall Exception"
+                Description="Allow $(var.ProductName) to listen on a port"
+                Display="expand"
+                AllowAdvertise="no"
+                AllowAbsent="yes">
+                <ComponentGroupRef Id="CG_FirewallException" />
+            </Feature>
+        </Feature>
+
+        <UI Id="FeatureTree">
+            <ui:WixUI Id="WixUI_FeatureTree" />
+            <UIRef Id="WixUI_ErrorProgressText" />
+            <Dialog Id="CustomPropertiesDlg" Width="370" Height="270" Title="windows_exporter configuration">
+                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" />
+                <!--<Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="Text" />-->
+                <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="This pages contains configuration related to windows_exporter" />
+                <Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}windows_exporter configuration" />
+
+                <!-- Edit box for property input -->
+                <!-- cpu,cs,logical_disk,physical_disk,net,os,service,system -->
+                <Control Id="PropertyEdit_ENABLED_COLLECTORS_Title1" Type="Text" X="25" Y="55" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Text="Comma-separated list of collectors to use. Use '[\[]defaults[\]]' as a placeholder for all" />
+                <Control Id="PropertyEdit_ENABLED_COLLECTORS_Title2" Type="Text" X="25" Y="65" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Text="the collectors enabled by default. If value is empty, the exporter default will be used." />
+                <Control Id="PropertyEdit_ENABLED_COLLECTORS" Type="Edit" X="24" Y="77" Width="300" Height="18" Property="ENABLED_COLLECTORS" Text="[ENABLED_COLLECTORS]" Indirect="no" />
+
+                <Control Id="PropertyEdit_EXTRA_FLAGS_Title" Type="Text" X="25" Y="100" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Text="Additional command line flags" />
+                <Control Id="PropertyEdit_EXTRA_FLAGS" Type="Edit" X="24" Y="112" Width="300" Height="18" Property="EXTRA_FLAGS" Text="[EXTRA_FLAGS]" Indirect="no" />
+
+                <Control Id="PropertyEdit_LISTEN_PORT_Title" Type="Text" X="25" Y="135" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Text="Port to listen" />
+                <Control Id="PropertyEdit_LISTEN_PORT" Type="Edit" X="24" Y="147" Width="300" Height="18" Property="LISTEN_PORT" Text="[LISTEN_PORT]" Indirect="no" />
+
+                <Control Id="PropertyEdit_CONFIG_FILE_Title1" Type="Text" X="25" Y="170" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Text="Path to config file. If empty, no config will be used. If set to 'config.yaml', " />
+                <Control Id="PropertyEdit_CONFIG_FILE_Title2" Type="Text" X="25" Y="180" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Text="then the config.yaml at the install path will be used." />
+                <Control Id="PropertyEdit_CONFIG_FILE" Type="Edit" X="24" Y="192" Width="300" Height="18" Property="CONFIG_FILE" Text="[CONFIG_FILE]" Indirect="no" />
+
+                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+                    <Publish Event="NewDialog" Value="VerifyReadyDlg" />
+                </Control>
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
+                    <Publish Event="NewDialog" Value="CustomizeDlg" />
+                </Control>
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+                    <Publish Event="SpawnDialog" Value="CancelDlg" />
+                </Control>
+            </Dialog>
+
+            <!-- skip the license agreement dialog; higher Order takes priority (weird) -->
+
+            <Publish
+                Condition="NOT Installed"
+                Dialog="WelcomeDlg"
+                Control="Next"
+                Event="NewDialog"
+                Value="CustomizeDlg"
+                Order="10"/>
+            <Publish
+                Condition="NOT Installed"
+                Dialog="CustomizeDlg"
+                Control="Back"
+                Event="NewDialog"
+                Value="WelcomeDlg"
+                Order="10"/>
+            <Publish
+                Dialog="CustomizeDlg"
+                Control="Next"
+                Event="NewDialog"
+                Value="CustomPropertiesDlg"
+                Order="10"/>
+            <Publish
+                Dialog="VerifyReadyDlg"
+                Control="Back"
+                Event="NewDialog"
+                Value="CustomPropertiesDlg"
+                Order="10"/>
+
+
+            <!--CustomPropertyDlg-->
+        </UI>
+
+        <!-- InstallLocation key -->
+        <CustomAction Id="SetInstallLocation" Property="ARPINSTALLLOCATION" Value="[APPLICATIONFOLDER]" />
+
+        <StandardDirectory Id="ProgramFiles64Folder">
+            <Directory Id="APPLICATIONFOLDER" Name="windows_exporter">
+                <Directory Id="textfile_inputs" Name="textfile_inputs" />
+            </Directory>
+        </StandardDirectory>
+
+        <ComponentGroup Id="CG_FirewallException">
+            <Component Directory="APPLICATIONFOLDER" Id="C_FirewallException" Guid="9f522655-ac0e-42d2-a512-a7b19ebec7f7">
+                <fw:FirewallException
+                    Id="MetricsEndpoint"
+                    Name="$(var.ProductName)"
+                    Description="$(var.ProductName) HTTP endpoint"
+                    Program="[#windows_exporter.exe]"
+                    Port="[LISTEN_PORT]"
+                    Protocol="tcp">
+                    <fw:RemoteAddress Value="[REMOTE_ADDR]" />
+                </fw:FirewallException>
+            </Component>
+        </ComponentGroup>
+    </Package>
+</Wix>

installer/windows_exporter.wxs

@@ -1,110 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <?if $(sys.BUILDARCH)=x64 ?>
-    <?define PlatformProgramFiles = "ProgramFiles64Folder" ?>
-  <?else?>
-    <?define PlatformProgramFiles = "ProgramFilesFolder" ?>
-  <?endif?>
-
-  <Package UpgradeCode="66a6eb5b-1fc2-4b14-a362-5ceec6413308" Name="windows_exporter" Version="$(var.Version)" Manufacturer="prometheus-community" Language="1033" Codepage="1252">
-    <SummaryInformation Manufacturer="prometheus-community" Description="windows_exporter $(var.Version) installer" />
-
-    <Media Id="1" Cabinet="windows_exporter.cab" EmbedCab="yes" />
-    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
-
-    <Property Id="ENABLED_COLLECTORS" Secure="yes" />
-    <SetProperty Id="CollectorsFlag" After="InstallFiles" Sequence="execute" Value="--collectors.enabled [ENABLED_COLLECTORS]" Condition="ENABLED_COLLECTORS" />
-
-    <Property Id="EXTRA_FLAGS" Secure="yes" />
-    <SetProperty Id="ExtraFlags" After="InstallFiles" Sequence="execute" Value="[EXTRA_FLAGS]" Condition="EXTRA_FLAGS" />
-
-    <Property Id="ADD_FIREWALL_EXCEPTION" Secure="yes" />
-
-    <Property Id="ENABLE_V1_PERFORMANCE_COUNTERS" Secure="yes" />
-
-    <Property Id="LISTEN_PORT" Secure="yes" Value="9182" />
-    <SetProperty Id="ListenFlag" After="InstallFiles" Sequence="execute" Value="--web.listen-address [LISTEN_ADDR]:[LISTEN_PORT]" Condition="LISTEN_ADDR&lt;&gt;&quot;&quot; OR LISTEN_PORT&lt;&gt;9182" />
-
-    <Property Id="METRICS_PATH" Secure="yes" />
-    <SetProperty Id="MetricsPathFlag" After="InstallFiles" Sequence="execute" Value="--telemetry.path [METRICS_PATH]" Condition="METRICS_PATH" />
-
-    <Property Id="REMOTE_ADDR" Secure="yes" />
-    <SetProperty Id="RemoteAddressFlag" After="InstallFiles" Sequence="execute" Value="[REMOTE_ADDR]" Condition="REMOTE_ADDR" />
-
-    <!-- https://github.com/prometheus-community/windows_exporter/issues/1318 -->
-    <!-- https://wixtoolset.org/docs/tools/wixext/quietexec/ -->
-    <SetProperty
-            Id="WixQuietExecCmdLine"
-            Value="&quot;[%ComSpec]&quot; /c reg delete HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\windows_exporter /f"
-            Before="RemoveEventSource"
-            Sequence="execute"
-    />
-    <CustomAction
-            Id="RemoveEventSource"
-            BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
-            DllEntry="WixSilentExec"
-            Execute="deferred"
-            Impersonate="no"
-            Return="ignore"
-    />
-    <InstallExecuteSequence>
-      <Custom Action="RemoveEventSource" After="InstallInitialize" />
-    </InstallExecuteSequence>
-
-    <SetProperty
-            Id="EnableV1PerformanceCounters"
-            Value="&quot;[%ComSpec]&quot; /c lodctr.exe /E:Lsa &amp; lodctr.exe /E:PerfProc &amp; lodctr.exe /R"
-            Before="EnableV1PerformanceCounters"
-            Sequence="execute"
-    />
-    <CustomAction
-            Id="EnableV1PerformanceCounters"
-            BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
-            DllEntry="WixSilentExec"
-            Execute="deferred"
-            Impersonate="no"
-            Return="check"
-    />
-
-    <InstallExecuteSequence>
-      <Custom Action="EnableV1PerformanceCounters" Before="InstallFinalize" Condition="ENABLE_V1_PERFORMANCE_COUNTERS=&quot;yes&quot;"/>
-    </InstallExecuteSequence>
-
-    <Property Id="TEXTFILE_DIRS" Secure="yes" />
-    <SetProperty Id="TextfileDirsFlag" After="InstallFiles" Sequence="execute" Value="--collector.textfile.directories [TEXTFILE_DIRS]" Condition="TEXTFILE_DIRS" />
-
-    <ComponentGroup Id="Files">
-      <Component Directory="APPLICATIONROOTDIRECTORY">
-        <File Id="windows_exporter.exe" Name="windows_exporter.exe" Source="Work\windows_exporter.exe" KeyPath="yes" />
-        <ServiceInstall Id="InstallExporterService" Name="windows_exporter" DisplayName="windows_exporter" Description="Exports Prometheus metrics about the system" ErrorControl="normal" Start="auto" Type="ownProcess" Arguments="--log.file eventlog [CollectorsFlag] [ListenFlag] [MetricsPathFlag] [TextfileDirsFlag] [ExtraFlags]">
-          <util:ServiceConfig FirstFailureActionType="restart" SecondFailureActionType="restart" ThirdFailureActionType="restart" RestartServiceDelayInSeconds="60" />
-          <ServiceDependency Id="wmiApSrv" />
-        </ServiceInstall>
-        <ServiceControl Id="ServiceStateControl" Name="windows_exporter" Remove="uninstall" Start="install" Stop="both" />
-      </Component>
-      <Component Id="CreateTextfileDirectory" Directory="textfile_inputs" Guid="d03ef58a-9cbf-4165-ad39-d143e9b27e14">
-        <CreateFolder />
-      </Component>
-    </ComponentGroup>
-    <ComponentGroup Id="CG_FirewallException">
-      <Component Condition="ADD_FIREWALL_EXCEPTION=&quot;yes&quot;" Directory="APPLICATIONROOTDIRECTORY" Id="C_FirewallException" Guid="9f522655-ac0e-42d2-a512-a7b19ebec7f7">
-        <fw:FirewallException Id="MetricsEndpoint" Name="windows_exporter (HTTP [LISTEN_PORT])" Description="windows_exporter HTTP endpoint" Port="[LISTEN_PORT]" Protocol="tcp" IgnoreFailure="yes">
-          <fw:RemoteAddress Value="[REMOTE_ADDR]" />
-        </fw:FirewallException>
-      </Component>
-    </ComponentGroup>
-
-    <Feature Id="DefaultFeature" Level="1">
-      <ComponentGroupRef Id="Files" />
-    </Feature>
-
-    <Feature Id="FirewallException" Level="1">
-      <ComponentGroupRef Id="CG_FirewallException" />
-    </Feature>
-
-    <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="APPLICATIONROOTDIRECTORY" Name="windows_exporter">
-        <Directory Id="textfile_inputs" Name="textfile_inputs" />
-      </Directory>
-    </StandardDirectory>
-  </Package>
-</Wix>

internal/collector/ad/ad_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package ad_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/ad"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, ad.Name, ad.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, ad.New, nil)
+}

internal/collector/ad/types.go

@@ -0,0 +1,223 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package ad
+
+type perfDataCounterValues struct {
+	AbANRPerSec                                                      float64 `perfdata:"AB ANR/sec"`
+	AbBrowsesPerSec                                                  float64 `perfdata:"AB Browses/sec"`
+	AbClientSessions                                                 float64 `perfdata:"AB Client Sessions"`
+	AbMatchesPerSec                                                  float64 `perfdata:"AB Matches/sec"`
+	AbPropertyReadsPerSec                                            float64 `perfdata:"AB Property Reads/sec"`
+	AbProxyLookupsPerSec                                             float64 `perfdata:"AB Proxy Lookups/sec"`
+	AbSearchesPerSec                                                 float64 `perfdata:"AB Searches/sec"`
+	ApproximateHighestDNT                                            float64 `perfdata:"Approximate highest DNT"`
+	AtqEstimatedQueueDelay                                           float64 `perfdata:"ATQ Estimated Queue Delay"`
+	AtqOutstandingQueuedRequests                                     float64 `perfdata:"ATQ Outstanding Queued Requests"`
+	_                                                                float64 `perfdata:"ATQ Queue Latency"`
+	AtqRequestLatency                                                float64 `perfdata:"ATQ Request Latency"`
+	AtqThreadsLDAP                                                   float64 `perfdata:"ATQ Threads LDAP"`
+	AtqThreadsOther                                                  float64 `perfdata:"ATQ Threads Other"`
+	AtqThreadsTotal                                                  float64 `perfdata:"ATQ Threads Total"`
+	BaseSearchesPerSec                                               float64 `perfdata:"Base searches/sec"`
+	DatabaseAddsPerSec                                               float64 `perfdata:"Database adds/sec"`
+	DatabaseDeletesPerSec                                            float64 `perfdata:"Database deletes/sec"`
+	DatabaseModifiesPerSec                                           float64 `perfdata:"Database modifys/sec"`
+	DatabaseRecyclesPerSec                                           float64 `perfdata:"Database recycles/sec"`
+	DigestBindsPerSec                                                float64 `perfdata:"Digest Binds/sec"`
+	_                                                                float64 `perfdata:"DirSync session throttling rate"`
+	_                                                                float64 `perfdata:"DirSync sessions in progress"`
+	DRAHighestUSNCommittedHighPart                                   float64 `perfdata:"DRA Highest USN Committed (High part)"`
+	DRAHighestUSNCommittedLowPart                                    float64 `perfdata:"DRA Highest USN Committed (Low part)"`
+	DRAHighestUSNIssuedHighPart                                      float64 `perfdata:"DRA Highest USN Issued (High part)"`
+	DRAHighestUSNIssuedLowPart                                       float64 `perfdata:"DRA Highest USN Issued (Low part)"`
+	DRAInboundBytesCompressedBetweenSitesAfterCompressionSinceBoot   float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, After Compression) Since Boot"`
+	DRAInboundBytesCompressedBetweenSitesAfterCompressionPerSec      float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, After Compression)/sec"`
+	DRAInboundBytesCompressedBetweenSitesBeforeCompressionSinceBoot  float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, Before Compression) Since Boot"`
+	DRAInboundBytesCompressedBetweenSitesBeforeCompressionPerSec     float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, Before Compression)/sec"`
+	DRAInboundBytesNotCompressedWithinSiteSinceBoot                  float64 `perfdata:"DRA Inbound Bytes Not Compressed (Within Site) Since Boot"`
+	DRAInboundBytesNotCompressedWithinSitePerSec                     float64 `perfdata:"DRA Inbound Bytes Not Compressed (Within Site)/sec"`
+	DRAInboundBytesTotalSinceBoot                                    float64 `perfdata:"DRA Inbound Bytes Total Since Boot"`
+	DRAInboundBytesTotalPerSec                                       float64 `perfdata:"DRA Inbound Bytes Total/sec"`
+	DRAInboundFullSyncObjectsRemaining                               float64 `perfdata:"DRA Inbound Full Sync Objects Remaining"`
+	DRAInboundLinkValueUpdatesRemainingInPacket                      float64 `perfdata:"DRA Inbound Link Value Updates Remaining in Packet"`
+	_                                                                float64 `perfdata:"DRA Inbound Link Values/sec"`
+	DRAInboundObjectUpdatesRemainingInPacket                         float64 `perfdata:"DRA Inbound Object Updates Remaining in Packet"`
+	DRAInboundObjectsAppliedPerSec                                   float64 `perfdata:"DRA Inbound Objects Applied/sec"`
+	DRAInboundObjectsFilteredPerSec                                  float64 `perfdata:"DRA Inbound Objects Filtered/sec"`
+	DRAInboundObjectsPerSec                                          float64 `perfdata:"DRA Inbound Objects/sec"`
+	DRAInboundPropertiesAppliedPerSec                                float64 `perfdata:"DRA Inbound Properties Applied/sec"`
+	DRAInboundPropertiesFilteredPerSec                               float64 `perfdata:"DRA Inbound Properties Filtered/sec"`
+	DRAInboundPropertiesTotalPerSec                                  float64 `perfdata:"DRA Inbound Properties Total/sec"`
+	_                                                                float64 `perfdata:"DRA Inbound Sync Link Deletion/sec"`
+	DRAInboundTotalUpdatesRemainingInPacket                          float64 `perfdata:"DRA Inbound Total Updates Remaining in Packet"`
+	DRAInboundValuesDNsOnlyPerSec                                    float64 `perfdata:"DRA Inbound Values (DNs only)/sec"`
+	DRAInboundValuesTotalPerSec                                      float64 `perfdata:"DRA Inbound Values Total/sec"`
+	_                                                                float64 `perfdata:"DRA number of NC replication calls since boot"`
+	_                                                                float64 `perfdata:"DRA number of successful NC replication calls since boot"`
+	DRAOutboundBytesCompressedBetweenSitesAfterCompressionSinceBoot  float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, After Compression) Since Boot"`
+	DRAOutboundBytesCompressedBetweenSitesAfterCompressionPerSec     float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, After Compression)/sec"`
+	DRAOutboundBytesCompressedBetweenSitesBeforeCompressionSinceBoot float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, Before Compression) Since Boot"`
+	DRAOutboundBytesCompressedBetweenSitesBeforeCompressionPerSec    float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, Before Compression)/sec"`
+	DRAOutboundBytesNotCompressedWithinSiteSinceBoot                 float64 `perfdata:"DRA Outbound Bytes Not Compressed (Within Site) Since Boot"`
+	DRAOutboundBytesNotCompressedWithinSitePerSec                    float64 `perfdata:"DRA Outbound Bytes Not Compressed (Within Site)/sec"`
+	DRAOutboundBytesTotalSinceBoot                                   float64 `perfdata:"DRA Outbound Bytes Total Since Boot"`
+	DRAOutboundBytesTotalPerSec                                      float64 `perfdata:"DRA Outbound Bytes Total/sec"`
+	DRAOutboundObjectsFilteredPerSec                                 float64 `perfdata:"DRA Outbound Objects Filtered/sec"`
+	DRAOutboundObjectsPerSec                                         float64 `perfdata:"DRA Outbound Objects/sec"`
+	DRAOutboundPropertiesPerSec                                      float64 `perfdata:"DRA Outbound Properties/sec"`
+	DRAOutboundValuesDNsOnlyPerSec                                   float64 `perfdata:"DRA Outbound Values (DNs only)/sec"`
+	DRAOutboundValuesTotalPerSec                                     float64 `perfdata:"DRA Outbound Values Total/sec"`
+	DRAPendingReplicationOperations                                  float64 `perfdata:"DRA Pending Replication Operations"`
+	DRAPendingReplicationSynchronizations                            float64 `perfdata:"DRA Pending Replication Synchronizations"`
+	DRASyncFailuresOnSchemaMismatch                                  float64 `perfdata:"DRA Sync Failures on Schema Mismatch"`
+	DRASyncRequestsMade                                              float64 `perfdata:"DRA Sync Requests Made"`
+	DRASyncRequestsSuccessful                                        float64 `perfdata:"DRA Sync Requests Successful"`
+	DRAThreadsGettingNCChanges                                       float64 `perfdata:"DRA Threads Getting NC Changes"`
+	DRAThreadsGettingNCChangesHoldingSemaphore                       float64 `perfdata:"DRA Threads Getting NC Changes Holding Semaphore"`
+	_                                                                float64 `perfdata:"DRA total number of Busy failures since boot"`
+	_                                                                float64 `perfdata:"DRA total number of MissingParent failures since boot"`
+	_                                                                float64 `perfdata:"DRA total number of NotEnoughAttrs/MissingObject failures since boot"`
+	_                                                                float64 `perfdata:"DRA total number of Preempted failures since boot"`
+	_                                                                float64 `perfdata:"DRA total time of applying replication package since boot"`
+	_                                                                float64 `perfdata:"DRA total time of NC replication calls since boot"`
+	_                                                                float64 `perfdata:"DRA total time of successful NC replication calls since boot"`
+	_                                                                float64 `perfdata:"DRA total time of successfully applying replication package since boot"`
+	_                                                                float64 `perfdata:"DRA total time on waiting async replication packages since boot"`
+	_                                                                float64 `perfdata:"DRA total time on waiting sync replication packages since boot"`
+	DsPercentReadsFromDRA                                            float64 `perfdata:"DS % Reads from DRA"`
+	DsPercentReadsFromKCC                                            float64 `perfdata:"DS % Reads from KCC"`
+	DsPercentReadsFromLSA                                            float64 `perfdata:"DS % Reads from LSA"`
+	DsPercentReadsFromNSPI                                           float64 `perfdata:"DS % Reads from NSPI"`
+	DsPercentReadsFromNTDSAPI                                        float64 `perfdata:"DS % Reads from NTDSAPI"`
+	DsPercentReadsFromSAM                                            float64 `perfdata:"DS % Reads from SAM"`
+	DsPercentReadsOther                                              float64 `perfdata:"DS % Reads Other"`
+	DsPercentSearchesFromDRA                                         float64 `perfdata:"DS % Searches from DRA"`
+	DsPercentSearchesFromKCC                                         float64 `perfdata:"DS % Searches from KCC"`
+	DsPercentSearchesFromLDAP                                        float64 `perfdata:"DS % Searches from LDAP"`
+	DsPercentSearchesFromLSA                                         float64 `perfdata:"DS % Searches from LSA"`
+	DsPercentSearchesFromNSPI                                        float64 `perfdata:"DS % Searches from NSPI"`
+	DsPercentSearchesFromNTDSAPI                                     float64 `perfdata:"DS % Searches from NTDSAPI"`
+	DsPercentSearchesFromSAM                                         float64 `perfdata:"DS % Searches from SAM"`
+	DsPercentSearchesOther                                           float64 `perfdata:"DS % Searches Other"`
+	DsPercentWritesFromDRA                                           float64 `perfdata:"DS % Writes from DRA"`
+	DsPercentWritesFromKCC                                           float64 `perfdata:"DS % Writes from KCC"`
+	DsPercentWritesFromLDAP                                          float64 `perfdata:"DS % Writes from LDAP"`
+	DsPercentWritesFromLSA                                           float64 `perfdata:"DS % Writes from LSA"`
+	DsPercentWritesFromNSPI                                          float64 `perfdata:"DS % Writes from NSPI"`
+	DsPercentWritesFromNTDSAPI                                       float64 `perfdata:"DS % Writes from NTDSAPI"`
+	DsPercentWritesFromSAM                                           float64 `perfdata:"DS % Writes from SAM"`
+	DsPercentWritesOther                                             float64 `perfdata:"DS % Writes Other"`
+	DsClientBindsPerSec                                              float64 `perfdata:"DS Client Binds/sec"`
+	DsClientNameTranslationsPerSec                                   float64 `perfdata:"DS Client Name Translations/sec"`
+	DsDirectoryReadsPerSec                                           float64 `perfdata:"DS Directory Reads/sec"`
+	DsDirectorySearchesPerSec                                        float64 `perfdata:"DS Directory Searches/sec"`
+	DsDirectoryWritesPerSec                                          float64 `perfdata:"DS Directory Writes/sec"`
+	DsMonitorListSize                                                float64 `perfdata:"DS Monitor List Size"`
+	DsNameCacheHitRate                                               float64 `perfdata:"DS Name Cache hit rate"`
+	DsNameCacheHitRateSecondValue                                    float64 `perfdata:"DS Name Cache hit rate,secondvalue"`
+	DsNotifyQueueSize                                                float64 `perfdata:"DS Notify Queue Size"`
+	DsSearchSubOperationsPerSec                                      float64 `perfdata:"DS Search sub-operations/sec"`
+	DsSecurityDescriptorPropagationsEvents                           float64 `perfdata:"DS Security Descriptor Propagations Events"`
+	DsSecurityDescriptorPropagatorAverageExclusionTime               float64 `perfdata:"DS Security Descriptor Propagator Average Exclusion Time"`
+	DsSecurityDescriptorPropagatorRuntimeQueue                       float64 `perfdata:"DS Security Descriptor Propagator Runtime Queue"`
+	DsSecurityDescriptorSubOperationsPerSec                          float64 `perfdata:"DS Security Descriptor sub-operations/sec"`
+	DsServerBindsPerSec                                              float64 `perfdata:"DS Server Binds/sec"`
+	DsServerNameTranslationsPerSec                                   float64 `perfdata:"DS Server Name Translations/sec"`
+	DsThreadsInUse                                                   float64 `perfdata:"DS Threads in Use"`
+	_                                                                float64 `perfdata:"Error eventlogs since boot"`
+	_                                                                float64 `perfdata:"Error events since boot"`
+	ExternalBindsPerSec                                              float64 `perfdata:"External Binds/sec"`
+	FastBindsPerSec                                                  float64 `perfdata:"Fast Binds/sec"`
+	_                                                                float64 `perfdata:"Fatal events since boot"`
+	_                                                                float64 `perfdata:"Info eventlogs since boot"`
+	LdapActiveThreads                                                float64 `perfdata:"LDAP Active Threads"`
+	_                                                                float64 `perfdata:"LDAP Add Operations"`
+	_                                                                float64 `perfdata:"LDAP Add Operations/sec"`
+	_                                                                float64 `perfdata:"LDAP batch slots available"`
+	LdapBindTime                                                     float64 `perfdata:"LDAP Bind Time"`
+	_                                                                float64 `perfdata:"LDAP busy retries"`
+	_                                                                float64 `perfdata:"LDAP busy retries/sec"`
+	LdapClientSessions                                               float64 `perfdata:"LDAP Client Sessions"`
+	LdapClosedConnectionsPerSec                                      float64 `perfdata:"LDAP Closed Connections/sec"`
+	_                                                                float64 `perfdata:"LDAP Delete Operations"`
+	_                                                                float64 `perfdata:"LDAP Delete Operations/sec"`
+	_                                                                float64 `perfdata:"LDAP Modify DN Operations"`
+	_                                                                float64 `perfdata:"LDAP Modify DN Operations/sec"`
+	_                                                                float64 `perfdata:"LDAP Modify Operations"`
+	_                                                                float64 `perfdata:"LDAP Modify Operations/sec"`
+	LdapNewConnectionsPerSec                                         float64 `perfdata:"LDAP New Connections/sec"`
+	LdapNewSSLConnectionsPerSec                                      float64 `perfdata:"LDAP New SSL Connections/sec"`
+	_                                                                float64 `perfdata:"LDAP Outbound Bytes"`
+	_                                                                float64 `perfdata:"LDAP Outbound Bytes/sec"`
+	_                                                                float64 `perfdata:"LDAP Page Search Cache entries count"`
+	_                                                                float64 `perfdata:"LDAP Page Search Cache size"`
+	LdapSearchesPerSec                                               float64 `perfdata:"LDAP Searches/sec"`
+	LdapSuccessfulBindsPerSec                                        float64 `perfdata:"LDAP Successful Binds/sec"`
+	_                                                                float64 `perfdata:"LDAP Threads Sleeping on BUSY"`
+	LdapUDPOperationsPerSec                                          float64 `perfdata:"LDAP UDP operations/sec"`
+	LdapWritesPerSec                                                 float64 `perfdata:"LDAP Writes/sec"`
+	LinkValuesCleanedPerSec                                          float64 `perfdata:"Link Values Cleaned/sec"`
+	_                                                                float64 `perfdata:"Links added"`
+	_                                                                float64 `perfdata:"Links added/sec"`
+	_                                                                float64 `perfdata:"Links visited"`
+	_                                                                float64 `perfdata:"Links visited/sec"`
+	_                                                                float64 `perfdata:"Logical link deletes"`
+	_                                                                float64 `perfdata:"Logical link deletes/sec"`
+	NegotiatedBindsPerSec                                            float64 `perfdata:"Negotiated Binds/sec"`
+	NTLMBindsPerSec                                                  float64 `perfdata:"NTLM Binds/sec"`
+	_                                                                float64 `perfdata:"Objects returned"`
+	_                                                                float64 `perfdata:"Objects returned/sec"`
+	_                                                                float64 `perfdata:"Objects visited"`
+	_                                                                float64 `perfdata:"Objects visited/sec"`
+	OneLevelSearchesPerSec                                           float64 `perfdata:"Onelevel searches/sec"`
+	_                                                                float64 `perfdata:"PDC failed password update notifications"`
+	_                                                                float64 `perfdata:"PDC password update notifications/sec"`
+	_                                                                float64 `perfdata:"PDC successful password update notifications"`
+	PhantomsCleanedPerSec                                            float64 `perfdata:"Phantoms Cleaned/sec"`
+	PhantomsVisitedPerSec                                            float64 `perfdata:"Phantoms Visited/sec"`
+	_                                                                float64 `perfdata:"Physical link deletes"`
+	_                                                                float64 `perfdata:"Physical link deletes/sec"`
+	_                                                                float64 `perfdata:"Replicate Single Object operations"`
+	_                                                                float64 `perfdata:"Replicate Single Object operations/sec"`
+	_                                                                float64 `perfdata:"RID Pool invalidations since boot"`
+	_                                                                float64 `perfdata:"RID Pool request failures since boot"`
+	_                                                                float64 `perfdata:"RID Pool request successes since boot"`
+	SamAccountGroupEvaluationLatency                                 float64 `perfdata:"SAM Account Group Evaluation Latency"`
+	SamDisplayInformationQueriesPerSec                               float64 `perfdata:"SAM Display Information Queries/sec"`
+	SamDomainLocalGroupMembershipEvaluationsPerSec                   float64 `perfdata:"SAM Domain Local Group Membership Evaluations/sec"`
+	SamEnumerationsPerSec                                            float64 `perfdata:"SAM Enumerations/sec"`
+	SamGCEvaluationsPerSec                                           float64 `perfdata:"SAM GC Evaluations/sec"`
+	SamGlobalGroupMembershipEvaluationsPerSec                        float64 `perfdata:"SAM Global Group Membership Evaluations/sec"`
+	SamMachineCreationAttemptsPerSec                                 float64 `perfdata:"SAM Machine Creation Attempts/sec"`
+	SamMembershipChangesPerSec                                       float64 `perfdata:"SAM Membership Changes/sec"`
+	SamNonTransitiveMembershipEvaluationsPerSec                      float64 `perfdata:"SAM Non-Transitive Membership Evaluations/sec"`
+	SamPasswordChangesPerSec                                         float64 `perfdata:"SAM Password Changes/sec"`
+	SamResourceGroupEvaluationLatency                                float64 `perfdata:"SAM Resource Group Evaluation Latency"`
+	SamSuccessfulComputerCreationsPerSecIncludesAllRequests          float64 `perfdata:"SAM Successful Computer Creations/sec: Includes all requests"`
+	SamSuccessfulUserCreationsPerSec                                 float64 `perfdata:"SAM Successful User Creations/sec"`
+	SamTransitiveMembershipEvaluationsPerSec                         float64 `perfdata:"SAM Transitive Membership Evaluations/sec"`
+	SamUniversalGroupMembershipEvaluationsPerSec                     float64 `perfdata:"SAM Universal Group Membership Evaluations/sec"`
+	SamUserCreationAttemptsPerSec                                    float64 `perfdata:"SAM User Creation Attempts/sec"`
+	SimpleBindsPerSec                                                float64 `perfdata:"Simple Binds/sec"`
+	SubtreeSearchesPerSec                                            float64 `perfdata:"Subtree searches/sec"`
+	TombstonesGarbageCollectedPerSec                                 float64 `perfdata:"Tombstones Garbage Collected/sec"`
+	TombstonesVisitedPerSec                                          float64 `perfdata:"Tombstones Visited/sec"`
+	TransitiveOperationsMillisecondsRun                              float64 `perfdata:"Transitive operations milliseconds run"`
+	TransitiveOperationsPerSec                                       float64 `perfdata:"Transitive operations/sec"`
+	TransitiveSubOperationsPerSec                                    float64 `perfdata:"Transitive suboperations/sec"`
+	_                                                                float64 `perfdata:"Warning eventlogs since boot"`
+	_                                                                float64 `perfdata:"Warning events since boot"`
+}

internal/collector/adcs/adcs.go

@@ -1,17 +1,29 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package adcs
 
 import (
-	"errors"
-	"strings"
+	"fmt"
+	"log/slog"
 
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/windows_exporter/pkg/perflib"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/utils"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
+	"github.com/prometheus-community/windows_exporter/internal/types"
+	"github.com/prometheus-community/windows_exporter/internal/utils"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -19,11 +31,14 @@ const Name = "adcs"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 type Collector struct {
 	config Config
-	logger log.Logger
+
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	challengeResponseProcessingTime              *prometheus.Desc
 	challengeResponsesPerSecond                  *prometheus.Desc
@@ -40,7 +55,7 @@ type Collector struct {
 	signedCertificateTimestampListsPerSecond     *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -49,8 +64,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -62,19 +75,20 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	return []string{"Certification Authority"}, nil
-}
-
 func (c *Collector) Close() error {
+	c.perfDataCollector.Close()
+
 	return nil
 }
 
-func (c *Collector) Build() error {
+func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues]("Certification Authority", pdh.InstancesAll)
+	if err != nil {
+		return fmt.Errorf("failed to create Certification Authority collector: %w", err)
+	}
+
 	c.requestsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "requests_total"),
 		"Total certificate requests processed",
@@ -157,126 +171,90 @@ func (c *Collector) Build() error {
 	return nil
 }
 
-func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if err := c.collectADCSCounters(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting ADCS metrics", "err", 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 *Collector) collectADCSCounters(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	dst := make([]perflibADCS, 0)
-	if _, ok := ctx.PerfObjects["Certification Authority"]; !ok {
-		return errors.New("perflib did not contain an entry for Certification Authority")
-	}
-	err := perflib.UnmarshalObject(ctx.PerfObjects["Certification Authority"], &dst, c.logger)
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
-		return err
-	}
-	if len(dst) == 0 {
-		return errors.New("perflib query for Certification Authority (ADCS) returned empty result set")
+		return fmt.Errorf("failed to collect Certification Authority (ADCS) metrics: %w", err)
 	}
 
-	for _, d := range dst {
-		n := strings.ToLower(d.Name)
-		if n == "" {
-			continue
-		}
+	for _, data := range c.perfDataObject {
 		ch <- prometheus.MustNewConstMetric(
 			c.requestsPerSecond,
 			prometheus.CounterValue,
-			d.RequestsPerSecond,
-			d.Name,
+			data.RequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.requestProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(d.RequestProcessingTime),
-			d.Name,
+			utils.MilliSecToSec(data.RequestProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.retrievalsPerSecond,
 			prometheus.CounterValue,
-			d.RetrievalsPerSecond,
-			d.Name,
+			data.RetrievalsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.retrievalProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(d.RetrievalProcessingTime),
-			d.Name,
+			utils.MilliSecToSec(data.RetrievalProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.failedRequestsPerSecond,
 			prometheus.CounterValue,
-			d.FailedRequestsPerSecond,
-			d.Name,
+			data.FailedRequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.issuedRequestsPerSecond,
 			prometheus.CounterValue,
-			d.IssuedRequestsPerSecond,
-			d.Name,
+			data.IssuedRequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.pendingRequestsPerSecond,
 			prometheus.CounterValue,
-			d.PendingRequestsPerSecond,
-			d.Name,
+			data.PendingRequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.requestCryptographicSigningTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(d.RequestCryptographicSigningTime),
-			d.Name,
+			utils.MilliSecToSec(data.RequestCryptographicSigningTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.requestPolicyModuleProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(d.RequestPolicyModuleProcessingTime),
-			d.Name,
+			utils.MilliSecToSec(data.RequestPolicyModuleProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.challengeResponsesPerSecond,
 			prometheus.CounterValue,
-			d.ChallengeResponsesPerSecond,
-			d.Name,
+			data.ChallengeResponsesPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.challengeResponseProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(d.ChallengeResponseProcessingTime),
-			d.Name,
+			utils.MilliSecToSec(data.ChallengeResponseProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.signedCertificateTimestampListsPerSecond,
 			prometheus.CounterValue,
-			d.SignedCertificateTimestampListsPerSecond,
-			d.Name,
+			data.SignedCertificateTimestampListsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.signedCertificateTimestampListProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(d.SignedCertificateTimestampListProcessingTime),
-			d.Name,
+			utils.MilliSecToSec(data.SignedCertificateTimestampListProcessingTime),
+			data.Name,
 		)
 	}
 

internal/collector/adcs/adcs_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package adcs_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/adcs"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, adcs.Name, adcs.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, adcs.New, nil)
+}

internal/collector/adcs/types.go

@@ -0,0 +1,34 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package adcs
+
+type perfDataCounterValues struct {
+	Name string
+
+	ChallengeResponseProcessingTime              float64 `perfdata:"Challenge Response processing time (ms)"`
+	ChallengeResponsesPerSecond                  float64 `perfdata:"Challenge Responses/sec"`
+	FailedRequestsPerSecond                      float64 `perfdata:"Failed Requests/sec"`
+	IssuedRequestsPerSecond                      float64 `perfdata:"Issued Requests/sec"`
+	PendingRequestsPerSecond                     float64 `perfdata:"Pending Requests/sec"`
+	RequestCryptographicSigningTime              float64 `perfdata:"Request cryptographic signing time (ms)"`
+	RequestPolicyModuleProcessingTime            float64 `perfdata:"Request policy module processing time (ms)"`
+	RequestProcessingTime                        float64 `perfdata:"Request processing time (ms)"`
+	RequestsPerSecond                            float64 `perfdata:"Requests/sec"`
+	RetrievalProcessingTime                      float64 `perfdata:"Retrieval processing time (ms)"`
+	RetrievalsPerSecond                          float64 `perfdata:"Retrievals/sec"`
+	SignedCertificateTimestampListProcessingTime float64 `perfdata:"Signed Certificate Timestamp List processing time (ms)"`
+	SignedCertificateTimestampListsPerSecond     float64 `perfdata:"Signed Certificate Timestamp Lists/sec"`
+}

internal/collector/adfs/adfs.go

@@ -1,14 +1,29 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package adfs
 
 import (
+	"fmt"
+	"log/slog"
 	"math"
 
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/prometheus-community/windows_exporter/pkg/perflib"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
+	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -16,11 +31,14 @@ const Name = "adfs"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 type Collector struct {
 	config Config
-	logger log.Logger
+
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	adLoginConnectionFailures                          *prometheus.Desc
 	artifactDBFailures                                 *prometheus.Desc
@@ -63,11 +81,11 @@ type Collector struct {
 	upAuthenticationFailures                           *prometheus.Desc
 	upAuthentications                                  *prometheus.Desc
 	windowsIntegratedAuthentications                   *prometheus.Desc
-	wsfedTokenRequests                                 *prometheus.Desc
-	wstrustTokenRequests                               *prometheus.Desc
+	wsFedTokenRequests                                 *prometheus.Desc
+	wsTrustTokenRequests                               *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -76,8 +94,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -89,19 +105,20 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	return []string{"AD FS"}, nil
-}
-
 func (c *Collector) Close() error {
+	c.perfDataCollector.Close()
+
 	return nil
 }
 
-func (c *Collector) Build() error {
+func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues]("AD FS", nil)
+	if err != nil {
+		return fmt.Errorf("failed to create AD FS collector: %w", err)
+	}
+
 	c.adLoginConnectionFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "ad_login_connection_failures_total"),
 		"Total number of connection failures to an Active Directory domain controller",
@@ -294,13 +311,13 @@ func (c *Collector) Build() error {
 		nil,
 		nil,
 	)
-	c.wsfedTokenRequests = prometheus.NewDesc(
+	c.wsFedTokenRequests = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "wsfed_token_requests_success_total"),
 		"Total number of successful RP tokens issued over WS-Fed protocol",
 		nil,
 		nil,
 	)
-	c.wstrustTokenRequests = prometheus.NewDesc(
+	c.wsTrustTokenRequests = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "wstrust_token_requests_success_total"),
 		"Total number of successful RP tokens issued over WS-Trust protocol",
 		nil,
@@ -364,315 +381,269 @@ func (c *Collector) Build() error {
 	return nil
 }
 
-type perflibADFS struct {
-	AdLoginConnectionFailures            float64 `perflib:"AD Login Connection Failures"`
-	CertificateAuthentications           float64 `perflib:"Certificate Authentications"`
-	DeviceAuthentications                float64 `perflib:"Device Authentications"`
-	ExtranetAccountLockouts              float64 `perflib:"Extranet Account Lockouts"`
-	FederatedAuthentications             float64 `perflib:"Federated Authentications"`
-	PassportAuthentications              float64 `perflib:"Microsoft Passport Authentications"`
-	PassiveRequests                      float64 `perflib:"Passive Requests"`
-	PasswordChangeFailed                 float64 `perflib:"Password Change Failed Requests"`
-	PasswordChangeSucceeded              float64 `perflib:"Password Change Successful Requests"`
-	TokenRequests                        float64 `perflib:"Token Requests"`
-	WindowsIntegratedAuthentications     float64 `perflib:"Windows Integrated Authentications"`
-	OAuthAuthZRequests                   float64 `perflib:"OAuth AuthZ Requests"`
-	OAuthClientAuthentications           float64 `perflib:"OAuth Client Authentications"`
-	OAuthClientAuthenticationFailures    float64 `perflib:"OAuth Client Authentications Failures"`
-	OAuthClientCredentialRequestFailures float64 `perflib:"OAuth Client Credentials Request Failures"`
-	OAuthClientCredentialRequests        float64 `perflib:"OAuth Client Credentials Requests"`
-	OAuthClientPrivKeyJWTAuthnFailures   float64 `perflib:"OAuth Client Private Key Jwt Authentication Failures"`
-	OAuthClientPrivKeyJWTAuthentications float64 `perflib:"OAuth Client Private Key Jwt Authentications"`
-	OAuthClientBasicAuthnFailures        float64 `perflib:"OAuth Client Secret Basic Authentication Failures"`
-	OAuthClientBasicAuthentications      float64 `perflib:"OAuth Client Secret Basic Authentication Requests"`
-	OAuthClientSecretPostAuthnFailures   float64 `perflib:"OAuth Client Secret Post Authentication Failures"`
-	OAuthClientSecretPostAuthentications float64 `perflib:"OAuth Client Secret Post Authentications"`
-	OAuthClientWindowsAuthnFailures      float64 `perflib:"OAuth Client Windows Integrated Authentication Failures"`
-	OAuthClientWindowsAuthentications    float64 `perflib:"OAuth Client Windows Integrated Authentications"`
-	OAuthLogonCertRequestFailures        float64 `perflib:"OAuth Logon Certificate Request Failures"`
-	OAuthLogonCertTokenRequests          float64 `perflib:"OAuth Logon Certificate Token Requests"`
-	OAuthPasswordGrantRequestFailures    float64 `perflib:"OAuth Password Grant Request Failures"`
-	OAuthPasswordGrantRequests           float64 `perflib:"OAuth Password Grant Requests"`
-	OAuthTokenRequests                   float64 `perflib:"OAuth Token Requests"`
-	SAMLPTokenRequests                   float64 `perflib:"SAML-P Token Requests"`
-	SSOAuthenticationFailures            float64 `perflib:"SSO Authentication Failures"`
-	SSOAuthentications                   float64 `perflib:"SSO Authentications"`
-	WSFedTokenRequests                   float64 `perflib:"WS-Fed Token Requests"`
-	WSTrustTokenRequests                 float64 `perflib:"WS-Trust Token Requests"`
-	UsernamePasswordAuthnFailures        float64 `perflib:"U/P Authentication Failures"`
-	UsernamePasswordAuthentications      float64 `perflib:"U/P Authentications"`
-	ExternalAuthentications              float64 `perflib:"External Authentications"`
-	ExternalAuthNFailures                float64 `perflib:"External Authentication Failures"`
-	ArtifactDBFailures                   float64 `perflib:"Artifact Database Connection Failures"`
-	AvgArtifactDBQueryTime               float64 `perflib:"Average Artifact Database Query Time"`
-	ConfigDBFailures                     float64 `perflib:"Configuration Database Connection Failures"`
-	AvgConfigDBQueryTime                 float64 `perflib:"Average Config Database Query Time"`
-	FederationMetadataRequests           float64 `perflib:"Federation Metadata Requests"`
-}
-
-func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var adfsData []perflibADFS
-	err := perflib.UnmarshalObject(ctx.PerfObjects["AD FS"], &adfsData, c.logger)
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to collect ADFS metrics: %w", err)
 	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.adLoginConnectionFailures,
 		prometheus.CounterValue,
-		adfsData[0].AdLoginConnectionFailures,
+		c.perfDataObject[0].AdLoginConnectionFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.certificateAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].CertificateAuthentications,
+		c.perfDataObject[0].CertificateAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.deviceAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].DeviceAuthentications,
+		c.perfDataObject[0].DeviceAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.extranetAccountLockouts,
 		prometheus.CounterValue,
-		adfsData[0].ExtranetAccountLockouts,
+		c.perfDataObject[0].ExtranetAccountLockouts,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.federatedAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].FederatedAuthentications,
+		c.perfDataObject[0].FederatedAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passportAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].PassportAuthentications,
+		c.perfDataObject[0].PassportAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passiveRequests,
 		prometheus.CounterValue,
-		adfsData[0].PassiveRequests,
+		c.perfDataObject[0].PassiveRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passwordChangeFailed,
 		prometheus.CounterValue,
-		adfsData[0].PasswordChangeFailed,
+		c.perfDataObject[0].PasswordChangeFailed,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passwordChangeSucceeded,
 		prometheus.CounterValue,
-		adfsData[0].PasswordChangeSucceeded,
+		c.perfDataObject[0].PasswordChangeSucceeded,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.tokenRequests,
 		prometheus.CounterValue,
-		adfsData[0].TokenRequests,
+		c.perfDataObject[0].TokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.windowsIntegratedAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].WindowsIntegratedAuthentications,
+		c.perfDataObject[0].WindowsIntegratedAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthAuthZRequests,
 		prometheus.CounterValue,
-		adfsData[0].OAuthAuthZRequests,
+		c.perfDataObject[0].OAuthAuthZRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientAuthentications,
+		c.perfDataObject[0].OAuthClientAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientAuthenticationsFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientAuthenticationFailures,
+		c.perfDataObject[0].OAuthClientAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientCredentialsRequestFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientCredentialRequestFailures,
+		c.perfDataObject[0].OAuthClientCredentialRequestFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientCredentialsRequests,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientCredentialRequests,
+		c.perfDataObject[0].OAuthClientCredentialRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientPrivateKeyJwtAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientPrivKeyJWTAuthnFailures,
+		c.perfDataObject[0].OAuthClientPrivateKeyJWTAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientPrivateKeyJwtAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientPrivKeyJWTAuthentications,
+		c.perfDataObject[0].OAuthClientPrivateKeyJWTAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretBasicAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientBasicAuthnFailures,
+		c.perfDataObject[0].OAuthClientBasicAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretBasicAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientBasicAuthentications,
+		c.perfDataObject[0].OAuthClientBasicAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretPostAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientSecretPostAuthnFailures,
+		c.perfDataObject[0].OAuthClientSecretPostAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretPostAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientSecretPostAuthentications,
+		c.perfDataObject[0].OAuthClientSecretPostAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientWindowsIntegratedAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientWindowsAuthnFailures,
+		c.perfDataObject[0].OAuthClientWindowsAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientWindowsIntegratedAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].OAuthClientWindowsAuthentications,
+		c.perfDataObject[0].OAuthClientWindowsAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthLogonCertificateRequestFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthLogonCertRequestFailures,
+		c.perfDataObject[0].OAuthLogonCertRequestFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthLogonCertificateTokenRequests,
 		prometheus.CounterValue,
-		adfsData[0].OAuthLogonCertTokenRequests,
+		c.perfDataObject[0].OAuthLogonCertTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthPasswordGrantRequestFailures,
 		prometheus.CounterValue,
-		adfsData[0].OAuthPasswordGrantRequestFailures,
+		c.perfDataObject[0].OAuthPasswordGrantRequestFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthPasswordGrantRequests,
 		prometheus.CounterValue,
-		adfsData[0].OAuthPasswordGrantRequests,
+		c.perfDataObject[0].OAuthPasswordGrantRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthTokenRequests,
 		prometheus.CounterValue,
-		adfsData[0].OAuthTokenRequests,
+		c.perfDataObject[0].OAuthTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.samlPTokenRequests,
 		prometheus.CounterValue,
-		adfsData[0].SAMLPTokenRequests,
+		c.perfDataObject[0].SamlPTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ssoAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[0].SSOAuthenticationFailures,
+		c.perfDataObject[0].SsoAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ssoAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].SSOAuthentications,
+		c.perfDataObject[0].SsoAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.wsfedTokenRequests,
+		c.wsFedTokenRequests,
 		prometheus.CounterValue,
-		adfsData[0].WSFedTokenRequests,
+		c.perfDataObject[0].WsFedTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.wstrustTokenRequests,
+		c.wsTrustTokenRequests,
 		prometheus.CounterValue,
-		adfsData[0].WSTrustTokenRequests,
+		c.perfDataObject[0].WsTrustTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.upAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[0].UsernamePasswordAuthnFailures,
+		c.perfDataObject[0].UsernamePasswordAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.upAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].UsernamePasswordAuthentications,
+		c.perfDataObject[0].UsernamePasswordAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.externalAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[0].ExternalAuthNFailures,
+		c.perfDataObject[0].ExternalAuthNFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.externalAuthentications,
 		prometheus.CounterValue,
-		adfsData[0].ExternalAuthentications,
+		c.perfDataObject[0].ExternalAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.artifactDBFailures,
 		prometheus.CounterValue,
-		adfsData[0].ArtifactDBFailures,
+		c.perfDataObject[0].ArtifactDBFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.avgArtifactDBQueryTime,
 		prometheus.CounterValue,
-		adfsData[0].AvgArtifactDBQueryTime*math.Pow(10, -8),
+		c.perfDataObject[0].AvgArtifactDBQueryTime*math.Pow(10, -8),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.configDBFailures,
 		prometheus.CounterValue,
-		adfsData[0].ConfigDBFailures,
+		c.perfDataObject[0].ConfigDBFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.avgConfigDBQueryTime,
 		prometheus.CounterValue,
-		adfsData[0].AvgConfigDBQueryTime*math.Pow(10, -8),
+		c.perfDataObject[0].AvgConfigDBQueryTime*math.Pow(10, -8),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.federationMetadataRequests,
 		prometheus.CounterValue,
-		adfsData[0].FederationMetadataRequests,
+		c.perfDataObject[0].FederationMetadataRequests,
 	)
+
 	return nil
 }

internal/collector/adfs/adfs_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package adfs_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/adfs"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, adfs.Name, adfs.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, adfs.New, nil)
+}

internal/collector/adfs/types.go

@@ -0,0 +1,62 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package adfs
+
+type perfDataCounterValues struct {
+	AdLoginConnectionFailures                      float64 `perfdata:"AD Login Connection Failures"`
+	ArtifactDBFailures                             float64 `perfdata:"Artifact Database Connection Failures"`
+	AvgArtifactDBQueryTime                         float64 `perfdata:"Average Artifact Database Query Time"`
+	AvgConfigDBQueryTime                           float64 `perfdata:"Average Config Database Query Time"`
+	CertificateAuthentications                     float64 `perfdata:"Certificate Authentications"`
+	ConfigDBFailures                               float64 `perfdata:"Configuration Database Connection Failures"`
+	DeviceAuthentications                          float64 `perfdata:"Device Authentications"`
+	ExternalAuthentications                        float64 `perfdata:"External Authentications"`
+	ExternalAuthNFailures                          float64 `perfdata:"External Authentication Failures"`
+	ExtranetAccountLockouts                        float64 `perfdata:"Extranet Account Lockouts"`
+	FederatedAuthentications                       float64 `perfdata:"Federated Authentications"`
+	FederationMetadataRequests                     float64 `perfdata:"Federation Metadata Requests"`
+	OAuthAuthZRequests                             float64 `perfdata:"OAuth AuthZ Requests"`
+	OAuthClientAuthenticationFailures              float64 `perfdata:"OAuth Client Authentications Failures"`
+	OAuthClientAuthentications                     float64 `perfdata:"OAuth Client Authentications"`
+	OAuthClientBasicAuthenticationFailures         float64 `perfdata:"OAuth Client Secret Basic Authentication Failures"`
+	OAuthClientBasicAuthentications                float64 `perfdata:"OAuth Client Secret Basic Authentications"`
+	OAuthClientCredentialRequestFailures           float64 `perfdata:"OAuth Client Credentials Request Failures"`
+	OAuthClientCredentialRequests                  float64 `perfdata:"OAuth Client Credentials Requests"`
+	OAuthClientPrivateKeyJWTAuthenticationFailures float64 `perfdata:"OAuth Client Private Key Jwt Authentication Failures"`
+	OAuthClientPrivateKeyJWTAuthentications        float64 `perfdata:"OAuth Client Private Key Jwt Authentications"`
+	OAuthClientSecretPostAuthenticationFailures    float64 `perfdata:"OAuth Client Secret Post Authentication Failures"`
+	OAuthClientSecretPostAuthentications           float64 `perfdata:"OAuth Client Secret Post Authentications"`
+	OAuthClientWindowsAuthenticationFailures       float64 `perfdata:"OAuth Client Windows Integrated Authentication Failures"`
+	OAuthClientWindowsAuthentications              float64 `perfdata:"OAuth Client Windows Integrated Authentications"`
+	OAuthLogonCertRequestFailures                  float64 `perfdata:"OAuth Logon Certificate Request Failures"`
+	OAuthLogonCertTokenRequests                    float64 `perfdata:"OAuth Logon Certificate Token Requests"`
+	OAuthPasswordGrantRequestFailures              float64 `perfdata:"OAuth Password Grant Request Failures"`
+	OAuthPasswordGrantRequests                     float64 `perfdata:"OAuth Password Grant Requests"`
+	OAuthTokenRequests                             float64 `perfdata:"OAuth Token Requests"`
+	PassiveRequests                                float64 `perfdata:"Passive Requests"`
+	PassportAuthentications                        float64 `perfdata:"Microsoft Passport Authentications"`
+	PasswordChangeFailed                           float64 `perfdata:"Password Change Failed Requests"`
+	PasswordChangeSucceeded                        float64 `perfdata:"Password Change Successful Requests"`
+	SamlPTokenRequests                             float64 `perfdata:"SAML-P Token Requests"`
+	SsoAuthenticationFailures                      float64 `perfdata:"SSO Authentication Failures"`
+	SsoAuthentications                             float64 `perfdata:"SSO Authentications"`
+	TokenRequests                                  float64 `perfdata:"Token Requests"`
+	UsernamePasswordAuthenticationFailures         float64 `perfdata:"U/P Authentication Failures"`
+	UsernamePasswordAuthentications                float64 `perfdata:"U/P Authentications"`
+	WindowsIntegratedAuthentications               float64 `perfdata:"Windows Integrated Authentications"`
+	WsFedTokenRequests                             float64 `perfdata:"WS-Fed Token Requests"`
+	WsTrustTokenRequests                           float64 `perfdata:"WS-Trust Token Requests"`
+}

internal/collector/cache/cache.go

@@ -1,14 +1,28 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cache
 
 import (
+	"fmt"
+	"log/slog"
+
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
-	"github.com/pkg/errors"
-	"github.com/prometheus-community/windows_exporter/pkg/perflib"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
+	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -16,12 +30,15 @@ const Name = "cache"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for Perflib Cache metrics.
 type Collector struct {
 	config Config
-	logger log.Logger
+
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	asyncCopyReadsTotal         *prometheus.Desc
 	asyncDataMapsTotal          *prometheus.Desc
@@ -54,7 +71,7 @@ type Collector struct {
 	syncPinReadsTotal           *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -63,8 +80,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -76,19 +91,20 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	return []string{"Cache"}, nil
-}
-
 func (c *Collector) Close() error {
+	c.perfDataCollector.Close()
+
 	return nil
 }
 
-func (c *Collector) Build() error {
+func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues]("Cache", pdh.InstancesAll)
+	if err != nil {
+		return fmt.Errorf("failed to create Cache collector: %w", err)
+	}
+
 	c.asyncCopyReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "async_copy_reads_total"),
 		"(AsyncCopyReadsTotal)",
@@ -263,208 +279,189 @@ func (c *Collector) Build() error {
 		nil,
 		nil,
 	)
+
 	return nil
 }
 
 // Collect implements the Collector interface.
-func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if err := c.collect(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting cache metrics", "err", 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/sec"`
-	CopyReadsTotal              float64 `perflib:"Copy Reads/sec"`
-	DataFlushesTotal            float64 `perflib:"Data Flushes/sec"`
-	DataFlushPagesTotal         float64 `perflib:"Data Flush Pages/sec"`
-	DataMapPinsTotal            float64 `perflib:"Data Map Pins/sec"`
-	DataMapsTotal               float64 `perflib:"Data Maps/sec"`
-	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/sec"`
-	MDLReadsTotal               float64 `perflib:"MDL Reads/sec"`
-	PinReadHitsTotal            float64 `perflib:"Pin Read Hits/sec"`
-	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"`
-	DirtyPages                  float64 `perflib:"Dirty Pages"`
-	DirtyPageThreshold          float64 `perflib:"Dirty Page Threshold"`
-	DataMapHitsPercent          float64 `perflib:"Data Map Hits %"`
-}
-
-func (c *Collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []perflibCache // Single-instance class, array is required but will have single entry.
-	if err := perflib.UnmarshalObject(ctx.PerfObjects["Cache"], &dst, c.logger); err != nil {
-		return err
-	}
-
-	if len(dst) != 1 {
-		return errors.New("expected single instance of Cache")
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
+	if err != nil {
+		return fmt.Errorf("failed to collect Cache metrics: %w", err)
 	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncCopyReadsTotal,
 		prometheus.CounterValue,
-		dst[0].AsyncCopyReadsTotal,
+		c.perfDataObject[0].AsyncCopyReadsTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncDataMapsTotal,
 		prometheus.CounterValue,
-		dst[0].AsyncDataMapsTotal,
+		c.perfDataObject[0].AsyncDataMapsTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncFastReadsTotal,
 		prometheus.CounterValue,
-		dst[0].AsyncFastReadsTotal,
+		c.perfDataObject[0].AsyncFastReadsTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncMDLReadsTotal,
 		prometheus.CounterValue,
-		dst[0].AsyncMDLReadsTotal,
+		c.perfDataObject[0].AsyncMDLReadsTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncPinReadsTotal,
 		prometheus.CounterValue,
-		dst[0].AsyncPinReadsTotal,
+		c.perfDataObject[0].AsyncPinReadsTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.copyReadHitsTotal,
-		prometheus.CounterValue,
-		dst[0].CopyReadHitsTotal,
+		prometheus.GaugeValue,
+		c.perfDataObject[0].CopyReadHitsTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.copyReadsTotal,
 		prometheus.CounterValue,
-		dst[0].CopyReadsTotal,
+		c.perfDataObject[0].CopyReadsTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.dataFlushesTotal,
 		prometheus.CounterValue,
-		dst[0].DataFlushesTotal,
+		c.perfDataObject[0].DataFlushesTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.dataFlushPagesTotal,
 		prometheus.CounterValue,
-		dst[0].DataFlushPagesTotal,
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.dataMapPinsTotal,
-		prometheus.CounterValue,
-		dst[0].DataMapPinsTotal,
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.dataMapsTotal,
-		prometheus.CounterValue,
-		dst[0].DataMapsTotal,
-	)
-	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,
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.dirtyPages,
-		prometheus.GaugeValue,
-		dst[0].DirtyPages,
-	)
-	ch <- prometheus.MustNewConstMetric(
-		c.dirtyPageThreshold,
-		prometheus.GaugeValue,
-		dst[0].DirtyPageThreshold,
+		c.perfDataObject[0].DataFlushPagesTotal,
 	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.dataMapHitsPercent,
 		prometheus.GaugeValue,
-		dst[0].DataMapHitsPercent,
+		c.perfDataObject[0].DataMapHitsPercent,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.dataMapPinsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].DataMapPinsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.dataMapsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].DataMapsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.dirtyPages,
+		prometheus.GaugeValue,
+		c.perfDataObject[0].DirtyPages,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.dirtyPageThreshold,
+		prometheus.GaugeValue,
+		c.perfDataObject[0].DirtyPageThreshold,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.fastReadNotPossiblesTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].FastReadNotPossiblesTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.fastReadResourceMissesTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].FastReadResourceMissesTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.fastReadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].FastReadsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.lazyWriteFlushesTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].LazyWriteFlushesTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.lazyWritePagesTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].LazyWritePagesTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.mdlReadHitsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].MdlReadHitsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.mdlReadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].MdlReadsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.pinReadHitsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].PinReadHitsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.pinReadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].PinReadsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.readAheadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].ReadAheadsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.syncCopyReadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].SyncCopyReadsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.syncDataMapsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].SyncDataMapsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.syncFastReadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].SyncFastReadsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.syncMDLReadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].SyncMDLReadsTotal,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.syncPinReadsTotal,
+		prometheus.CounterValue,
+		c.perfDataObject[0].SyncPinReadsTotal,
 	)
 
 	return nil

internal/collector/cache/cache_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cache_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/cache"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, cache.Name, cache.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, cache.New, nil)
+}

internal/collector/cache/types.go

@@ -0,0 +1,50 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cache
+
+// Perflib "Cache":
+// - https://docs.microsoft.com/en-us/previous-versions/aa394267(v=vs.85)
+type perfDataCounterValues struct {
+	AsyncCopyReadsTotal         float64 `perfdata:"Async Copy Reads/sec"`
+	AsyncDataMapsTotal          float64 `perfdata:"Async Data Maps/sec"`
+	AsyncFastReadsTotal         float64 `perfdata:"Async Fast Reads/sec"`
+	AsyncMDLReadsTotal          float64 `perfdata:"Async MDL Reads/sec"`
+	AsyncPinReadsTotal          float64 `perfdata:"Async Pin Reads/sec"`
+	CopyReadHitsTotal           float64 `perfdata:"Copy Read Hits %"`
+	CopyReadsTotal              float64 `perfdata:"Copy Reads/sec"`
+	DataFlushesTotal            float64 `perfdata:"Data Flushes/sec"`
+	DataFlushPagesTotal         float64 `perfdata:"Data Flush Pages/sec"`
+	DataMapHitsPercent          float64 `perfdata:"Data Map Hits %"`
+	DataMapPinsTotal            float64 `perfdata:"Data Map Pins/sec"`
+	DataMapsTotal               float64 `perfdata:"Data Maps/sec"`
+	DirtyPages                  float64 `perfdata:"Dirty Pages"`
+	DirtyPageThreshold          float64 `perfdata:"Dirty Page Threshold"`
+	FastReadNotPossiblesTotal   float64 `perfdata:"Fast Read Not Possibles/sec"`
+	FastReadResourceMissesTotal float64 `perfdata:"Fast Read Resource Misses/sec"`
+	FastReadsTotal              float64 `perfdata:"Fast Reads/sec"`
+	LazyWriteFlushesTotal       float64 `perfdata:"Lazy Write Flushes/sec"`
+	LazyWritePagesTotal         float64 `perfdata:"Lazy Write Pages/sec"`
+	MdlReadHitsTotal            float64 `perfdata:"MDL Read Hits %"`
+	MdlReadsTotal               float64 `perfdata:"MDL Reads/sec"`
+	PinReadHitsTotal            float64 `perfdata:"Pin Read Hits %"`
+	PinReadsTotal               float64 `perfdata:"Pin Reads/sec"`
+	ReadAheadsTotal             float64 `perfdata:"Read Aheads/sec"`
+	SyncCopyReadsTotal          float64 `perfdata:"Sync Copy Reads/sec"`
+	SyncDataMapsTotal           float64 `perfdata:"Sync Data Maps/sec"`
+	SyncFastReadsTotal          float64 `perfdata:"Sync Fast Reads/sec"`
+	SyncMDLReadsTotal           float64 `perfdata:"Sync MDL Reads/sec"`
+	SyncPinReadsTotal           float64 `perfdata:"Sync Pin Reads/sec"`
+}

internal/collector/container/container.go

@@ -1,16 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package container
 
 import (
+	"errors"
+	"fmt"
+	"log/slog"
 	"strings"
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/windows_exporter/pkg/perflib"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
+	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -18,12 +33,14 @@ const Name = "container"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for containers metrics.
 type Collector struct {
 	config Config
-	logger log.Logger
+
+	logger *slog.Logger
 
 	// Presence
 	containerAvailable *prometheus.Desc
@@ -57,7 +74,7 @@ type Collector struct {
 }
 
 // New constructs a new Collector.
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -66,8 +83,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -79,19 +94,13 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	return []string{}, nil
-}
-
 func (c *Collector) Close() error {
 	return nil
 }
 
-func (c *Collector) Build() error {
+func (c *Collector) Build(logger *slog.Logger, _ *mi.Session) error {
+	c.logger = logger.With(slog.String("collector", Name))
+
 	c.containerAvailable = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "available"),
 		"Available",
@@ -200,33 +209,17 @@ func (c *Collector) Build() error {
 		[]string{"container_id"},
 		nil,
 	)
+
 	return nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting collector metrics", "err", err)
-		return err
-	}
-	return nil
-}
-
-// containerClose closes the container resource.
-func (c *Collector) containerClose(container hcsshim.Container) {
-	err := container.Close()
-	if err != nil {
-		_ = level.Error(c.logger).Log("err", err)
-	}
-}
-
-func (c *Collector) collect(ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	// Types Container is passed to get the containers compute systems only
 	containers, err := hcsshim.GetContainers(hcsshim.ComputeSystemQuery{Types: []string{"Container"}})
 	if err != nil {
-		_ = level.Error(c.logger).Log("msg", "Err in Getting containers", "err", err)
-		return err
+		return fmt.Errorf("error in fetching containers: %w", err)
 	}
 
 	count := len(containers)
@@ -236,129 +229,177 @@ func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 		prometheus.GaugeValue,
 		float64(count),
 	)
+
 	if count == 0 {
 		return nil
 	}
 
 	containerPrefixes := make(map[string]string)
+	collectErrors := make([]error, 0, len(containers))
 
 	for _, containerDetails := range containers {
-		// https://stackoverflow.com/questions/45617758/proper-way-to-release-resources-with-defer-in-a-loop
-		func() {
-			container, err := hcsshim.OpenContainer(containerDetails.ID)
-			if container != nil {
-				defer c.containerClose(container)
-			}
-			if err != nil {
-				_ = level.Error(c.logger).Log("msg", "err in opening container", "containerId", containerDetails.ID, "err", err)
-				return
+		containerIdWithPrefix := getContainerIdWithPrefix(containerDetails)
+
+		if err = c.collectContainer(ch, containerDetails, containerIdWithPrefix); err != nil {
+			if hcsshim.IsNotExist(err) {
+				c.logger.Debug("err in fetching container statistics",
+					slog.String("container_id", containerDetails.ID),
+					slog.Any("err", err),
+				)
+			} else {
+				c.logger.Error("err in fetching container statistics",
+					slog.String("container_id", containerDetails.ID),
+					slog.Any("err", err),
+				)
+
+				collectErrors = append(collectErrors, err)
 			}
 
-			cstats, err := container.Statistics()
-			if err != nil {
-				_ = level.Error(c.logger).Log("msg", "err in fetching container Statistics", "containerId", containerDetails.ID, "err", err)
-				return
-			}
+			continue
+		}
 
-			containerIdWithPrefix := getContainerIdWithPrefix(containerDetails)
-			containerPrefixes[containerDetails.ID] = containerIdWithPrefix
-
-			ch <- prometheus.MustNewConstMetric(
-				c.containerAvailable,
-				prometheus.CounterValue,
-				1,
-				containerIdWithPrefix,
-			)
-			ch <- prometheus.MustNewConstMetric(
-				c.usageCommitBytes,
-				prometheus.GaugeValue,
-				float64(cstats.Memory.UsageCommitBytes),
-				containerIdWithPrefix,
-			)
-			ch <- prometheus.MustNewConstMetric(
-				c.usageCommitPeakBytes,
-				prometheus.GaugeValue,
-				float64(cstats.Memory.UsageCommitPeakBytes),
-				containerIdWithPrefix,
-			)
-			ch <- prometheus.MustNewConstMetric(
-				c.usagePrivateWorkingSetBytes,
-				prometheus.GaugeValue,
-				float64(cstats.Memory.UsagePrivateWorkingSetBytes),
-				containerIdWithPrefix,
-			)
-			ch <- prometheus.MustNewConstMetric(
-				c.runtimeTotal,
-				prometheus.CounterValue,
-				float64(cstats.Processor.TotalRuntime100ns)*perflib.TicksToSecondScaleFactor,
-				containerIdWithPrefix,
-			)
-			ch <- prometheus.MustNewConstMetric(
-				c.runtimeUser,
-				prometheus.CounterValue,
-				float64(cstats.Processor.RuntimeUser100ns)*perflib.TicksToSecondScaleFactor,
-				containerIdWithPrefix,
-			)
-			ch <- prometheus.MustNewConstMetric(
-				c.runtimeKernel,
-				prometheus.CounterValue,
-				float64(cstats.Processor.RuntimeKernel100ns)*perflib.TicksToSecondScaleFactor,
-				containerIdWithPrefix,
-			)
-			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,
-			)
-		}()
+		containerPrefixes[containerDetails.ID] = containerIdWithPrefix
 	}
 
+	if err = c.collectNetworkMetrics(ch, containerPrefixes); err != nil {
+		return fmt.Errorf("error in fetching container network statistics: %w", err)
+	}
+
+	if len(collectErrors) > 0 {
+		return fmt.Errorf("errors while fetching container statistics: %w", errors.Join(collectErrors...))
+	}
+
+	return nil
+}
+
+func (c *Collector) collectContainer(ch chan<- prometheus.Metric, containerDetails hcsshim.ContainerProperties, containerIdWithPrefix string) error {
+	container, err := hcsshim.OpenContainer(containerDetails.ID)
+	if err != nil {
+		return fmt.Errorf("error in opening container: %w", err)
+	}
+
+	defer func() {
+		if container == nil {
+			return
+		}
+
+		if err := container.Close(); err != nil {
+			c.logger.Error("error in closing container",
+				slog.Any("err", err),
+			)
+		}
+	}()
+
+	containerStats, err := container.Statistics()
+	if err != nil {
+		return fmt.Errorf("error in fetching container statistics: %w", err)
+	}
+
+	ch <- prometheus.MustNewConstMetric(
+		c.containerAvailable,
+		prometheus.CounterValue,
+		1,
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.usageCommitBytes,
+		prometheus.GaugeValue,
+		float64(containerStats.Memory.UsageCommitBytes),
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.usageCommitPeakBytes,
+		prometheus.GaugeValue,
+		float64(containerStats.Memory.UsageCommitPeakBytes),
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.usagePrivateWorkingSetBytes,
+		prometheus.GaugeValue,
+		float64(containerStats.Memory.UsagePrivateWorkingSetBytes),
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.runtimeTotal,
+		prometheus.CounterValue,
+		float64(containerStats.Processor.TotalRuntime100ns)*pdh.TicksToSecondScaleFactor,
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.runtimeUser,
+		prometheus.CounterValue,
+		float64(containerStats.Processor.RuntimeUser100ns)*pdh.TicksToSecondScaleFactor,
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.runtimeKernel,
+		prometheus.CounterValue,
+		float64(containerStats.Processor.RuntimeKernel100ns)*pdh.TicksToSecondScaleFactor,
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.readCountNormalized,
+		prometheus.CounterValue,
+		float64(containerStats.Storage.ReadCountNormalized),
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.readSizeBytes,
+		prometheus.CounterValue,
+		float64(containerStats.Storage.ReadSizeBytes),
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.writeCountNormalized,
+		prometheus.CounterValue,
+		float64(containerStats.Storage.WriteCountNormalized),
+		containerIdWithPrefix,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.writeSizeBytes,
+		prometheus.CounterValue,
+		float64(containerStats.Storage.WriteSizeBytes),
+		containerIdWithPrefix,
+	)
+
+	return nil
+}
+
+// collectNetworkMetrics collects network metrics for containers.
+// With HNSv2, the network stats must be collected from hcsshim.HNSListEndpointRequest.
+// Network statistics from the container.Statistics() are providing data only, if HNSv1 is used.
+// Ref: https://github.com/prometheus-community/windows_exporter/pull/1218
+func (c *Collector) collectNetworkMetrics(ch chan<- prometheus.Metric, containerPrefixes map[string]string) error {
 	hnsEndpoints, err := hcsshim.HNSListEndpointRequest()
 	if err != nil {
-		_ = level.Warn(c.logger).Log("msg", "Failed to collect network stats for containers")
-		return err
+		return fmt.Errorf("error in fetching HNS endpoints: %w", err)
 	}
 
 	if len(hnsEndpoints) == 0 {
-		_ = level.Info(c.logger).Log("msg", "No network stats for containers to collect")
-		return nil
+		return errors.New("no network stats for containers to collect")
 	}
 
 	for _, endpoint := range hnsEndpoints {
 		endpointStats, err := hcsshim.GetHNSEndpointStats(endpoint.Id)
 		if err != nil {
-			_ = level.Warn(c.logger).Log("msg", "Failed to collect network stats for interface "+endpoint.Id, "err", err)
+			c.logger.Warn("Failed to collect network stats for interface "+endpoint.Id,
+				slog.Any("err", err),
+			)
+
 			continue
 		}
 
 		for _, containerId := range endpoint.SharedContainers {
 			containerIdWithPrefix, ok := containerPrefixes[containerId]
-			endpointId := strings.ToUpper(endpoint.Id)
 
 			if !ok {
-				_ = level.Warn(c.logger).Log("msg", "Failed to collect network stats for container "+containerId)
+				c.logger.Debug("Failed to collect network stats for container " + containerId)
+
 				continue
 			}
 
+			endpointId := strings.ToUpper(endpoint.Id)
+
 			ch <- prometheus.MustNewConstMetric(
 				c.bytesReceived,
 				prometheus.CounterValue,

internal/collector/container/container_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package container_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/container"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, container.Name, container.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, container.New, nil)
+}

internal/collector/cpu/cpu.go

@@ -0,0 +1,356 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cpu
+
+import (
+	"fmt"
+	"log/slog"
+	"sync"
+
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
+	"github.com/prometheus-community/windows_exporter/internal/types"
+	"github.com/prometheus-community/windows_exporter/internal/utils"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const Name = "cpu"
+
+type Config struct{}
+
+//nolint:gochecknoglobals
+var ConfigDefaults = Config{}
+
+type Collector struct {
+	config Config
+
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
+
+	mu sync.Mutex
+
+	processorRTCValues   map[string]utils.Counter
+	processorMPerfValues map[string]utils.Counter
+
+	logicalProcessors          *prometheus.Desc
+	cStateSecondsTotal         *prometheus.Desc
+	timeTotal                  *prometheus.Desc
+	interruptsTotal            *prometheus.Desc
+	dpcsTotal                  *prometheus.Desc
+	clockInterruptsTotal       *prometheus.Desc
+	idleBreakEventsTotal       *prometheus.Desc
+	parkingStatus              *prometheus.Desc
+	processorFrequencyMHz      *prometheus.Desc
+	processorPerformance       *prometheus.Desc
+	processorMPerf             *prometheus.Desc
+	processorRTC               *prometheus.Desc
+	processorUtility           *prometheus.Desc
+	processorPrivilegedUtility *prometheus.Desc
+}
+
+func New(config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
+	return c
+}
+
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
+}
+
+func (c *Collector) GetName() string {
+	return Name
+}
+
+func (c *Collector) Close() error {
+	c.perfDataCollector.Close()
+
+	return nil
+}
+
+func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
+	var err error
+
+	c.mu = sync.Mutex{}
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues]("Processor Information", pdh.InstancesAll)
+	if err != nil {
+		return fmt.Errorf("failed to create Processor Information collector: %w", err)
+	}
+
+	c.logicalProcessors = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "logical_processor"),
+		"Total number of logical processors",
+		nil,
+		nil,
+	)
+	c.cStateSecondsTotal = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "cstate_seconds_total"),
+		"Time spent in low-power idle state",
+		[]string{"core", "state"},
+		nil,
+	)
+	c.timeTotal = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "time_total"),
+		"Time that processor spent in different modes (dpc, idle, interrupt, privileged, user)",
+		[]string{"core", "mode"},
+		nil,
+	)
+	c.interruptsTotal = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "interrupts_total"),
+		"Total number of received and serviced hardware interrupts",
+		[]string{"core"},
+		nil,
+	)
+	c.dpcsTotal = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "dpcs_total"),
+		"Total number of received and serviced deferred procedure calls (DPCs)",
+		[]string{"core"},
+		nil,
+	)
+	c.clockInterruptsTotal = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "clock_interrupts_total"),
+		"Total number of received and serviced clock tick interrupts",
+		[]string{"core"},
+		nil,
+	)
+	c.idleBreakEventsTotal = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "idle_break_events_total"),
+		"Total number of time processor was woken from idle",
+		[]string{"core"},
+		nil,
+	)
+	c.parkingStatus = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "parking_status"),
+		"Parking Status represents whether a processor is parked or not",
+		[]string{"core"},
+		nil,
+	)
+	c.processorFrequencyMHz = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "core_frequency_mhz"),
+		"Core frequency in megahertz",
+		[]string{"core"},
+		nil,
+	)
+	c.processorPerformance = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "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,
+	)
+	c.processorMPerf = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "processor_mperf_total"),
+		"Processor MPerf is the number of TSC ticks incremented while executing instructions",
+		[]string{"core"},
+		nil,
+	)
+	c.processorRTC = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "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,
+	)
+	c.processorUtility = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "processor_utility_total"),
+		"Processor Utility represents is the amount of time the core spends executing instructions",
+		[]string{"core"},
+		nil,
+	)
+	c.processorPrivilegedUtility = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "processor_privileged_utility_total"),
+		"Processor Privileged Utility represents is the amount of time the core has spent executing instructions inside the kernel",
+		[]string{"core"},
+		nil,
+	)
+
+	c.processorRTCValues = map[string]utils.Counter{}
+	c.processorMPerfValues = map[string]utils.Counter{}
+
+	return nil
+}
+
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	c.mu.Lock() // Lock is needed to prevent concurrent map access to c.processorRTCValues
+	defer c.mu.Unlock()
+
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
+	if err != nil {
+		return fmt.Errorf("failed to collect Processor Information metrics: %w", err)
+	}
+
+	var coreCount float64
+
+	for _, coreData := range c.perfDataObject {
+		core := coreData.Name
+		coreCount++
+
+		var (
+			counterProcessorRTCValues   utils.Counter
+			counterProcessorMPerfValues utils.Counter
+			ok                          bool
+		)
+
+		if counterProcessorRTCValues, ok = c.processorRTCValues[core]; ok {
+			counterProcessorRTCValues.AddValue(uint32(coreData.ProcessorUtilityRateSecondValue))
+		} else {
+			counterProcessorRTCValues = utils.NewCounter(uint32(coreData.ProcessorUtilityRateSecondValue))
+		}
+
+		c.processorRTCValues[core] = counterProcessorRTCValues
+
+		if counterProcessorMPerfValues, ok = c.processorMPerfValues[core]; ok {
+			counterProcessorMPerfValues.AddValue(uint32(coreData.ProcessorPerformanceSecondValue))
+		} else {
+			counterProcessorMPerfValues = utils.NewCounter(uint32(coreData.ProcessorPerformanceSecondValue))
+		}
+
+		c.processorMPerfValues[core] = counterProcessorMPerfValues
+
+		ch <- prometheus.MustNewConstMetric(
+			c.cStateSecondsTotal,
+			prometheus.CounterValue,
+			coreData.C1TimeSeconds,
+			core, "c1",
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cStateSecondsTotal,
+			prometheus.CounterValue,
+			coreData.C2TimeSeconds,
+			core, "c2",
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cStateSecondsTotal,
+			prometheus.CounterValue,
+			coreData.C3TimeSeconds,
+			core, "c3",
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.timeTotal,
+			prometheus.CounterValue,
+			coreData.IdleTimeSeconds,
+			core, "idle",
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.timeTotal,
+			prometheus.CounterValue,
+			coreData.InterruptTimeSeconds,
+			core, "interrupt",
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.timeTotal,
+			prometheus.CounterValue,
+			coreData.DpcTimeSeconds,
+			core, "dpc",
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.timeTotal,
+			prometheus.CounterValue,
+			coreData.PrivilegedTimeSeconds,
+			core, "privileged",
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.timeTotal,
+			prometheus.CounterValue,
+			coreData.UserTimeSeconds,
+			core, "user",
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.interruptsTotal,
+			prometheus.CounterValue,
+			coreData.InterruptsTotal,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.dpcsTotal,
+			prometheus.CounterValue,
+			coreData.DpcQueuedPerSecond,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.clockInterruptsTotal,
+			prometheus.CounterValue,
+			coreData.ClockInterruptsTotal,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.idleBreakEventsTotal,
+			prometheus.CounterValue,
+			coreData.IdleBreakEventsTotal,
+			core,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.parkingStatus,
+			prometheus.GaugeValue,
+			coreData.ParkingStatus,
+			core,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.processorFrequencyMHz,
+			prometheus.GaugeValue,
+			coreData.ProcessorFrequencyMHz,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.processorPerformance,
+			prometheus.CounterValue,
+			coreData.ProcessorPerformance,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.processorMPerf,
+			prometheus.CounterValue,
+			counterProcessorMPerfValues.Value(),
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.processorRTC,
+			prometheus.CounterValue,
+			counterProcessorRTCValues.Value(),
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.processorUtility,
+			prometheus.CounterValue,
+			coreData.ProcessorUtilityRate,
+			core,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.processorPrivilegedUtility,
+			prometheus.CounterValue,
+			coreData.PrivilegedUtilitySeconds,
+			core,
+		)
+	}
+
+	ch <- prometheus.MustNewConstMetric(
+		c.logicalProcessors,
+		prometheus.GaugeValue,
+		coreCount,
+	)
+
+	return nil
+}

internal/collector/cpu/cpu_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cpu_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/cpu"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, cpu.Name, cpu.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, cpu.New, nil)
+}

internal/collector/cpu/types.go

@@ -0,0 +1,47 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cpu
+
+// Processor performance counters.
+type perfDataCounterValues struct {
+	Name string
+
+	C1TimeSeconds                   float64 `perfdata:"% C1 Time"`
+	C2TimeSeconds                   float64 `perfdata:"% C2 Time"`
+	C3TimeSeconds                   float64 `perfdata:"% C3 Time"`
+	C1TransitionsTotal              float64 `perfdata:"C1 Transitions/sec"`
+	C2TransitionsTotal              float64 `perfdata:"C2 Transitions/sec"`
+	C3TransitionsTotal              float64 `perfdata:"C3 Transitions/sec"`
+	ClockInterruptsTotal            float64 `perfdata:"Clock Interrupts/sec"`
+	DpcQueuedPerSecond              float64 `perfdata:"DPCs Queued/sec"`
+	DpcTimeSeconds                  float64 `perfdata:"% DPC Time"`
+	IdleBreakEventsTotal            float64 `perfdata:"Idle Break Events/sec"`
+	IdleTimeSeconds                 float64 `perfdata:"% Idle Time"`
+	InterruptsTotal                 float64 `perfdata:"Interrupts/sec"`
+	InterruptTimeSeconds            float64 `perfdata:"% Interrupt Time"`
+	ParkingStatus                   float64 `perfdata:"Parking Status"`
+	PerformanceLimitPercent         float64 `perfdata:"% Performance Limit"`
+	PriorityTimeSeconds             float64 `perfdata:"% Priority Time"`
+	PrivilegedTimeSeconds           float64 `perfdata:"% Privileged Time"`
+	PrivilegedUtilitySeconds        float64 `perfdata:"% Privileged Utility"`
+	ProcessorFrequencyMHz           float64 `perfdata:"Processor Frequency"`
+	ProcessorPerformance            float64 `perfdata:"% Processor Performance"`
+	ProcessorPerformanceSecondValue float64 `perfdata:"% Processor Performance,secondvalue"`
+	ProcessorTimeSeconds            float64 `perfdata:"% Processor Time"`
+	ProcessorUtilityRate            float64 `perfdata:"% Processor Utility"`
+	ProcessorUtilityRateSecondValue float64 `perfdata:"% Processor Utility,secondvalue"`
+	UserTimeSeconds                 float64 `perfdata:"% User Time"`
+}

internal/collector/cpu_info/cpu_info.go

@@ -0,0 +1,234 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cpu_info
+
+import (
+	"errors"
+	"fmt"
+	"log/slog"
+	"strconv"
+	"strings"
+
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/types"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const Name = "cpu_info"
+
+type Config struct{}
+
+//nolint:gochecknoglobals
+var ConfigDefaults = Config{}
+
+// A Collector is a Prometheus Collector for a few WMI metrics in Win32_Processor.
+type Collector struct {
+	config    Config
+	miSession *mi.Session
+	miQuery   mi.Query
+
+	cpuInfo                   *prometheus.Desc
+	cpuCoreCount              *prometheus.Desc
+	cpuEnabledCoreCount       *prometheus.Desc
+	cpuLogicalProcessorsCount *prometheus.Desc
+	cpuThreadCount            *prometheus.Desc
+	cpuL2CacheSize            *prometheus.Desc
+	cpuL3CacheSize            *prometheus.Desc
+}
+
+func New(config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
+	return c
+}
+
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
+}
+
+func (c *Collector) GetName() string {
+	return Name
+}
+
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build(_ *slog.Logger, miSession *mi.Session) error {
+	if miSession == nil {
+		return errors.New("miSession is nil")
+	}
+
+	miQuery, err := mi.NewQuery("SELECT Architecture, DeviceId, Description, Family, L2CacheSize, L3CacheSize, Name, ThreadCount, NumberOfCores, NumberOfEnabledCore, NumberOfLogicalProcessors FROM Win32_Processor")
+	if err != nil {
+		return fmt.Errorf("failed to create WMI query: %w", err)
+	}
+
+	c.miQuery = miQuery
+	c.miSession = miSession
+
+	c.cpuInfo = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, "", Name),
+		"Labelled CPU information as provided by Win32_Processor",
+		[]string{
+			"architecture",
+			"device_id",
+			"description",
+			"family",
+			"name",
+		},
+		nil,
+	)
+	c.cpuThreadCount = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "thread"),
+		"Number of threads per CPU",
+		[]string{
+			"device_id",
+		},
+		nil,
+	)
+	c.cpuCoreCount = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "core"),
+		"Number of cores per CPU",
+		[]string{
+			"device_id",
+		},
+		nil,
+	)
+	c.cpuEnabledCoreCount = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "enabled_core"),
+		"Number of enabled cores per CPU",
+		[]string{
+			"device_id",
+		},
+		nil,
+	)
+	c.cpuLogicalProcessorsCount = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "logical_processor"),
+		"Number of logical processors per CPU",
+		[]string{
+			"device_id",
+		},
+		nil,
+	)
+	c.cpuL2CacheSize = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "l2_cache_size"),
+		"Size of L2 cache per CPU",
+		[]string{
+			"device_id",
+		},
+		nil,
+	)
+	c.cpuL3CacheSize = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "l3_cache_size"),
+		"Size of L3 cache per CPU",
+		[]string{
+			"device_id",
+		},
+		nil,
+	)
+
+	var dst []miProcessor
+	if err := c.miSession.Query(&dst, mi.NamespaceRootCIMv2, c.miQuery); err != nil {
+		return fmt.Errorf("WMI query failed: %w", err)
+	}
+
+	return nil
+}
+
+type miProcessor struct {
+	Architecture              uint32 `mi:"Architecture"`
+	DeviceID                  string `mi:"DeviceID"`
+	Description               string `mi:"Description"`
+	Family                    uint16 `mi:"Family"`
+	L2CacheSize               uint32 `mi:"L2CacheSize"`
+	L3CacheSize               uint32 `mi:"L3CacheSize"`
+	Name                      string `mi:"Name"`
+	ThreadCount               uint32 `mi:"ThreadCount"`
+	NumberOfCores             uint32 `mi:"NumberOfCores"`
+	NumberOfEnabledCore       uint32 `mi:"NumberOfEnabledCore"`
+	NumberOfLogicalProcessors uint32 `mi:"NumberOfLogicalProcessors"`
+
+	Total int
+}
+
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	var dst []miProcessor
+	if err := c.miSession.Query(&dst, mi.NamespaceRootCIMv2, c.miQuery); err != nil {
+		return fmt.Errorf("WMI query failed: %w", err)
+	}
+
+	// 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)),
+			strings.TrimRight(processor.Name, " "),
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cpuCoreCount,
+			prometheus.GaugeValue,
+			float64(processor.NumberOfCores),
+			strings.TrimRight(processor.DeviceID, " "),
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cpuEnabledCoreCount,
+			prometheus.GaugeValue,
+			float64(processor.NumberOfEnabledCore),
+			strings.TrimRight(processor.DeviceID, " "),
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cpuLogicalProcessorsCount,
+			prometheus.GaugeValue,
+			float64(processor.NumberOfLogicalProcessors),
+			strings.TrimRight(processor.DeviceID, " "),
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cpuThreadCount,
+			prometheus.GaugeValue,
+			float64(processor.ThreadCount),
+			strings.TrimRight(processor.DeviceID, " "),
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cpuL2CacheSize,
+			prometheus.GaugeValue,
+			float64(processor.L2CacheSize),
+			strings.TrimRight(processor.DeviceID, " "),
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.cpuL3CacheSize,
+			prometheus.GaugeValue,
+			float64(processor.L3CacheSize),
+			strings.TrimRight(processor.DeviceID, " "),
+		)
+	}
+
+	return nil
+}

internal/collector/cpu_info/cpu_info_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cpu_info_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/cpu_info"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, cpu_info.Name, cpu_info.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, cpu_info.New, nil)
+}

internal/collector/cs/cs.go

@@ -1,13 +1,27 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cs
 
 import (
+	"log/slog"
+
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/windows_exporter/pkg/headers/sysinfoapi"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/internal/headers/sysinfoapi"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -15,19 +29,25 @@ const Name = "cs"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for WMI metrics.
 type Collector struct {
 	config Config
-	logger log.Logger
 
+	// physicalMemoryBytes
+	// Deprecated: Use windows_physical_memory_total_bytes instead
 	physicalMemoryBytes *prometheus.Desc
-	logicalProcessors   *prometheus.Desc
-	hostname            *prometheus.Desc
+	// logicalProcessors
+	// Deprecated: Use windows_cpu_logical_processor instead
+	logicalProcessors *prometheus.Desc
+	// hostname
+	// Deprecated: Use windows_os_hostname instead
+	hostname *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -36,8 +56,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -49,34 +67,31 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	return []string{}, nil
-}
-
 func (c *Collector) Close() error {
 	return nil
 }
 
-func (c *Collector) Build() error {
+func (c *Collector) Build(logger *slog.Logger, _ *mi.Session) error {
+	logger.Warn("The cs collector is deprecated and will be removed in a future release. " +
+		"Logical processors has been moved to cpu_info collector. " +
+		"Physical memory has been moved to memory collector. " +
+		"Hostname has been moved to os collector.")
+
 	c.logicalProcessors = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "logical_processors"),
-		"ComputerSystem.NumberOfLogicalProcessors",
+		"Deprecated: Use windows_cpu_logical_processor instead",
 		nil,
 		nil,
 	)
 	c.physicalMemoryBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "physical_memory_bytes"),
-		"ComputerSystem.TotalPhysicalMemory",
+		"Deprecated: Use windows_physical_memory_total_bytes instead",
 		nil,
 		nil,
 	)
 	c.hostname = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "hostname"),
-		"Labelled system hostname information as provided by ComputerSystem.DNSHostName and ComputerSystem.Domain",
+		"Deprecated: Use windows_os_hostname instead",
 		[]string{
 			"hostname",
 			"domain",
@@ -84,20 +99,13 @@ func (c *Collector) Build() error {
 		},
 		nil,
 	)
+
 	return nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting cs metrics", "err", err)
-		return err
-	}
-	return nil
-}
-
-func (c *Collector) collect(ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	// Get systeminfo for number of processors
 	systemInfo := sysinfoapi.GetSystemInfo()
 
@@ -123,10 +131,12 @@ func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	if err != nil {
 		return err
 	}
+
 	domain, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSDomain)
 	if err != nil {
 		return err
 	}
+
 	fqdn, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSFullyQualified)
 	if err != nil {
 		return err

internal/collector/cs/cs_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cs_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/cs"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, cs.Name, cs.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, cs.New, nil)
+}

internal/collector/dfsr/dfsr.go

@@ -1,16 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dfsr
 
 import (
+	"errors"
+	"fmt"
+	"log/slog"
 	"slices"
 	"strings"
 
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/windows_exporter/pkg/perflib"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
+	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -20,6 +35,7 @@ type Config struct {
 	CollectorsEnabled []string `yaml:"collectors_enabled"`
 }
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{
 	CollectorsEnabled: []string{"connection", "folder", "volume"},
 }
@@ -27,7 +43,13 @@ var ConfigDefaults = Config{
 // Collector contains the metric and state data of the DFSR collectors.
 type Collector struct {
 	config Config
-	logger log.Logger
+
+	perfDataCollectorConnection *pdh.Collector
+	perfDataCollectorFolder     *pdh.Collector
+	perfDataCollectorVolume     *pdh.Collector
+	perfDataObjectConnection    []perfDataCounterValuesConnection
+	perfDataObjectFolder        []perfDataCounterValuesFolder
+	perfDataObjectVolume        []perfDataCounterValuesVolume
 
 	// connection source
 	connectionBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
@@ -37,17 +59,17 @@ type Collector struct {
 	connectionRDCBytesReceivedTotal                    *prometheus.Desc
 	connectionRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
 	connectionRDCSizeOfFilesReceivedTotal              *prometheus.Desc
-	connectionRDCNumberofFilesReceivedTotal            *prometheus.Desc
+	connectionRDCNumberOfFilesReceivedTotal            *prometheus.Desc
 	connectionSizeOfFilesReceivedTotal                 *prometheus.Desc
 
 	// folder source
 	folderBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
 	folderCompressedSizeOfFilesReceivedTotal       *prometheus.Desc
-	folderConflictBytesCleanedupTotal              *prometheus.Desc
+	folderConflictBytesCleanedUpTotal              *prometheus.Desc
 	folderConflictBytesGeneratedTotal              *prometheus.Desc
 	folderConflictFilesCleanedUpTotal              *prometheus.Desc
 	folderConflictFilesGeneratedTotal              *prometheus.Desc
-	folderConflictfolderCleanupsCompletedTotal     *prometheus.Desc
+	folderConflictFolderCleanupsCompletedTotal     *prometheus.Desc
 	folderConflictSpaceInUse                       *prometheus.Desc
 	folderDeletedSpaceInUse                        *prometheus.Desc
 	folderDeletedBytesCleanedUpTotal               *prometheus.Desc
@@ -59,7 +81,7 @@ type Collector struct {
 	folderFilesReceivedTotal                       *prometheus.Desc
 	folderRDCBytesReceivedTotal                    *prometheus.Desc
 	folderRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
-	folderRDCNumberofFilesReceivedTotal            *prometheus.Desc
+	folderRDCNumberOfFilesReceivedTotal            *prometheus.Desc
 	folderRDCSizeOfFilesReceivedTotal              *prometheus.Desc
 	folderSizeOfFilesReceivedTotal                 *prometheus.Desc
 	folderStagingSpaceInUse                        *prometheus.Desc
@@ -75,30 +97,9 @@ type Collector struct {
 	volumeUSNJournalUnreadPercentage     *prometheus.Desc
 	volumeUSNJournalRecordsAcceptedTotal *prometheus.Desc
 	volumeUSNJournalRecordsReadTotal     *prometheus.Desc
-
-	// Map of child Collector functions used during collection
-	dfsrChildCollectors []dfsrCollectorFunc
 }
 
-type dfsrCollectorFunc func(ctx *types.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
-}
-
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -111,8 +112,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -120,10 +119,11 @@ func NewWithFlags(app *kingpin.Application) *Collector {
 	c := &Collector{
 		config: ConfigDefaults,
 	}
+	c.config.CollectorsEnabled = make([]string, 0)
 
 	var collectorsEnabled string
 
-	app.Flag("collectors.dfsr.sources-enabled", "Comma-separated list of DFSR Perflib sources to use.").
+	app.Flag("collector.dfsr.sources-enabled", "Comma-separated list of DFSR Perflib sources to use.").
 		Default(strings.Join(ConfigDefaults.CollectorsEnabled, ",")).StringVar(&collectorsEnabled)
 
 	app.Action(func(*kingpin.ParseContext) error {
@@ -139,28 +139,49 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	// Perflib sources are dynamic, depending on the enabled child collectors
-	expandedChildCollectors := slices.Compact(c.config.CollectorsEnabled)
-	perflibDependencies := make([]string, 0, len(expandedChildCollectors))
-
-	for _, source := range expandedChildCollectors {
-		perflibDependencies = append(perflibDependencies, dfsrGetPerfObjectName(source))
+func (c *Collector) Close() error {
+	if slices.Contains(c.config.CollectorsEnabled, "connection") {
+		c.perfDataCollectorConnection.Close()
 	}
 
-	return perflibDependencies, nil
-}
+	if slices.Contains(c.config.CollectorsEnabled, "folder") {
+		c.perfDataCollectorFolder.Close()
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, "volume") {
+		c.perfDataCollectorVolume.Close()
+	}
 
-func (c *Collector) Close() error {
 	return nil
 }
 
-func (c *Collector) Build() error {
-	_ = level.Info(c.logger).Log("msg", "dfsr collector is in an experimental state! Metrics for this collector have not been tested.")
+func (c *Collector) Build(logger *slog.Logger, _ *mi.Session) error {
+	logger = logger.With(slog.String("collector", Name))
+
+	logger.Info("dfsr collector is in an experimental state! Metrics for this collector have not been tested.")
+
+	var err error
+
+	if slices.Contains(c.config.CollectorsEnabled, "connection") {
+		c.perfDataCollectorConnection, err = pdh.NewCollector[perfDataCounterValuesConnection]("DFS Replication Connections", pdh.InstancesAll)
+		if err != nil {
+			return fmt.Errorf("failed to create DFS Replication Connections collector: %w", err)
+		}
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, "folder") {
+		c.perfDataCollectorFolder, err = pdh.NewCollector[perfDataCounterValuesFolder]("DFS Replicated Folders", pdh.InstancesAll)
+		if err != nil {
+			return fmt.Errorf("failed to create DFS Replicated Folders collector: %w", err)
+		}
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, "volume") {
+		c.perfDataCollectorVolume, err = pdh.NewCollector[perfDataCounterValuesVolume]("DFS Replication Service Volumes", pdh.InstancesAll)
+		if err != nil {
+			return fmt.Errorf("failed to create DFS Replication Service Volumes collector: %w", err)
+		}
+	}
 
 	// connection
 	c.connectionBandwidthSavingsUsingDFSReplicationTotal = prometheus.NewDesc(
@@ -205,7 +226,7 @@ func (c *Collector) Build() error {
 		nil,
 	)
 
-	c.connectionRDCNumberofFilesReceivedTotal = prometheus.NewDesc(
+	c.connectionRDCNumberOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_rdc_received_files_total"),
 		"Total number of files received using remote differential compression",
 		[]string{"name"},
@@ -241,7 +262,7 @@ func (c *Collector) Build() error {
 		nil,
 	)
 
-	c.folderConflictBytesCleanedupTotal = prometheus.NewDesc(
+	c.folderConflictBytesCleanedUpTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "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"},
@@ -269,7 +290,7 @@ func (c *Collector) Build() error {
 		nil,
 	)
 
-	c.folderConflictfolderCleanupsCompletedTotal = prometheus.NewDesc(
+	c.folderConflictFolderCleanupsCompletedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_conflict_folder_cleanups_total"),
 		"Number of deletions of conflict loser files and folders in the Conflict and Deleted",
 		[]string{"name"},
@@ -353,7 +374,7 @@ func (c *Collector) Build() error {
 		nil,
 	)
 
-	c.folderRDCNumberofFilesReceivedTotal = prometheus.NewDesc(
+	c.folderRDCNumberOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_rdc_received_files_total"),
 		"Total number of files received with Remote Differential Compression",
 		[]string{"name"},
@@ -452,415 +473,350 @@ func (c *Collector) Build() error {
 		nil,
 	)
 
-	// Perflib sources are dynamic, depending on the enabled child collectors
-	expandedChildCollectors := slices.Compact(c.config.CollectorsEnabled)
-	c.dfsrChildCollectors = c.getDFSRChildCollectors(expandedChildCollectors)
-
 	return nil
 }
 
-// Maps enabled child collectors names to their relevant collection function,
-// for use in Collector.Collect().
-func (c *Collector) 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 *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	for _, fn := range c.dfsrChildCollectors {
-		err := fn(ctx, ch)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	errs := make([]error, 0, 3)
 
-// PerflibDFSRConnection 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 *Collector) collectConnection(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []PerflibDFSRConnection
-	if err := perflib.UnmarshalObject(ctx.PerfObjects["DFS Replication Connections"], &dst, c.logger); err != nil {
-		return err
+	if slices.Contains(c.config.CollectorsEnabled, "connection") {
+		errs = append(errs, c.collectPDHConnection(ch))
 	}
 
-	for _, connection := range dst {
+	if slices.Contains(c.config.CollectorsEnabled, "folder") {
+		errs = append(errs, c.collectPDHFolder(ch))
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, "volume") {
+		errs = append(errs, c.collectPDHVolume(ch))
+	}
+
+	return errors.Join(errs...)
+}
+
+func (c *Collector) collectPDHConnection(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollectorConnection.Collect(&c.perfDataObjectConnection)
+	if err != nil {
+		return fmt.Errorf("failed to collect DFS Replication Connections metrics: %w", err)
+	}
+
+	for _, connection := range c.perfDataObjectConnection {
+		name := connection.Name
+
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionBandwidthSavingsUsingDFSReplicationTotal,
 			prometheus.CounterValue,
 			connection.BandwidthSavingsUsingDFSReplicationTotal,
-			connection.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionBytesReceivedTotal,
 			prometheus.CounterValue,
 			connection.BytesReceivedTotal,
-			connection.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.CompressedSizeOfFilesReceivedTotal,
-			connection.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.FilesReceivedTotal,
-			connection.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionRDCBytesReceivedTotal,
 			prometheus.CounterValue,
-			connection.RDCBytesReceivedTotal,
-			connection.Name,
+			connection.RdcBytesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionRDCCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection.RDCCompressedSizeOfFilesReceivedTotal,
-			connection.Name,
+			connection.RdcCompressedSizeOfFilesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionRDCSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection.RDCSizeOfFilesReceivedTotal,
-			connection.Name,
+			connection.RdcSizeOfFilesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.connectionRDCNumberofFilesReceivedTotal,
+			c.connectionRDCNumberOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection.RDCNumberofFilesReceivedTotal,
-			connection.Name,
+			connection.RdcNumberOfFilesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.SizeOfFilesReceivedTotal,
-			connection.Name,
+			name,
 		)
 	}
+
 	return nil
 }
 
-// perflibDFSRFolder 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 *Collector) collectFolder(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []perflibDFSRFolder
-	if err := perflib.UnmarshalObject(ctx.PerfObjects["DFS Replicated Folders"], &dst, c.logger); err != nil {
-		return err
+func (c *Collector) collectPDHFolder(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollectorFolder.Collect(&c.perfDataObjectFolder)
+	if err != nil {
+		return fmt.Errorf("failed to collect DFS Replicated Folders metrics: %w", err)
 	}
 
-	for _, folder := range dst {
+	for _, folder := range c.perfDataObjectFolder {
+		name := folder.Name
+
 		ch <- prometheus.MustNewConstMetric(
 			c.folderBandwidthSavingsUsingDFSReplicationTotal,
 			prometheus.CounterValue,
 			folder.BandwidthSavingsUsingDFSReplicationTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.CompressedSizeOfFilesReceivedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.folderConflictBytesCleanedupTotal,
+			c.folderConflictBytesCleanedUpTotal,
 			prometheus.CounterValue,
-			folder.ConflictBytesCleanedupTotal,
-			folder.Name,
+			folder.ConflictBytesCleanedUpTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictBytesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.ConflictBytesGeneratedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictFilesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.ConflictFilesCleanedUpTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictFilesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.ConflictFilesGeneratedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.folderConflictfolderCleanupsCompletedTotal,
+			c.folderConflictFolderCleanupsCompletedTotal,
 			prometheus.CounterValue,
 			folder.ConflictFolderCleanupsCompletedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictSpaceInUse,
 			prometheus.GaugeValue,
 			folder.ConflictSpaceInUse,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedSpaceInUse,
 			prometheus.GaugeValue,
 			folder.DeletedSpaceInUse,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedBytesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.DeletedBytesCleanedUpTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedBytesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.DeletedBytesGeneratedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedFilesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.DeletedFilesCleanedUpTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedFilesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.DeletedFilesGeneratedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderFileInstallsRetriedTotal,
 			prometheus.CounterValue,
 			folder.FileInstallsRetriedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderFileInstallsSucceededTotal,
 			prometheus.CounterValue,
 			folder.FileInstallsSucceededTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.FilesReceivedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderRDCBytesReceivedTotal,
 			prometheus.CounterValue,
-			folder.RDCBytesReceivedTotal,
-			folder.Name,
+			folder.RdcBytesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderRDCCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder.RDCCompressedSizeOfFilesReceivedTotal,
-			folder.Name,
+			folder.RdcCompressedSizeOfFilesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.folderRDCNumberofFilesReceivedTotal,
+			c.folderRDCNumberOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder.RDCNumberofFilesReceivedTotal,
-			folder.Name,
+			folder.RdcNumberOfFilesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderRDCSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder.RDCSizeOfFilesReceivedTotal,
-			folder.Name,
+			folder.RdcSizeOfFilesReceivedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.SizeOfFilesReceivedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingSpaceInUse,
 			prometheus.GaugeValue,
 			folder.StagingSpaceInUse,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingBytesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.StagingBytesCleanedUpTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingBytesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.StagingBytesGeneratedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingFilesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.StagingFilesCleanedUpTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingFilesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.StagingFilesGeneratedTotal,
-			folder.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderUpdatesDroppedTotal,
 			prometheus.CounterValue,
 			folder.UpdatesDroppedTotal,
-			folder.Name,
+			name,
 		)
 	}
+
 	return nil
 }
 
-// perflibDFSRVolume 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 *Collector) collectVolume(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []perflibDFSRVolume
-	if err := perflib.UnmarshalObject(ctx.PerfObjects["DFS Replication Service volumes"], &dst, c.logger); err != nil {
-		return err
+func (c *Collector) collectPDHVolume(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollectorVolume.Collect(&c.perfDataObjectVolume)
+	if err != nil {
+		return fmt.Errorf("failed to collect DFS Replication Volumes metrics: %w", err)
 	}
 
-	for _, volume := range dst {
+	for _, volume := range c.perfDataObjectVolume {
+		name := volume.Name
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeDatabaseLookupsTotal,
 			prometheus.CounterValue,
 			volume.DatabaseLookupsTotal,
-			volume.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeDatabaseCommitsTotal,
 			prometheus.CounterValue,
 			volume.DatabaseCommitsTotal,
-			volume.Name,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeUSNJournalRecordsAcceptedTotal,
 			prometheus.CounterValue,
-			volume.USNJournalRecordsAcceptedTotal,
-			volume.Name,
+			volume.UsnJournalRecordsAcceptedTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeUSNJournalRecordsReadTotal,
 			prometheus.CounterValue,
-			volume.USNJournalRecordsReadTotal,
-			volume.Name,
+			volume.UsnJournalRecordsReadTotal,
+			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeUSNJournalUnreadPercentage,
 			prometheus.GaugeValue,
-			volume.USNJournalUnreadPercentage,
-			volume.Name,
+			volume.UsnJournalUnreadPercentage,
+			name,
 		)
 	}
+
 	return nil
 }

internal/collector/dfsr/dfsr_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package dfsr_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/dfsr"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, dfsr.Name, dfsr.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, dfsr.New, nil)
+}

internal/collector/dfsr/types.go

@@ -0,0 +1,75 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package dfsr
+
+// Connection Perflib: "DFS Replication Service Connections".
+type perfDataCounterValuesConnection struct {
+	Name string
+
+	BandwidthSavingsUsingDFSReplicationTotal float64 `perfdata:"Bandwidth Savings Using DFS Replication"`
+	BytesReceivedTotal                       float64 `perfdata:"Total Bytes Received"`
+	CompressedSizeOfFilesReceivedTotal       float64 `perfdata:"Compressed Size of Files Received"`
+	FilesReceivedTotal                       float64 `perfdata:"Total Files Received"`
+	RdcBytesReceivedTotal                    float64 `perfdata:"RDC Bytes Received"`
+	RdcCompressedSizeOfFilesReceivedTotal    float64 `perfdata:"RDC Compressed Size of Files Received"`
+	RdcNumberOfFilesReceivedTotal            float64 `perfdata:"RDC Number of Files Received"`
+	RdcSizeOfFilesReceivedTotal              float64 `perfdata:"RDC Size of Files Received"`
+	SizeOfFilesReceivedTotal                 float64 `perfdata:"Size of Files Received"`
+}
+
+// Folder Perflib: "DFS Replicated Folder".
+type perfDataCounterValuesFolder struct {
+	Name string
+
+	BandwidthSavingsUsingDFSReplicationTotal float64 `perfdata:"Bandwidth Savings Using DFS Replication"`
+	CompressedSizeOfFilesReceivedTotal       float64 `perfdata:"Compressed Size of Files Received"`
+	ConflictBytesCleanedUpTotal              float64 `perfdata:"Conflict Bytes Cleaned Up"`
+	ConflictBytesGeneratedTotal              float64 `perfdata:"Conflict Bytes Generated"`
+	ConflictFilesCleanedUpTotal              float64 `perfdata:"Conflict Files Cleaned Up"`
+	ConflictFilesGeneratedTotal              float64 `perfdata:"Conflict Files Generated"`
+	ConflictFolderCleanupsCompletedTotal     float64 `perfdata:"Conflict folder Cleanups Completed"`
+	ConflictSpaceInUse                       float64 `perfdata:"Conflict Space In Use"`
+	DeletedSpaceInUse                        float64 `perfdata:"Deleted Space In Use"`
+	DeletedBytesCleanedUpTotal               float64 `perfdata:"Deleted Bytes Cleaned Up"`
+	DeletedBytesGeneratedTotal               float64 `perfdata:"Deleted Bytes Generated"`
+	DeletedFilesCleanedUpTotal               float64 `perfdata:"Deleted Files Cleaned Up"`
+	DeletedFilesGeneratedTotal               float64 `perfdata:"Deleted Files Generated"`
+	FileInstallsRetriedTotal                 float64 `perfdata:"File Installs Retried"`
+	FileInstallsSucceededTotal               float64 `perfdata:"File Installs Succeeded"`
+	FilesReceivedTotal                       float64 `perfdata:"Total Files Received"`
+	RdcBytesReceivedTotal                    float64 `perfdata:"RDC Bytes Received"`
+	RdcCompressedSizeOfFilesReceivedTotal    float64 `perfdata:"RDC Compressed Size of Files Received"`
+	RdcNumberOfFilesReceivedTotal            float64 `perfdata:"RDC Number of Files Received"`
+	RdcSizeOfFilesReceivedTotal              float64 `perfdata:"RDC Size of Files Received"`
+	SizeOfFilesReceivedTotal                 float64 `perfdata:"Size of Files Received"`
+	StagingSpaceInUse                        float64 `perfdata:"Staging Space In Use"`
+	StagingBytesCleanedUpTotal               float64 `perfdata:"Staging Bytes Cleaned Up"`
+	StagingBytesGeneratedTotal               float64 `perfdata:"Staging Bytes Generated"`
+	StagingFilesCleanedUpTotal               float64 `perfdata:"Staging Files Cleaned Up"`
+	StagingFilesGeneratedTotal               float64 `perfdata:"Staging Files Generated"`
+	UpdatesDroppedTotal                      float64 `perfdata:"Updates Dropped"`
+}
+
+// Volume Perflib: "DFS Replication Service Volumes".
+type perfDataCounterValuesVolume struct {
+	Name string
+
+	DatabaseCommitsTotal           float64 `perfdata:"Database Commits"`
+	DatabaseLookupsTotal           float64 `perfdata:"Database Lookups"`
+	UsnJournalRecordsReadTotal     float64 `perfdata:"USN Journal Records Read"`
+	UsnJournalRecordsAcceptedTotal float64 `perfdata:"USN Journal Records Accepted"`
+	UsnJournalUnreadPercentage     float64 `perfdata:"USN Journal Unread Percentage"`
+}

internal/collector/dhcp/dhcp.go

@@ -1,12 +1,28 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dhcp
 
 import (
+	"fmt"
+	"log/slog"
+
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/prometheus-community/windows_exporter/pkg/perflib"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
+	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -14,12 +30,15 @@ const Name = "dhcp"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector perflib DHCP metrics.
 type Collector struct {
 	config Config
-	logger log.Logger
+
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	acksTotal                                        *prometheus.Desc
 	activeQueueLength                                *prometheus.Desc
@@ -29,12 +48,12 @@ type Collector struct {
 	deniedDueToNonMatch                              *prometheus.Desc
 	discoversTotal                                   *prometheus.Desc
 	duplicatesDroppedTotal                           *prometheus.Desc
-	failoverBndackReceivedTotal                      *prometheus.Desc
-	failoverBndackSentTotal                          *prometheus.Desc
-	failoverBndupdDropped                            *prometheus.Desc
-	failoverBndupdPendingOutboundQueue               *prometheus.Desc
-	failoverBndupdReceivedTotal                      *prometheus.Desc
-	failoverBndupdSentTotal                          *prometheus.Desc
+	failoverBndAckReceivedTotal                      *prometheus.Desc
+	failoverBndAckSentTotal                          *prometheus.Desc
+	failoverBndUpdDropped                            *prometheus.Desc
+	failoverBndUpdPendingOutboundQueue               *prometheus.Desc
+	failoverBndUpdReceivedTotal                      *prometheus.Desc
+	failoverBndUpdSentTotal                          *prometheus.Desc
 	failoverTransitionsCommunicationInterruptedState *prometheus.Desc
 	failoverTransitionsPartnerDownState              *prometheus.Desc
 	failoverTransitionsRecoverState                  *prometheus.Desc
@@ -48,7 +67,7 @@ type Collector struct {
 	requestsTotal                                    *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -57,8 +76,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -70,19 +87,20 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	return []string{"DHCP Server"}, nil
-}
-
 func (c *Collector) Close() error {
+	c.perfDataCollector.Close()
+
 	return nil
 }
 
-func (c *Collector) Build() error {
+func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues]("DHCP Server", nil)
+	if err != nil {
+		return fmt.Errorf("failed to create DHCP Server collector: %w", err)
+	}
+
 	c.packetsReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_received_total"),
 		"Total number of packets received by the DHCP server (PacketsReceivedTotal)",
@@ -179,31 +197,31 @@ func (c *Collector) Build() error {
 		nil,
 		nil,
 	)
-	c.failoverBndupdSentTotal = prometheus.NewDesc(
+	c.failoverBndUpdSentTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_sent_total"),
 		"Number of DHCP fail over Binding Update messages sent (FailoverBndupdSentTotal)",
 		nil,
 		nil,
 	)
-	c.failoverBndupdReceivedTotal = prometheus.NewDesc(
+	c.failoverBndUpdReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_received_total"),
 		"Number of DHCP fail over Binding Update messages received (FailoverBndupdReceivedTotal)",
 		nil,
 		nil,
 	)
-	c.failoverBndackSentTotal = prometheus.NewDesc(
+	c.failoverBndAckSentTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndack_sent_total"),
 		"Number of DHCP fail over Binding Ack messages sent (FailoverBndackSentTotal)",
 		nil,
 		nil,
 	)
-	c.failoverBndackReceivedTotal = prometheus.NewDesc(
+	c.failoverBndAckReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndack_received_total"),
 		"Number of DHCP fail over Binding Ack messages received (FailoverBndackReceivedTotal)",
 		nil,
 		nil,
 	)
-	c.failoverBndupdPendingOutboundQueue = prometheus.NewDesc(
+	c.failoverBndUpdPendingOutboundQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_pending_in_outbound_queue"),
 		"Number of pending outbound DHCP fail over Binding Update messages (FailoverBndupdPendingOutboundQueue)",
 		nil,
@@ -227,200 +245,170 @@ func (c *Collector) Build() error {
 		nil,
 		nil,
 	)
-	c.failoverBndupdDropped = prometheus.NewDesc(
+	c.failoverBndUpdDropped = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_dropped_total"),
 		"Total number of DHCP fail over Binding Updates dropped (FailoverBndupdDropped)",
 		nil,
 		nil,
 	)
+
 	return nil
 }
 
-// represents perflib metrics from the DHCP Server class.
-// While the name of a number of perflib metrics would indicate a rate is being returned (E.G. Packets Received/sec),
-// perflib instead returns a counter, hence the "Total" suffix in some of the variable names.
-type dhcpPerf struct {
-	PacketsReceivedTotal                             float64 `perflib:"Packets Received/sec"`
-	DuplicatesDroppedTotal                           float64 `perflib:"Duplicates Dropped/sec"`
-	PacketsExpiredTotal                              float64 `perflib:"Packets Expired/sec"`
-	ActiveQueueLength                                float64 `perflib:"Active Queue Length"`
-	ConflictCheckQueueLength                         float64 `perflib:"Conflict Check Queue Length"`
-	DiscoversTotal                                   float64 `perflib:"Discovers/sec"`
-	OffersTotal                                      float64 `perflib:"Offers/sec"`
-	RequestsTotal                                    float64 `perflib:"Requests/sec"`
-	InformsTotal                                     float64 `perflib:"Informs/sec"`
-	AcksTotal                                        float64 `perflib:"Acks/sec"`
-	NacksTotal                                       float64 `perflib:"Nacks/sec"`
-	DeclinesTotal                                    float64 `perflib:"Declines/sec"`
-	ReleasesTotal                                    float64 `perflib:"Releases/sec"`
-	DeniedDueToMatch                                 float64 `perflib:"Denied due to match."`
-	DeniedDueToNonMatch                              float64 `perflib:"Denied due to match."`
-	OfferQueueLength                                 float64 `perflib:"Offer Queue Length"`
-	FailoverBndupdSentTotal                          float64 `perflib:"Failover: BndUpd sent/sec."`
-	FailoverBndupdReceivedTotal                      float64 `perflib:"Failover: BndUpd received/sec."`
-	FailoverBndackSentTotal                          float64 `perflib:"Failover: BndAck sent/sec."`
-	FailoverBndackReceivedTotal                      float64 `perflib:"Failover: BndAck received/sec."`
-	FailoverBndupdPendingOutboundQueue               float64 `perflib:"Failover: BndUpd pending in outbound queue."`
-	FailoverTransitionsCommunicationinterruptedState float64 `perflib:"Failover: Transitions to COMMUNICATION-INTERRUPTED state."`
-	FailoverTransitionsPartnerdownState              float64 `perflib:"Failover: Transitions to PARTNER-DOWN state."`
-	FailoverTransitionsRecoverState                  float64 `perflib:"Failover: Transitions to RECOVER state."`
-	FailoverBndupdDropped                            float64 `perflib:"Failover: BndUpd Dropped."`
-}
-
-func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dhcpPerfs []dhcpPerf
-	if err := perflib.UnmarshalObject(ctx.PerfObjects["DHCP Server"], &dhcpPerfs, c.logger); err != nil {
-		return err
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
+	if err != nil {
+		return fmt.Errorf("failed to collect DHCP Server metrics: %w", err)
 	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.packetsReceivedTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].PacketsReceivedTotal,
+		c.perfDataObject[0].PacketsReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.duplicatesDroppedTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].DuplicatesDroppedTotal,
+		c.perfDataObject[0].DuplicatesDroppedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.packetsExpiredTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].PacketsExpiredTotal,
+		c.perfDataObject[0].PacketsExpiredTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.activeQueueLength,
 		prometheus.GaugeValue,
-		dhcpPerfs[0].ActiveQueueLength,
+		c.perfDataObject[0].ActiveQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.conflictCheckQueueLength,
 		prometheus.GaugeValue,
-		dhcpPerfs[0].ConflictCheckQueueLength,
+		c.perfDataObject[0].ConflictCheckQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.discoversTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].DiscoversTotal,
+		c.perfDataObject[0].DiscoversTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.offersTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].OffersTotal,
+		c.perfDataObject[0].OffersTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.requestsTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].RequestsTotal,
+		c.perfDataObject[0].RequestsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.informsTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].InformsTotal,
+		c.perfDataObject[0].InformsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.acksTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].AcksTotal,
+		c.perfDataObject[0].AcksTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.nACKsTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].NacksTotal,
+		c.perfDataObject[0].NacksTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.declinesTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].DeclinesTotal,
+		c.perfDataObject[0].DeclinesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.releasesTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].ReleasesTotal,
+		c.perfDataObject[0].ReleasesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.offerQueueLength,
 		prometheus.GaugeValue,
-		dhcpPerfs[0].OfferQueueLength,
+		c.perfDataObject[0].OfferQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.deniedDueToMatch,
 		prometheus.CounterValue,
-		dhcpPerfs[0].DeniedDueToMatch,
+		c.perfDataObject[0].DeniedDueToMatch,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.deniedDueToNonMatch,
 		prometheus.CounterValue,
-		dhcpPerfs[0].DeniedDueToNonMatch,
+		c.perfDataObject[0].DeniedDueToNonMatch,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndupdSentTotal,
+		c.failoverBndUpdSentTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndupdSentTotal,
+		c.perfDataObject[0].FailoverBndUpdSentTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndupdReceivedTotal,
+		c.failoverBndUpdReceivedTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndupdReceivedTotal,
+		c.perfDataObject[0].FailoverBndUpdReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndackSentTotal,
+		c.failoverBndAckSentTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndackSentTotal,
+		c.perfDataObject[0].FailoverBndAckSentTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndackReceivedTotal,
+		c.failoverBndAckReceivedTotal,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndackReceivedTotal,
+		c.perfDataObject[0].FailoverBndAckReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndupdPendingOutboundQueue,
+		c.failoverBndUpdPendingOutboundQueue,
 		prometheus.GaugeValue,
-		dhcpPerfs[0].FailoverBndupdPendingOutboundQueue,
+		c.perfDataObject[0].FailoverBndUpdPendingOutboundQueue,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverTransitionsCommunicationInterruptedState,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverTransitionsCommunicationinterruptedState,
+		c.perfDataObject[0].FailoverTransitionsCommunicationInterruptedState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverTransitionsPartnerDownState,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverTransitionsPartnerdownState,
+		c.perfDataObject[0].FailoverTransitionsPartnerDownState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverTransitionsRecoverState,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverTransitionsRecoverState,
+		c.perfDataObject[0].FailoverTransitionsRecoverState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndupdDropped,
+		c.failoverBndUpdDropped,
 		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndupdDropped,
+		c.perfDataObject[0].FailoverBndUpdDropped,
 	)
 
 	return nil

internal/collector/dhcp/dhcp_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package dhcp_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/internal/collector/dhcp"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, dhcp.Name, dhcp.NewWithFlags)
+}
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, dhcp.New, nil)
+}

internal/collector/dhcp/types.go

@@ -0,0 +1,44 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package dhcp
+
+type perfDataCounterValues struct {
+	AcksTotal                                        float64 `perfdata:"Acks/sec"`
+	ActiveQueueLength                                float64 `perfdata:"Active Queue Length"`
+	ConflictCheckQueueLength                         float64 `perfdata:"Conflict Check Queue Length"`
+	DeclinesTotal                                    float64 `perfdata:"Declines/sec"`
+	DeniedDueToMatch                                 float64 `perfdata:"Denied due to match."`
+	DeniedDueToNonMatch                              float64 `perfdata:"Denied due to match."`
+	DiscoversTotal                                   float64 `perfdata:"Discovers/sec"`
+	DuplicatesDroppedTotal                           float64 `perfdata:"Duplicates Dropped/sec"`
+	FailoverBndAckReceivedTotal                      float64 `perfdata:"Failover: BndAck received/sec."`
+	FailoverBndAckSentTotal                          float64 `perfdata:"Failover: BndAck sent/sec."`
+	FailoverBndUpdDropped                            float64 `perfdata:"Failover: BndUpd Dropped."`
+	FailoverBndUpdPendingOutboundQueue               float64 `perfdata:"Failover: BndUpd pending in outbound queue."`
+	FailoverBndUpdReceivedTotal                      float64 `perfdata:"Failover: BndUpd received/sec."`
+	FailoverBndUpdSentTotal                          float64 `perfdata:"Failover: BndUpd sent/sec."`
+	FailoverTransitionsCommunicationInterruptedState float64 `perfdata:"Failover: Transitions to COMMUNICATION-INTERRUPTED state."`
+	FailoverTransitionsPartnerDownState              float64 `perfdata:"Failover: Transitions to PARTNER-DOWN state."`
+	FailoverTransitionsRecoverState                  float64 `perfdata:"Failover: Transitions to RECOVER state."`
+	InformsTotal                                     float64 `perfdata:"Informs/sec"`
+	NacksTotal                                       float64 `perfdata:"Nacks/sec"`
+	OfferQueueLength                                 float64 `perfdata:"Offer Queue Length"`
+	OffersTotal                                      float64 `perfdata:"Offers/sec"`
+	PacketsExpiredTotal                              float64 `perfdata:"Packets Expired/sec"`
+	PacketsReceivedTotal                             float64 `perfdata:"Packets Received/sec"`
+	ReleasesTotal                                    float64 `perfdata:"Releases/sec"`
+	RequestsTotal                                    float64 `perfdata:"Requests/sec"`
+}

internal/collector/diskdrive/diskdrive.go

@@ -1,32 +1,44 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package diskdrive
 
 import (
 	"errors"
+	"fmt"
+	"log/slog"
 	"strings"
 
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
+	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name           = "diskdrive"
-	win32DiskQuery = "SELECT DeviceID, Model, Caption, Name, Partitions, Size, Status, Availability FROM WIN32_DiskDrive"
-)
+const Name = "diskdrive"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for a few WMI metrics in Win32_DiskDrive.
 type Collector struct {
-	config Config
-	logger log.Logger
+	config    Config
+	miSession *mi.Session
+	miQuery   mi.Query
 
 	availability *prometheus.Desc
 	diskInfo     *prometheus.Desc
@@ -35,7 +47,7 @@ type Collector struct {
 	status       *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) *Collector {
+func New(config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
@@ -44,8 +56,6 @@ func New(logger log.Logger, config *Config) *Collector {
 		config: *config,
 	}
 
-	c.SetLogger(logger)
-
 	return c
 }
 
@@ -57,19 +67,23 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) SetLogger(logger log.Logger) {
-	c.logger = log.With(logger, "collector", Name)
-}
-
-func (c *Collector) GetPerfCounter() ([]string, error) {
-	return []string{}, nil
-}
-
 func (c *Collector) Close() error {
 	return nil
 }
 
-func (c *Collector) Build() error {
+func (c *Collector) Build(_ *slog.Logger, miSession *mi.Session) error {
+	if miSession == nil {
+		return errors.New("miSession is nil")
+	}
+
+	miQuery, err := mi.NewQuery("SELECT DeviceID, Model, Caption, Name, Partitions, Size, Status, Availability FROM WIN32_DiskDrive")
+	if err != nil {
+		return fmt.Errorf("failed to create WMI query: %w", err)
+	}
+
+	c.miQuery = miQuery
+	c.miSession = miSession
+
 	c.diskInfo = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "info"),
 		"General drive information",
@@ -106,20 +120,26 @@ func (c *Collector) Build() error {
 		nil,
 	)
 
+	var dst []diskDrive
+	if err := c.miSession.Query(&dst, mi.NamespaceRootCIMv2, c.miQuery); err != nil {
+		return fmt.Errorf("WMI query failed: %w", err)
+	}
+
 	return nil
 }
 
-type win32_DiskDrive struct {
-	DeviceID     string
-	Model        string
-	Size         uint64
-	Name         string
-	Caption      string
-	Partitions   uint32
-	Status       string
-	Availability uint16
+type diskDrive struct {
+	DeviceID     string `mi:"DeviceID"`
+	Model        string `mi:"Model"`
+	Size         uint64 `mi:"Size"`
+	Name         string `mi:"Name"`
+	Caption      string `mi:"Caption"`
+	Partitions   uint32 `mi:"Partitions"`
+	Status       string `mi:"Status"`
+	Availability uint16 `mi:"Availability"`
 }
 
+//nolint:gochecknoglobals
 var (
 	allDiskStatus = []string{
 		"OK",
@@ -162,33 +182,27 @@ var (
 )
 
 // Collect sends the metric values for each metric to the provided prometheus Metric channel.
-func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting disk_drive_info metrics", "err", err)
-		return err
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	var dst []diskDrive
+	if err := c.miSession.Query(&dst, mi.NamespaceRootCIMv2, c.miQuery); err != nil {
+		return fmt.Errorf("WMI query failed: %w", err)
 	}
-	return nil
-}
 
-func (c *Collector) collect(ch chan<- prometheus.Metric) error {
-	var dst []win32_DiskDrive
-
-	if err := wmi.Query(win32DiskQuery, &dst); err != nil {
-		return err
-	}
 	if len(dst) == 0 {
 		return errors.New("WMI query returned empty result set")
 	}
 
 	for _, disk := range dst {
+		distName := strings.Trim(disk.Name, `\.`)
+
 		ch <- prometheus.MustNewConstMetric(
 			c.diskInfo,
 			prometheus.GaugeValue,
 			1.0,
-			strings.Trim(disk.DeviceID, "\\.\\"), //nolint:staticcheck
+			strings.Trim(disk.DeviceID, `\.`),
 			strings.TrimRight(disk.Model, " "),
 			strings.TrimRight(disk.Caption, " "),
-			strings.TrimRight(disk.Name, "\\.\\"), //nolint:staticcheck
+			distName,
 		)
 
 		for _, status := range allDiskStatus {
@@ -201,7 +215,7 @@ func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 				c.status,
 				prometheus.GaugeValue,
 				isCurrentState,
-				strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
+				distName,
 				status,
 			)
 		}
@@ -210,14 +224,14 @@ func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 			c.size,
 			prometheus.GaugeValue,
 			float64(disk.Size),
-			strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
+			distName,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.partitions,
 			prometheus.GaugeValue,
 			float64(disk.Partitions),
-			strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
+			distName,
 		)
 
 		for availNum, val := range availMap {
@@ -229,7 +243,7 @@ func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 				c.availability,
 				prometheus.GaugeValue,
 				isCurrentState,
-				strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
+				distName,
 				val,
 			)
 		}