Update AppVeyor configuration

Fix README AppVeyor links

.golangci.yaml

@@ -0,0 +1,23 @@
+linters:
+  disable-all: true
+  enable:
+  - deadcode
+  - errcheck
+  - golint
+  - govet
+  - gofmt
+  - ineffassign
+  - interfacer
+  - structcheck
+  - unconvert
+  - varcheck
+
+issues:
+  exclude:
+  - don't use underscores in Go names
+  - exported type .+ should have comment or be unexported
+  exclude-rules:
+  - # Golint has many capitalisation complaints on WMI class names
+    text: "`?\\w+`? should be `?\\w+`?"
+    linters:
+    - golint

.promu.yml

@@ -1,14 +1,14 @@
 repository:
-    path: github.com/martinlindhe/wmi_exporter
+    path: github.com/prometheus-community/windows_exporter
 build:
     binaries:
-        - name: wmi_exporter
+        - name: windows_exporter
     ldflags: |
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
+        -X github.com/prometheus/common/version.Version={{.Version}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
+        -X github.com/prometheus/common/version.Revision={{.Revision}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
+        -X github.com/prometheus/common/version.Branch={{.Branch}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+        -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+        -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 tarball:
     files:
         - LICENSE

Gopkg.lock

@@ -1,175 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  digest = "1:3ccf8ba7afe02fd470c4f07d6eea4d0e6875da3d129f95b925f2003ce5dd2024"
-  name = "github.com/StackExchange/wmi"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
-  version = "1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:f3793f8a708522400cef1dba23385e901aede5519f68971fd69938ef330b07a1"
-  name = "github.com/alecthomas/template"
-  packages = [
-    ".",
-    "parse",
-  ]
-  pruneopts = "NUT"
-  revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
-
-[[projects]]
-  branch = "master"
-  digest = "1:fdd419e104ec26bb5bd63cc62637c640453ed2929a7453f3afadbd9a0223da66"
-  name = "github.com/alecthomas/units"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
-
-[[projects]]
-  branch = "master"
-  digest = "1:cb0535f5823b47df7dcb9768ebb6c000b79ad115472910c70efe93c9ed9b2315"
-  name = "github.com/beorn7/perks"
-  packages = ["quantile"]
-  pruneopts = "NUT"
-  revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
-
-[[projects]]
-  digest = "1:f9adc21a937e5da643ea14a3488cb7506788876737a5e205394e508627a6eec8"
-  name = "github.com/dimchansky/utfbom"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "d2133a1ce379ef6fa992b0514a77146c60db9d1c"
-  version = "v1.1.0"
-
-[[projects]]
-  digest = "1:cb4e216bd9f58866f42dc65893455b24f879b026fdaa1ecc3aafff625fdb5a66"
-  name = "github.com/go-ole/go-ole"
-  packages = [
-    ".",
-    "oleutil",
-  ]
-  pruneopts = "NUT"
-  revision = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"
-  version = "v1.2.1"
-
-[[projects]]
-  digest = "1:9f35c1344b56e5868d511d231f215edd0650aa572664f856444affdd256e43e4"
-  name = "github.com/golang/protobuf"
-  packages = ["proto"]
-  pruneopts = "NUT"
-  revision = "925541529c1fa6821df4e44ce2723319eb2be768"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6"
-  name = "github.com/matttproud/golang_protobuf_extensions"
-  packages = ["pbutil"]
-  pruneopts = "NUT"
-  revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:03bca087b180bf24c4f9060775f137775550a0834e18f0bca0520a868679dbd7"
-  name = "github.com/prometheus/client_golang"
-  packages = [
-    "prometheus",
-    "prometheus/promhttp",
-  ]
-  pruneopts = "NUT"
-  revision = "c5b7fccd204277076155f10851dad72b76a49317"
-  version = "v0.8.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:32d10bdfa8f09ecf13598324dba86ab891f11db3c538b6a34d1c3b5b99d7c36b"
-  name = "github.com/prometheus/client_model"
-  packages = ["go"]
-  pruneopts = "NUT"
-  revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ce98e83b2b9486b6a9ce5e44fd4097c64e8f2f0eaa6c5041a8f12d3aaa5c17b3"
-  name = "github.com/prometheus/common"
-  packages = [
-    "expfmt",
-    "internal/bitbucket.org/ww/goautoneg",
-    "log",
-    "model",
-    "version",
-  ]
-  pruneopts = "NUT"
-  revision = "e4aa40a9169a88835b849a6efb71e05dc04b88f0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:61a95e8d3e39e94207fba1b56d3c2182a356a1e41017aa647f523ae964b6bb0c"
-  name = "github.com/prometheus/procfs"
-  packages = [
-    ".",
-    "internal/util",
-    "nfs",
-    "xfs",
-  ]
-  pruneopts = "NUT"
-  revision = "54d17b57dd7d4a3aa092476596b3f8a933bde349"
-
-[[projects]]
-  digest = "1:6989062eb7ccf25cf38bf4fe3dba097ee209f896cda42cefdca3927047bef7b6"
-  name = "github.com/sirupsen/logrus"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
-  version = "v1.0.5"
-
-[[projects]]
-  branch = "master"
-  digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8"
-  name = "golang.org/x/crypto"
-  packages = ["ssh/terminal"]
-  pruneopts = "NUT"
-  revision = "182114d582623c1caa54f73de9c7224e23a48487"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ea69008276e11262595a1f9a279ffd51d93e21c32c13b0f81856e962c6f607dd"
-  name = "golang.org/x/sys"
-  packages = [
-    "unix",
-    "windows",
-    "windows/registry",
-    "windows/svc",
-    "windows/svc/eventlog",
-  ]
-  pruneopts = "NUT"
-  revision = "8c0ece68c28377f4c326d85b94f8df0dace46f80"
-
-[[projects]]
-  digest = "1:22b2dee6f30bc8601f087449a2a819df8388e54e9547349c658f14d8f8c590f2"
-  name = "gopkg.in/alecthomas/kingpin.v2"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "947dcec5ba9c011838740e680966fd7087a71d0d"
-  version = "v2.2.6"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/StackExchange/wmi",
-    "github.com/dimchansky/utfbom",
-    "github.com/prometheus/client_golang/prometheus",
-    "github.com/prometheus/client_golang/prometheus/promhttp",
-    "github.com/prometheus/client_model/go",
-    "github.com/prometheus/common/expfmt",
-    "github.com/prometheus/common/log",
-    "github.com/prometheus/common/version",
-    "golang.org/x/sys/windows/registry",
-    "golang.org/x/sys/windows/svc",
-    "gopkg.in/alecthomas/kingpin.v2",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1

Gopkg.toml

@@ -1,4 +0,0 @@
-[prune]
-  non-go = true
-  go-tests = true
-  unused-packages = true

Makefile

@@ -7,7 +7,7 @@ test:
 	go test -v ./...
 
 lint:
-	gometalinter --vendor --config gometalinter.config ./...
+	golangci-lint -c .golangci.yaml run
 
 fmt:
 	gofmt -l -w -s .

README.md

@@ -1,8 +1,8 @@
-# WMI exporter
+# windows_exporter
 
-[![Build status](https://ci.appveyor.com/api/projects/status/ljwan71as6pf2joe?svg=true)](https://ci.appveyor.com/project/martinlindhe/wmi-exporter)
+[![Build status](https://ci.appveyor.com/api/projects/status/xoym3fftr7giasiw/branch/master?svg=true)](https://ci.appveyor.com/project/prometheus-community/windows-exporter)
 
-Prometheus exporter for Windows machines, using the WMI (Windows Management Instrumentation).
+A Prometheus exporter for Windows machines.
 
 
 ## Collectors
@@ -10,10 +10,12 @@ Prometheus exporter for Windows machines, using the WMI (Windows Management Inst
 Name     | Description | Enabled by default
 ---------|-------------|--------------------
 [ad](docs/collector.ad.md) | Active Directory Domain Services |
+[adfs](docs/collector.adfs.md) | Active Directory Federation Services |
 [cpu](docs/collector.cpu.md) | CPU usage | ✓
 [cs](docs/collector.cs.md) | "Computer System" metrics (system properties, num cpus/total memory) | ✓
 [container](docs/collector.container.md) | Container metrics |
 [dns](docs/collector.dns.md) | DNS Server |
+[exchange](docs/collector.exchange.md) | Exchange metrics |
 [hyperv](docs/collector.hyperv.md) | Hyper-V hosts |
 [iis](docs/collector.iis.md) | IIS sites and applications |
 [logical_disk](docs/collector.logical_disk.md) | Logical disks, disk I/O | ✓
@@ -32,19 +34,21 @@ Name     | Description | Enabled by default
 [net](docs/collector.net.md) | Network interface I/O | ✓
 [os](docs/collector.os.md) | OS metrics (memory, processes, users) | ✓
 [process](docs/collector.process.md) | Per-process metrics |
+[remote_fx](docs/collector.remote_fx.md) | RemoteFX protocol (RDP) metrics |
 [service](docs/collector.service.md) | Service state metrics | ✓
 [system](docs/collector.system.md) | System calls | ✓
 [tcp](docs/collector.tcp.md) | TCP connections |
 [thermalzone](docs/collector.thermalzone.md) | Thermal information
+[terminal_services](docs/collector.terminal_services.md) | Terminal services (RDS)
 [textfile](docs/collector.textfile.md) | Read prometheus metrics from a text file | ✓
 [vmware](docs/collector.vmware.md) | Performance counters installed by the Vmware Guest agent |
 
 See the linked documentation on each collector for more information on reported metrics, configuration settings and usage examples.
 
 ## Installation
-The latest release can be downloaded from the [releases page](https://github.com/martinlindhe/wmi_exporter/releases).
+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 WMI Exporter as a Windows service, as well as create an exception in the Windows Firewall.
+Each release provides a .msi installer. The installer will setup the 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:
 
@@ -68,19 +72,23 @@ Example service collector with a custom query.
 msiexec /i <path-to-msi-file> ENABLED_COLLECTORS=os,service --% EXTRA_FLAGS="--collector.service.services-where ""Name LIKE 'sql%'"""
 ```
 
+On some older versions of Windows you may need to surround parameter values with double quotes to get the install command parsing properly:
+```powershell
+msiexec /i C:\Users\Administrator\Downloads\windows_exporter.msi ENABLED_COLLECTORS="ad,iis,logon,memory,process,tcp,thermalzone" TEXTFILE_DIR="C:\custom_metrics\"
+```
+
 ## Roadmap
 
-See [open issues](https://github.com/martinlindhe/wmi_exporter/issues)
+See [open issues](https://github.com/prometheus-community/windows_exporter/issues)
 
 
 ## Usage
 
-    go get -u github.com/golang/dep
     go get -u github.com/prometheus/promu
-    go get -u github.com/martinlindhe/wmi_exporter
+    go get -u github.com/prometheus-community/windows_exporter
-    cd $env:GOPATH/src/github.com/martinlindhe/wmi_exporter
+    cd $env:GOPATH/src/github.com/prometheus-community/windows_exporter
     promu build -v .
-    .\wmi_exporter.exe
+    .\windows_exporter.exe
 
 The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182)
 
@@ -88,15 +96,13 @@ The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182
 
 ### Enable only service collector and specify a custom query
 
-    .\wmi_exporter.exe --collectors.enabled "service" --collector.service.services-where "Name='wmi_exporter'"
+    .\windows_exporter.exe --collectors.enabled "service" --collector.service.services-where "Name='windows_exporter'"
 
 ### Enable only process collector and specify a custom query
 
-    .\wmi_exporter.exe --collectors.enabled "process" --collector.process.processes-where "Name LIKE 'firefox%'"
+    .\windows_exporter.exe --collectors.enabled "process" --collector.process.whitelist="firefox.+"
 
-When there are multiple processes with the same name, WMI represents those after the first instance as `process-name#index`. So to get them all, rather than just the first one, the query needs to be a wildcard search using a `%` character.
+When there are multiple processes with the same name, WMI represents those after the first instance as `process-name#index`. So to get them all, rather than just the first one, the [regular expression](https://en.wikipedia.org/wiki/Regular_expression) must use `.+`. See [process](docs/collector.process.md) for more information.
-
-Please note that in Windows batch scripts (and when using the `cmd` command prompt), the `%` character is reserved, so it has to be escaped with another `%`. For example, the wildcard syntax for searching for all firefox processes is `firefox%%`.
 
 
 ## License

appveyor.yml

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

collector/ad.go

@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	Factories["ad"] = NewADCollector
+	registerCollector("ad", NewADCollector)
 }
 
 // A ADCollector is a Prometheus collector for WMI Win32_PerfRawData_DirectoryServices_DirectoryServices metrics

collector/adfs.go

@@ -0,0 +1,188 @@
+// +build windows
+
+package collector
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+func init() {
+	registerCollector("adfs", newADFSCollector, "AD FS")
+}
+
+type adfsCollector struct {
+	adLoginConnectionFailures        *prometheus.Desc
+	certificateAuthentications       *prometheus.Desc
+	deviceAuthentications            *prometheus.Desc
+	extranetAccountLockouts          *prometheus.Desc
+	federatedAuthentications         *prometheus.Desc
+	passportAuthentications          *prometheus.Desc
+	passiveRequests                  *prometheus.Desc
+	passwordChangeFailed             *prometheus.Desc
+	passwordChangeSucceeded          *prometheus.Desc
+	tokenRequests                    *prometheus.Desc
+	windowsIntegratedAuthentications *prometheus.Desc
+}
+
+// newADFSCollector constructs a new adfsCollector
+func newADFSCollector() (Collector, error) {
+	const subsystem = "adfs"
+
+	return &adfsCollector{
+		adLoginConnectionFailures: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "ad_login_connection_failures"),
+			"Total number of connection failures to an Active Directory domain controller",
+			nil,
+			nil,
+		),
+		certificateAuthentications: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "certificate_authentications"),
+			"Total number of User Certificate authentications",
+			nil,
+			nil,
+		),
+		deviceAuthentications: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "device_authentications"),
+			"Total number of Device authentications",
+			nil,
+			nil,
+		),
+		extranetAccountLockouts: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "extranet_account_lockouts"),
+			"Total number of Extranet Account Lockouts",
+			nil,
+			nil,
+		),
+		federatedAuthentications: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "federated_authentications"),
+			"Total number of authentications from a federated source",
+			nil,
+			nil,
+		),
+		passportAuthentications: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "passport_authentications"),
+			"Total number of Microsoft Passport SSO authentications",
+			nil,
+			nil,
+		),
+		passiveRequests: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "passive_requests"),
+			"Total number of passive (browser-based) requests",
+			nil,
+			nil,
+		),
+		passwordChangeFailed: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "password_change_failed"),
+			"Total number of failed password changes",
+			nil,
+			nil,
+		),
+		passwordChangeSucceeded: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "password_change_succeeded"),
+			"Total number of successful password changes",
+			nil,
+			nil,
+		),
+		tokenRequests: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "token_requests"),
+			"Total number of token requests",
+			nil,
+			nil,
+		),
+		windowsIntegratedAuthentications: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "windows_integrated_authentications"),
+			"Total number of Windows integrated authentications (Kerberos/NTLM)",
+			nil,
+			nil,
+		),
+	}, nil
+}
+
+type perflibADFS struct {
+	AdLoginConnectionFailures        float64 `perflib:"AD login Connection Failures"`
+	CertificateAuthentications       float64 `perflib:"Certificate Authentications"`
+	DeviceAuthentications            float64 `perflib:"Device Authentications"`
+	ExtranetAccountLockouts          float64 `perflib:"Extranet Account Lockouts"`
+	FederatedAuthentications         float64 `perflib:"Federated Authentications"`
+	PassportAuthentications          float64 `perflib:"Microsoft Passport Authentications"`
+	PassiveRequests                  float64 `perflib:"Passive Requests"`
+	PasswordChangeFailed             float64 `perflib:"Password Change Failed Requests"`
+	PasswordChangeSucceeded          float64 `perflib:"Password Change Successful Requests"`
+	TokenRequests                    float64 `perflib:"Token Requests"`
+	WindowsIntegratedAuthentications float64 `perflib:"Windows Integrated Authentications"`
+}
+
+func (c *adfsCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
+	var adfsData []perflibADFS
+	err := unmarshalObject(ctx.perfObjects["AD FS"], &adfsData)
+	if err != nil {
+		return err
+	}
+
+	ch <- prometheus.MustNewConstMetric(
+		c.adLoginConnectionFailures,
+		prometheus.CounterValue,
+		adfsData[0].AdLoginConnectionFailures,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.certificateAuthentications,
+		prometheus.CounterValue,
+		adfsData[0].CertificateAuthentications,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.deviceAuthentications,
+		prometheus.CounterValue,
+		adfsData[0].DeviceAuthentications,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.extranetAccountLockouts,
+		prometheus.CounterValue,
+		adfsData[0].ExtranetAccountLockouts,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.federatedAuthentications,
+		prometheus.CounterValue,
+		adfsData[0].FederatedAuthentications,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.passportAuthentications,
+		prometheus.CounterValue,
+		adfsData[0].PassportAuthentications,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.passiveRequests,
+		prometheus.CounterValue,
+		adfsData[0].PassiveRequests,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.passwordChangeFailed,
+		prometheus.CounterValue,
+		adfsData[0].PasswordChangeFailed,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.passwordChangeSucceeded,
+		prometheus.CounterValue,
+		adfsData[0].PasswordChangeSucceeded,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.tokenRequests,
+		prometheus.CounterValue,
+		adfsData[0].TokenRequests,
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.windowsIntegratedAuthentications,
+		prometheus.CounterValue,
+		adfsData[0].WindowsIntegratedAuthentications,
+	)
+	return nil
+}

collector/collector.go

@@ -1,7 +1,9 @@
 package collector
 
 import (
+	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/leoluk/perflib_exporter/perflib"
 	"github.com/prometheus/client_golang/prometheus"
@@ -12,7 +14,7 @@ import (
 // ...
 const (
 	// TODO: Make package-local
-	Namespace = "wmi"
+	Namespace = "windows"
 
 	// Conversion factors
 	ticksToSecondsScaleFactor = 1 / 1e7
@@ -47,8 +49,45 @@ func getWindowsVersion() float64 {
 	return currentv_flt
 }
 
-// Factories ...
+type collectorBuilder func() (Collector, error)
-var Factories = make(map[string]func() (Collector, error))
+
+var (
+	builders                = make(map[string]collectorBuilder)
+	perfCounterDependencies = make(map[string]string)
+)
+
+func registerCollector(name string, builder collectorBuilder, perfCounterNames ...string) {
+	builders[name] = builder
+	perfIndicies := make([]string, 0, len(perfCounterNames))
+	for _, cn := range perfCounterNames {
+		perfIndicies = append(perfIndicies, MapCounterToIndex(cn))
+	}
+	perfCounterDependencies[name] = strings.Join(perfIndicies, " ")
+}
+
+func Available() []string {
+	cs := make([]string, 0, len(builders))
+	for c := range builders {
+		cs = append(cs, c)
+	}
+	return cs
+}
+func Build(collector string) (Collector, error) {
+	builder, exists := builders[collector]
+	if !exists {
+		return nil, fmt.Errorf("Unknown collector %q", collector)
+	}
+	return builder()
+}
+func getPerfQuery(collectors []string) string {
+	parts := make([]string, 0, len(collectors))
+	for _, c := range collectors {
+		if p := perfCounterDependencies[c]; p != "" {
+			parts = append(parts, p)
+		}
+	}
+	return strings.Join(parts, " ")
+}
 
 // Collector is the interface a collector has to implement.
 type Collector interface {
@@ -61,8 +100,9 @@ type ScrapeContext struct {
 }
 
 // PrepareScrapeContext creates a ScrapeContext to be used during a single scrape
-func PrepareScrapeContext() (*ScrapeContext, error) {
+func PrepareScrapeContext(collectors []string) (*ScrapeContext, error) {
-	objs, err := getPerflibSnapshot()
+	q := getPerfQuery(collectors) // TODO: Memoize
+	objs, err := getPerflibSnapshot(q)
 	if err != nil {
 		return nil, err
 	}

collector/container.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["container"] = NewContainerMetricsCollector
+	registerCollector("container", NewContainerMetricsCollector)
 }
 
 // A ContainerMetricsCollector is a Prometheus collector for containers metrics

collector/cpu.go

@@ -9,7 +9,14 @@ import (
 )
 
 func init() {
-	Factories["cpu"] = newCPUCollector
+	var deps string
+	// See below for 6.05 magic value
+	if getWindowsVersion() > 6.05 {
+		deps = "Processor Information"
+	} else {
+		deps = "Processor"
+	}
+	registerCollector("cpu", newCPUCollector, deps)
 }
 
 type cpuCollectorBasic struct {
@@ -38,7 +45,7 @@ func newCPUCollector() (Collector, error) {
 	version := getWindowsVersion()
 	// For Windows 2008 (version 6.0) or earlier we only have the "Processor"
 	// class. As of Windows 2008 R2 (version 6.1) the more detailed
-	// "ProcessorInformation" set is available (although some of the counters
+	// "Processor Information" set is available (although some of the counters
 	// are added in later versions, so we aren't guaranteed to get all of
 	// them).
 	// Value 6.05 was selected to split between Windows versions.

collector/cs.go

@@ -11,13 +11,14 @@ import (
 )
 
 func init() {
-	Factories["cs"] = NewCSCollector
+	registerCollector("cs", NewCSCollector)
 }
 
 // A CSCollector is a Prometheus collector for WMI metrics
 type CSCollector struct {
 	PhysicalMemoryBytes *prometheus.Desc
 	LogicalProcessors   *prometheus.Desc
+	Hostname            *prometheus.Desc
 }
 
 // NewCSCollector ...
@@ -37,6 +38,15 @@ func NewCSCollector() (Collector, error) {
 			nil,
 			nil,
 		),
+		Hostname: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "hostname"),
+			"Labeled system hostname information as provided by ComputerSystem.DNSHostName and ComputerSystem.Domain",
+			[]string{
+				"hostname",
+				"domain",
+				"fqdn"},
+			nil,
+		),
 	}, nil
 }
 
@@ -55,6 +65,9 @@ func (c *CSCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) e
 type Win32_ComputerSystem struct {
 	NumberOfLogicalProcessors uint32
 	TotalPhysicalMemory       uint64
+	DNSHostname               string
+	Domain                    string
+	Workgroup                 *string
 }
 
 func (c *CSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
@@ -79,5 +92,21 @@ func (c *CSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, er
 		float64(dst[0].TotalPhysicalMemory),
 	)
 
+	var fqdn string
+	if dst[0].Workgroup == nil || dst[0].Domain != *dst[0].Workgroup {
+		fqdn = dst[0].DNSHostname + "." + dst[0].Domain
+	} else {
+		fqdn = dst[0].DNSHostname
+	}
+
+	ch <- prometheus.MustNewConstMetric(
+		c.Hostname,
+		prometheus.GaugeValue,
+		1.0,
+		dst[0].DNSHostname,
+		dst[0].Domain,
+		fqdn,
+	)
+
 	return nil, nil
 }

collector/dhcp.go

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

collector/dns.go

@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	Factories["dns"] = NewDNSCollector
+	registerCollector("dns", NewDNSCollector)
 }
 
 // A DNSCollector is a Prometheus collector for WMI Win32_PerfRawData_DNS_DNS metrics

collector/exchange.go

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

collector/hyperv.go

@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	Factories["hyperv"] = NewHyperVCollector
+	registerCollector("hyperv", NewHyperVCollector)
 }
 
 // HyperVCollector is a Prometheus collector for hyper-v

collector/iis.go

@@ -16,7 +16,7 @@ import (
 )
 
 func init() {
-	Factories["iis"] = NewIISCollector
+	registerCollector("iis", NewIISCollector)
 }
 
 type simple_version struct {

collector/logical_disk.go

@@ -6,14 +6,13 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func init() {
-	Factories["logical_disk"] = NewLogicalDiskCollector
+	registerCollector("logical_disk", NewLogicalDiskCollector, "LogicalDisk")
 }
 
 var (
@@ -27,7 +26,7 @@ var (
 	).Default("").String()
 )
 
-// A LogicalDiskCollector is a Prometheus collector for WMI Win32_PerfRawData_PerfDisk_LogicalDisk metrics
+// A LogicalDiskCollector is a Prometheus collector for perflib logicalDisk metrics
 type LogicalDiskCollector struct {
 	RequestsQueued   *prometheus.Desc
 	ReadBytesTotal   *prometheus.Desc
@@ -159,7 +158,7 @@ func NewLogicalDiskCollector() (Collector, error) {
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *LogicalDiskCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
+	if desc, err := c.collect(ctx, ch); err != nil {
 		log.Error("failed collecting logical_disk metrics:", desc, err)
 		return err
 	}
@@ -169,28 +168,27 @@ func (c *LogicalDiskCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.
 // Win32_PerfRawData_PerfDisk_LogicalDisk docs:
 // - https://msdn.microsoft.com/en-us/windows/hardware/aa394307(v=vs.71) - Win32_PerfRawData_PerfDisk_LogicalDisk class
 // - https://msdn.microsoft.com/en-us/library/ms803973.aspx - LogicalDisk object reference
-type Win32_PerfRawData_PerfDisk_LogicalDisk struct {
+type logicalDisk struct {
 	Name                   string
-	CurrentDiskQueueLength uint32
+	CurrentDiskQueueLength float64 `perflib:"Current Disk Queue Length"`
-	DiskReadBytesPerSec    uint64
+	DiskReadBytesPerSec    float64 `perflib:"Disk Read Bytes/sec"`
-	DiskReadsPerSec        uint32
+	DiskReadsPerSec        float64 `perflib:"Disk Reads/sec"`
-	DiskWriteBytesPerSec   uint64
+	DiskWriteBytesPerSec   float64 `perflib:"Disk Write Bytes/sec"`
-	DiskWritesPerSec       uint32
+	DiskWritesPerSec       float64 `perflib:"Disk Writes/sec"`
-	PercentDiskReadTime    uint64
+	PercentDiskReadTime    float64 `perflib:"% Disk Read Time"`
-	PercentDiskWriteTime   uint64
+	PercentDiskWriteTime   float64 `perflib:"% Disk Write Time"`
-	PercentFreeSpace       uint32
+	PercentFreeSpace       float64 `perflib:"% Free Space_Base"`
-	PercentFreeSpace_Base  uint32
+	PercentFreeSpace_Base  float64 `perflib:"Free Megabytes"`
-	PercentIdleTime        uint64
+	PercentIdleTime        float64 `perflib:"% Idle Time"`
-	SplitIOPerSec          uint32
+	SplitIOPerSec          float64 `perflib:"Split IO/Sec"`
-	AvgDiskSecPerRead      uint64
+	AvgDiskSecPerRead      float64 `perflib:"Avg. Disk sec/Read"`
-	AvgDiskSecPerWrite     uint64
+	AvgDiskSecPerWrite     float64 `perflib:"Avg. Disk sec/Write"`
-	AvgDiskSecPerTransfer  uint64
+	AvgDiskSecPerTransfer  float64 `perflib:"Avg. Disk sec/Transfer"`
 }
 
-func (c *LogicalDiskCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *LogicalDiskCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []Win32_PerfRawData_PerfDisk_LogicalDisk
+	var dst []logicalDisk
-	q := queryAll(&dst)
+	if err := unmarshalObject(ctx.perfObjects["LogicalDisk"], &dst); err != nil {
-	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
 
@@ -204,98 +202,98 @@ func (c *LogicalDiskCollector) collect(ch chan<- prometheus.Metric) (*prometheus
 		ch <- prometheus.MustNewConstMetric(
 			c.RequestsQueued,
 			prometheus.GaugeValue,
-			float64(volume.CurrentDiskQueueLength),
+			volume.CurrentDiskQueueLength,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.ReadBytesTotal,
 			prometheus.CounterValue,
-			float64(volume.DiskReadBytesPerSec),
+			volume.DiskReadBytesPerSec,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.ReadsTotal,
 			prometheus.CounterValue,
-			float64(volume.DiskReadsPerSec),
+			volume.DiskReadsPerSec,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.WriteBytesTotal,
 			prometheus.CounterValue,
-			float64(volume.DiskWriteBytesPerSec),
+			volume.DiskWriteBytesPerSec,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.WritesTotal,
 			prometheus.CounterValue,
-			float64(volume.DiskWritesPerSec),
+			volume.DiskWritesPerSec,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.ReadTime,
 			prometheus.CounterValue,
-			float64(volume.PercentDiskReadTime)*ticksToSecondsScaleFactor,
+			volume.PercentDiskReadTime,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.WriteTime,
 			prometheus.CounterValue,
-			float64(volume.PercentDiskWriteTime)*ticksToSecondsScaleFactor,
+			volume.PercentDiskWriteTime,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.FreeSpace,
 			prometheus.GaugeValue,
-			float64(volume.PercentFreeSpace)*1024*1024,
+			volume.PercentFreeSpace_Base*1024*1024,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.TotalSpace,
 			prometheus.GaugeValue,
-			float64(volume.PercentFreeSpace_Base)*1024*1024,
+			volume.PercentFreeSpace*1024*1024,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.IdleTime,
 			prometheus.CounterValue,
-			float64(volume.PercentIdleTime)*ticksToSecondsScaleFactor,
+			volume.PercentIdleTime,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.SplitIOs,
 			prometheus.CounterValue,
-			float64(volume.SplitIOPerSec),
+			volume.SplitIOPerSec,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.ReadLatency,
 			prometheus.CounterValue,
-			float64(volume.AvgDiskSecPerRead),
+			volume.AvgDiskSecPerRead*ticksToSecondsScaleFactor,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.WriteLatency,
 			prometheus.CounterValue,
-			float64(volume.AvgDiskSecPerWrite),
+			volume.AvgDiskSecPerWrite*ticksToSecondsScaleFactor,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.ReadWriteLatency,
 			prometheus.CounterValue,
-			float64(volume.AvgDiskSecPerTransfer),
+			volume.AvgDiskSecPerTransfer*ticksToSecondsScaleFactor,
 			volume.Name,
 		)
 	}

collector/logon.go

@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	Factories["logon"] = NewLogonCollector
+	registerCollector("logon", NewLogonCollector)
 }
 
 // A LogonCollector is a Prometheus collector for WMI metrics

collector/memory.go

@@ -6,16 +6,15 @@
 package collector
 
 import (
-	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
 )
 
 func init() {
-	Factories["memory"] = NewMemoryCollector
+	registerCollector("memory", NewMemoryCollector, "Memory")
 }
 
-// A MemoryCollector is a Prometheus collector for WMI Win32_PerfRawData_PerfOS_Memory metrics
+// A MemoryCollector is a Prometheus collector for perflib Memory metrics
 type MemoryCollector struct {
 	AvailableBytes                  *prometheus.Desc
 	CacheBytes                      *prometheus.Desc
@@ -257,247 +256,246 @@ func NewMemoryCollector() (Collector, error) {
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *MemoryCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
+	if desc, err := c.collect(ctx, ch); err != nil {
 		log.Error("failed collecting memory metrics:", desc, err)
 		return err
 	}
 	return nil
 }
 
-type Win32_PerfRawData_PerfOS_Memory struct {
+type memory struct {
-	AvailableBytes                  uint64
+	AvailableBytes                  float64 `perflib:"Available Bytes"`
-	AvailableKBytes                 uint64
+	AvailableKBytes                 float64 `perflib:"Available KBytes"`
-	AvailableMBytes                 uint64
+	AvailableMBytes                 float64 `perflib:"Available MBytes"`
-	CacheBytes                      uint64
+	CacheBytes                      float64 `perflib:"Cache Bytes"`
-	CacheBytesPeak                  uint64
+	CacheBytesPeak                  float64 `perflib:"Cache Bytes Peak"`
-	CacheFaultsPersec               uint32
+	CacheFaultsPersec               float64 `perflib:"Cache Faults/sec"`
-	CommitLimit                     uint64
+	CommitLimit                     float64 `perflib:"Commit Limit"`
-	CommittedBytes                  uint64
+	CommittedBytes                  float64 `perflib:"Committed Bytes"`
-	DemandZeroFaultsPersec          uint32
+	DemandZeroFaultsPersec          float64 `perflib:"Demand Zero Faults/sec"`
-	FreeAndZeroPageListBytes        uint64
+	FreeAndZeroPageListBytes        float64 `perflib:"Free & Zero Page List Bytes"`
-	FreeSystemPageTableEntries      uint32
+	FreeSystemPageTableEntries      float64 `perflib:"Free System Page Table Entries"`
-	ModifiedPageListBytes           uint64
+	ModifiedPageListBytes           float64 `perflib:"Modified Page List Bytes"`
-	PageFaultsPersec                uint32
+	PageFaultsPersec                float64 `perflib:"Page Faults/sec"`
-	PageReadsPersec                 uint32
+	PageReadsPersec                 float64 `perflib:"Page Reads/sec"`
-	PagesInputPersec                uint32
+	PagesInputPersec                float64 `perflib:"Pages Input/sec"`
-	PagesOutputPersec               uint32
+	PagesOutputPersec               float64 `perflib:"Pages Output/sec"`
-	PagesPersec                     uint32
+	PagesPersec                     float64 `perflib:"Pages/sec"`
-	PageWritesPersec                uint32
+	PageWritesPersec                float64 `perflib:"Page Writes/sec"`
-	PoolNonpagedAllocs              uint32
+	PoolNonpagedAllocs              float64 `perflib:"Pool Nonpaged Allocs"`
-	PoolNonpagedBytes               uint64
+	PoolNonpagedBytes               float64 `perflib:"Pool Nonpaged Bytes"`
-	PoolPagedAllocs                 uint32
+	PoolPagedAllocs                 float64 `perflib:"Pool Paged Allocs"`
-	PoolPagedBytes                  uint64
+	PoolPagedBytes                  float64 `perflib:"Pool Paged Bytes"`
-	PoolPagedResidentBytes          uint64
+	PoolPagedResidentBytes          float64 `perflib:"Pool Paged Resident Bytes"`
-	StandbyCacheCoreBytes           uint64
+	StandbyCacheCoreBytes           float64 `perflib:"Standby Cache Core Bytes"`
-	StandbyCacheNormalPriorityBytes uint64
+	StandbyCacheNormalPriorityBytes float64 `perflib:"Standby Cache Normal Priority Bytes"`
-	StandbyCacheReserveBytes        uint64
+	StandbyCacheReserveBytes        float64 `perflib:"Standby Cache Reserve Bytes"`
-	SystemCacheResidentBytes        uint64
+	SystemCacheResidentBytes        float64 `perflib:"System Cache Resident Bytes"`
-	SystemCodeResidentBytes         uint64
+	SystemCodeResidentBytes         float64 `perflib:"System Code Resident Bytes"`
-	SystemCodeTotalBytes            uint64
+	SystemCodeTotalBytes            float64 `perflib:"System Code Total Bytes"`
-	SystemDriverResidentBytes       uint64
+	SystemDriverResidentBytes       float64 `perflib:"System Driver Resident Bytes"`
-	SystemDriverTotalBytes          uint64
+	SystemDriverTotalBytes          float64 `perflib:"System Driver Total Bytes"`
-	TransitionFaultsPersec          uint32
+	TransitionFaultsPersec          float64 `perflib:"Transition Faults/sec"`
-	TransitionPagesRePurposedPersec uint32
+	TransitionPagesRePurposedPersec float64 `perflib:"Transition Pages RePurposed/sec"`
-	WriteCopiesPersec               uint32
+	WriteCopiesPersec               float64 `perflib:"Write Copies/sec"`
 }
 
-func (c *MemoryCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *MemoryCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []Win32_PerfRawData_PerfOS_Memory
+	var dst []memory
-	q := queryAll(&dst)
+	if err := unmarshalObject(ctx.perfObjects["Memory"], &dst); err != nil {
-	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.AvailableBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].AvailableBytes),
+		dst[0].AvailableBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.CacheBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].CacheBytes),
+		dst[0].CacheBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.CacheBytesPeak,
 		prometheus.GaugeValue,
-		float64(dst[0].CacheBytesPeak),
+		dst[0].CacheBytesPeak,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.CacheFaultsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].CacheFaultsPersec),
+		dst[0].CacheFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.CommitLimit,
 		prometheus.GaugeValue,
-		float64(dst[0].CommitLimit),
+		dst[0].CommitLimit,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.CommittedBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].CommittedBytes),
+		dst[0].CommittedBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.DemandZeroFaultsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].DemandZeroFaultsPersec),
+		dst[0].DemandZeroFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.FreeAndZeroPageListBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].FreeAndZeroPageListBytes),
+		dst[0].FreeAndZeroPageListBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.FreeSystemPageTableEntries,
 		prometheus.GaugeValue,
-		float64(dst[0].FreeSystemPageTableEntries),
+		dst[0].FreeSystemPageTableEntries,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ModifiedPageListBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].ModifiedPageListBytes),
+		dst[0].ModifiedPageListBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PageFaultsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PageFaultsPersec),
+		dst[0].PageFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPageReadsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PageReadsPersec),
+		dst[0].PageReadsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPagesReadTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PagesInputPersec),
+		dst[0].PagesInputPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPagesWrittenTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PagesOutputPersec),
+		dst[0].PagesOutputPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPageOperationsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PagesPersec),
+		dst[0].PagesPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SwapPageWritesTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PageWritesPersec),
+		dst[0].PageWritesPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PoolNonpagedAllocsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PoolNonpagedAllocs),
+		dst[0].PoolNonpagedAllocs,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PoolNonpagedBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].PoolNonpagedBytes),
+		dst[0].PoolNonpagedBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PoolPagedAllocsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].PoolPagedAllocs),
+		dst[0].PoolPagedAllocs,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PoolPagedBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].PoolPagedBytes),
+		dst[0].PoolPagedBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.PoolPagedResidentBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].PoolPagedResidentBytes),
+		dst[0].PoolPagedResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.StandbyCacheCoreBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].StandbyCacheCoreBytes),
+		dst[0].StandbyCacheCoreBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.StandbyCacheNormalPriorityBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].StandbyCacheNormalPriorityBytes),
+		dst[0].StandbyCacheNormalPriorityBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.StandbyCacheReserveBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].StandbyCacheReserveBytes),
+		dst[0].StandbyCacheReserveBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemCacheResidentBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].SystemCacheResidentBytes),
+		dst[0].SystemCacheResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemCodeResidentBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].SystemCodeResidentBytes),
+		dst[0].SystemCodeResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemCodeTotalBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].SystemCodeTotalBytes),
+		dst[0].SystemCodeTotalBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemDriverResidentBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].SystemDriverResidentBytes),
+		dst[0].SystemDriverResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemDriverTotalBytes,
 		prometheus.GaugeValue,
-		float64(dst[0].SystemDriverTotalBytes),
+		dst[0].SystemDriverTotalBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.TransitionFaultsTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].TransitionFaultsPersec),
+		dst[0].TransitionFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.TransitionPagesRepurposedTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].TransitionPagesRePurposedPersec),
+		dst[0].TransitionPagesRePurposedPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.WriteCopiesTotal,
 		prometheus.GaugeValue,
-		float64(dst[0].WriteCopiesPersec),
+		dst[0].WriteCopiesPersec,
 	)
 
 	return nil, nil

collector/msmq.go

@@ -12,7 +12,7 @@ import (
 )
 
 func init() {
-	Factories["msmq"] = NewMSMQCollector
+	registerCollector("msmq", NewMSMQCollector)
 }
 
 var (

collector/mssql.go

@@ -127,7 +127,7 @@ func mssqlExpandEnabledCollectors(enabled string) []string {
 }
 
 func init() {
-	Factories["mssql"] = NewMSSQLCollector
+	registerCollector("mssql", NewMSSQLCollector)
 }
 
 // A MSSQLCollector is a Prometheus collector for various WMI Win32_PerfRawData_MSSQLSERVER_* metrics
@@ -179,7 +179,8 @@ type MSSQLCollector struct {
 	AccessMethodsUsedtreepagecookie           *prometheus.Desc
 	AccessMethodsWorkfilesCreated             *prometheus.Desc
 	AccessMethodsWorktablesCreated            *prometheus.Desc
-	AccessMethodsWorktablesFromCacheRatio     *prometheus.Desc
+	AccessMethodsWorktablesFromCacheHits      *prometheus.Desc
+	AccessMethodsWorktablesFromCacheLookups   *prometheus.Desc
 
 	// Win32_PerfRawData_{instance}_SQLServerAvailabilityReplica
 	AvailReplicaBytesReceivedfromReplica *prometheus.Desc
@@ -194,7 +195,8 @@ type MSSQLCollector struct {
 
 	// Win32_PerfRawData_{instance}_SQLServerBufferManager
 	BufManBackgroundwriterpages         *prometheus.Desc
-	BufManBuffercachehitratio           *prometheus.Desc
+	BufManBuffercachehits               *prometheus.Desc
+	BufManBuffercachelookups            *prometheus.Desc
 	BufManCheckpointpages               *prometheus.Desc
 	BufManDatabasepages                 *prometheus.Desc
 	BufManExtensionallocatedpages       *prometheus.Desc
@@ -252,7 +254,8 @@ type MSSQLCollector struct {
 	DatabasesDBCCLogicalScanBytes            *prometheus.Desc
 	DatabasesGroupCommitTime                 *prometheus.Desc
 	DatabasesLogBytesFlushed                 *prometheus.Desc
-	DatabasesLogCacheHitRatio                *prometheus.Desc
+	DatabasesLogCacheHits                    *prometheus.Desc
+	DatabasesLogCacheLookups                 *prometheus.Desc
 	DatabasesLogCacheReads                   *prometheus.Desc
 	DatabasesLogFilesSizeKB                  *prometheus.Desc
 	DatabasesLogFilesUsedSizeKB              *prometheus.Desc
@@ -317,7 +320,8 @@ type MSSQLCollector struct {
 	GenStatsUserConnections               *prometheus.Desc
 
 	// Win32_PerfRawData_{instance}_SQLServerLocks
-	LocksAverageWaitTimems    *prometheus.Desc
+	LocksWaitTime             *prometheus.Desc
+	LocksCount                *prometheus.Desc
 	LocksLockRequests         *prometheus.Desc
 	LocksLockTimeouts         *prometheus.Desc
 	LocksLockTimeoutstimeout0 *prometheus.Desc
@@ -392,13 +396,13 @@ func NewMSSQLCollector() (Collector, error) {
 		// meta
 		mssqlScrapeDurationDesc: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "collector_duration_seconds"),
-			"wmi_exporter: Duration of an mssql child collection.",
+			"windows_exporter: Duration of an mssql child collection.",
 			[]string{"collector", "instance"},
 			nil,
 		),
 		mssqlScrapeSuccessDesc: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "collector_success"),
-			"wmi_exporter: Whether a mssql child collector was successful.",
+			"windows_exporter: Whether a mssql child collector was successful.",
 			[]string{"collector", "instance"},
 			nil,
 		),
@@ -656,12 +660,18 @@ func NewMSSQLCollector() (Collector, error) {
 			[]string{"instance"},
 			nil,
 		),
-		AccessMethodsWorktablesFromCacheRatio: prometheus.NewDesc(
+		AccessMethodsWorktablesFromCacheHits: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "accessmethods_worktables_from_cache_ratio"),
+			prometheus.BuildFQName(Namespace, subsystem, "accessmethods_worktables_from_cache_hits"),
 			"(AccessMethods.WorktablesFromCacheRatio)",
 			[]string{"instance"},
 			nil,
 		),
+		AccessMethodsWorktablesFromCacheLookups: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "accessmethods_worktables_from_cache_lookups"),
+			"(AccessMethods.WorktablesFromCacheRatio_Base)",
+			[]string{"instance"},
+			nil,
+		),
 
 		// Win32_PerfRawData_{instance}_SQLServerAvailabilityReplica
 		AvailReplicaBytesReceivedfromReplica: prometheus.NewDesc(
@@ -726,12 +736,18 @@ func NewMSSQLCollector() (Collector, error) {
 			[]string{"instance"},
 			nil,
 		),
-		BufManBuffercachehitratio: prometheus.NewDesc(
+		BufManBuffercachehits: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "bufman_buffer_cache_hit_ratio"),
+			prometheus.BuildFQName(Namespace, subsystem, "bufman_buffer_cache_hits"),
 			"(BufferManager.Buffercachehitratio)",
 			[]string{"instance"},
 			nil,
 		),
+		BufManBuffercachelookups: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "bufman_buffer_cache_lookups"),
+			"(BufferManager.Buffercachehitratio_Base)",
+			[]string{"instance"},
+			nil,
+		),
 		BufManCheckpointpages: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "bufman_checkpoint_pages"),
 			"(BufferManager.Checkpointpages)",
@@ -1054,12 +1070,18 @@ func NewMSSQLCollector() (Collector, error) {
 			[]string{"instance", "database"},
 			nil,
 		),
-		DatabasesLogCacheHitRatio: prometheus.NewDesc(
+		DatabasesLogCacheHits: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "databases_log_cache_hit_ratio"),
+			prometheus.BuildFQName(Namespace, subsystem, "databases_log_cache_hits"),
 			"(Databases.LogCacheHitRatio)",
 			[]string{"instance", "database"},
 			nil,
 		),
+		DatabasesLogCacheLookups: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "databases_log_cache_lookups"),
+			"(Databases.LogCacheHitRatio_Base)",
+			[]string{"instance", "database"},
+			nil,
+		),
 		DatabasesLogCacheReads: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "databases_log_cache_reads"),
 			"(Databases.LogCacheReads)",
@@ -1424,9 +1446,15 @@ func NewMSSQLCollector() (Collector, error) {
 		),
 
 		// Win32_PerfRawData_{instance}_SQLServerLocks
-		LocksAverageWaitTimems: prometheus.NewDesc(
+		LocksWaitTime: prometheus.NewDesc(
-			prometheus.BuildFQName(Namespace, subsystem, "locks_average_wait_seconds"),
+			prometheus.BuildFQName(Namespace, subsystem, "locks_wait_time_seconds"),
-			"(Locks.AverageWaitTimems)",
+			"(Locks.AverageWaitTimems Total time in seconds which locks have been holding resources)",
+			[]string{"instance", "resource"},
+			nil,
+		),
+		LocksCount: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "locks_count"),
+			"(Locks.AverageWaitTimems_Base count of how often requests have run into locks)",
 			[]string{"instance", "resource"},
 			nil,
 		),
@@ -1863,6 +1891,7 @@ type win32PerfRawDataSQLServerAccessMethods struct {
 	WorkfilesCreatedPersec        uint64
 	WorktablesCreatedPersec       uint64
 	WorktablesFromCacheRatio      uint64
+	WorktablesFromCacheRatio_Base uint64
 }
 
 func (c *MSSQLCollector) collectAccessMethods(ch chan<- prometheus.Metric, sqlInstance string) (*prometheus.Desc, error) {
@@ -2175,11 +2204,18 @@ func (c *MSSQLCollector) collectAccessMethods(ch chan<- prometheus.Metric, sqlIn
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessMethodsWorktablesFromCacheRatio,
+		c.AccessMethodsWorktablesFromCacheHits,
 		prometheus.CounterValue,
 		float64(v.WorktablesFromCacheRatio),
 		sqlInstance,
 	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.AccessMethodsWorktablesFromCacheLookups,
+		prometheus.CounterValue,
+		float64(v.WorktablesFromCacheRatio_Base),
+		sqlInstance,
+	)
 	return nil, nil
 }
 
@@ -2282,6 +2318,7 @@ func (c *MSSQLCollector) collectAvailabilityReplica(ch chan<- prometheus.Metric,
 type win32PerfRawDataSQLServerBufferManager struct {
 	BackgroundwriterpagesPersec   uint64
 	Buffercachehitratio           uint64
+	Buffercachehitratio_Base      uint64
 	CheckpointpagesPersec         uint64
 	Databasepages                 uint64
 	Extensionallocatedpages       uint64
@@ -2327,12 +2364,19 @@ func (c *MSSQLCollector) collectBufferManager(ch chan<- prometheus.Metric, sqlIn
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.BufManBuffercachehitratio,
+		c.BufManBuffercachehits,
 		prometheus.GaugeValue,
 		float64(v.Buffercachehitratio),
 		sqlInstance,
 	)
 
+	ch <- prometheus.MustNewConstMetric(
+		c.BufManBuffercachelookups,
+		prometheus.GaugeValue,
+		float64(v.Buffercachehitratio_Base),
+		sqlInstance,
+	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.BufManCheckpointpages,
 		prometheus.CounterValue,
@@ -2704,6 +2748,7 @@ type win32PerfRawDataSQLServerDatabases struct {
 	GroupCommitTimePersec            uint64
 	LogBytesFlushedPersec            uint64
 	LogCacheHitRatio                 uint64
+	LogCacheHitRatio_Base            uint64
 	LogCacheReadsPersec              uint64
 	LogFilesSizeKB                   uint64
 	LogFilesUsedSizeKB               uint64
@@ -2819,12 +2864,19 @@ func (c *MSSQLCollector) collectDatabases(ch chan<- prometheus.Metric, sqlInstan
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.DatabasesLogCacheHitRatio,
+			c.DatabasesLogCacheHits,
 			prometheus.GaugeValue,
 			float64(v.LogCacheHitRatio),
 			sqlInstance, dbName,
 		)
 
+		ch <- prometheus.MustNewConstMetric(
+			c.DatabasesLogCacheLookups,
+			prometheus.GaugeValue,
+			float64(v.LogCacheHitRatio_Base),
+			sqlInstance, dbName,
+		)
+
 		ch <- prometheus.MustNewConstMetric(
 			c.DatabasesLogCacheReads,
 			prometheus.CounterValue,
@@ -3299,6 +3351,7 @@ func (c *MSSQLCollector) collectGeneralStatistics(ch chan<- prometheus.Metric, s
 type win32PerfRawDataSQLServerLocks struct {
 	Name                       string
 	AverageWaitTimems          uint64
+	AverageWaitTimems_Base     uint64
 	LockRequestsPersec         uint64
 	LockTimeoutsPersec         uint64
 	LockTimeoutstimeout0Persec uint64
@@ -3321,12 +3374,19 @@ func (c *MSSQLCollector) collectLocks(ch chan<- prometheus.Metric, sqlInstance s
 		lockResourceName := v.Name
 
 		ch <- prometheus.MustNewConstMetric(
-			c.LocksAverageWaitTimems,
+			c.LocksWaitTime,
 			prometheus.GaugeValue,
 			float64(v.AverageWaitTimems)/1000.0,
 			sqlInstance, lockResourceName,
 		)
 
+		ch <- prometheus.MustNewConstMetric(
+			c.LocksCount,
+			prometheus.GaugeValue,
+			float64(v.AverageWaitTimems_Base)/1000.0,
+			sqlInstance, lockResourceName,
+		)
+
 		ch <- prometheus.MustNewConstMetric(
 			c.LocksLockRequests,
 			prometheus.CounterValue,

collector/net.go

@@ -6,14 +6,13 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
 func init() {
-	Factories["net"] = NewNetworkCollector
+	registerCollector("net", NewNetworkCollector, "Network Interface")
 }
 
 var (
@@ -28,7 +27,7 @@ var (
 	nicNameToUnderscore = regexp.MustCompile("[^a-zA-Z0-9]")
 )
 
-// A NetworkCollector is a Prometheus collector for WMI Win32_PerfRawData_Tcpip_NetworkInterface metrics
+// A NetworkCollector is a Prometheus collector for Perflib Network Interface metrics
 type NetworkCollector struct {
 	BytesReceivedTotal       *prometheus.Desc
 	BytesSentTotal           *prometheus.Desc
@@ -133,7 +132,7 @@ func NewNetworkCollector() (Collector, error) {
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *NetworkCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
+	if desc, err := c.collect(ctx, ch); err != nil {
 		log.Error("failed collecting net metrics:", desc, err)
 		return err
 	}
@@ -141,34 +140,33 @@ func (c *NetworkCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 }
 
 // mangleNetworkName mangles Network Adapter name (non-alphanumeric to _)
-// that is used in Win32_PerfRawData_Tcpip_NetworkInterface.
+// that is used in networkInterface.
 func mangleNetworkName(name string) string {
 	return nicNameToUnderscore.ReplaceAllString(name, "_")
 }
 
 // Win32_PerfRawData_Tcpip_NetworkInterface docs:
 // - https://technet.microsoft.com/en-us/security/aa394340(v=vs.80)
-type Win32_PerfRawData_Tcpip_NetworkInterface struct {
+type networkInterface struct {
-	BytesReceivedPerSec      uint64
+	BytesReceivedPerSec      float64 `perflib:"Bytes Received/sec"`
-	BytesSentPerSec          uint64
+	BytesSentPerSec          float64 `perflib:"Bytes Sent/sec"`
-	BytesTotalPerSec         uint64
+	BytesTotalPerSec         float64 `perflib:"Bytes Total/sec"`
 	Name                     string
-	PacketsOutboundDiscarded uint64
+	PacketsOutboundDiscarded float64 `perflib:"Packets Outbound Discarded"`
-	PacketsOutboundErrors    uint64
+	PacketsOutboundErrors    float64 `perflib:"Packets Outbound Errors"`
-	PacketsPerSec            uint64
+	PacketsPerSec            float64 `perflib:"Packets/sec"`
-	PacketsReceivedDiscarded uint64
+	PacketsReceivedDiscarded float64 `perflib:"Packets Received Discarded"`
-	PacketsReceivedErrors    uint64
+	PacketsReceivedErrors    float64 `perflib:"Packets Received Errors"`
-	PacketsReceivedPerSec    uint64
+	PacketsReceivedPerSec    float64 `perflib:"Packets Received/sec"`
-	PacketsReceivedUnknown   uint64
+	PacketsReceivedUnknown   float64 `perflib:"Packets Received Unknown"`
-	PacketsSentPerSec        uint64
+	PacketsSentPerSec        float64 `perflib:"Packets Sent/sec"`
-	CurrentBandwidth         uint64
+	CurrentBandwidth         float64 `perflib:"Current Bandwidth"`
 }
 
-func (c *NetworkCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *NetworkCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []Win32_PerfRawData_Tcpip_NetworkInterface
+	var dst []networkInterface
 
-	q := queryAll(&dst)
+	if err := unmarshalObject(ctx.perfObjects["Network Interface"], &dst); err != nil {
-	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
 
@@ -187,76 +185,75 @@ func (c *NetworkCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.BytesReceivedTotal,
 			prometheus.CounterValue,
-			float64(nic.BytesReceivedPerSec),
+			nic.BytesReceivedPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.BytesSentTotal,
 			prometheus.CounterValue,
-			float64(nic.BytesSentPerSec),
+			nic.BytesSentPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.BytesTotal,
 			prometheus.CounterValue,
-			float64(nic.BytesTotalPerSec),
+			nic.BytesTotalPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsOutboundDiscarded,
 			prometheus.CounterValue,
-			float64(nic.PacketsOutboundDiscarded),
+			nic.PacketsOutboundDiscarded,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsOutboundErrors,
 			prometheus.CounterValue,
-			float64(nic.PacketsOutboundErrors),
+			nic.PacketsOutboundErrors,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsTotal,
 			prometheus.CounterValue,
-			float64(nic.PacketsPerSec),
+			nic.PacketsPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsReceivedDiscarded,
 			prometheus.CounterValue,
-			float64(nic.PacketsReceivedDiscarded),
+			nic.PacketsReceivedDiscarded,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsReceivedErrors,
 			prometheus.CounterValue,
-			float64(nic.PacketsReceivedErrors),
+			nic.PacketsReceivedErrors,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsReceivedTotal,
 			prometheus.CounterValue,
-			float64(nic.PacketsReceivedPerSec),
+			nic.PacketsReceivedPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsReceivedUnknown,
 			prometheus.CounterValue,
-			float64(nic.PacketsReceivedUnknown),
+			nic.PacketsReceivedUnknown,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.PacketsSentTotal,
 			prometheus.CounterValue,
-			float64(nic.PacketsSentPerSec),
+			nic.PacketsSentPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.CurrentBandwidth,
-			prometheus.CounterValue,
+			prometheus.GaugeValue,
-			float64(nic.CurrentBandwidth),
+			nic.CurrentBandwidth,
 			name,
 		)
 	}
-
 	return nil, nil
 }

collector/netframework_clrexceptions.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrexceptions"] = NewNETFramework_NETCLRExceptionsCollector
+	registerCollector("netframework_clrexceptions", NewNETFramework_NETCLRExceptionsCollector)
 }
 
 // A NETFramework_NETCLRExceptionsCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRExceptions metrics

collector/netframework_clrinterop.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrinterop"] = NewNETFramework_NETCLRInteropCollector
+	registerCollector("netframework_clrinterop", NewNETFramework_NETCLRInteropCollector)
 }
 
 // A NETFramework_NETCLRInteropCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRInterop metrics

collector/netframework_clrjit.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrjit"] = NewNETFramework_NETCLRJitCollector
+	registerCollector("netframework_clrjit", NewNETFramework_NETCLRJitCollector)
 }
 
 // A NETFramework_NETCLRJitCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRJit metrics

collector/netframework_clrloading.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrloading"] = NewNETFramework_NETCLRLoadingCollector
+	registerCollector("netframework_clrloading", NewNETFramework_NETCLRLoadingCollector)
 }
 
 // A NETFramework_NETCLRLoadingCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRLoading metrics

collector/netframework_clrlocksandthreads.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrlocksandthreads"] = NewNETFramework_NETCLRLocksAndThreadsCollector
+	registerCollector("netframework_clrlocksandthreads", NewNETFramework_NETCLRLocksAndThreadsCollector)
 }
 
 // A NETFramework_NETCLRLocksAndThreadsCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads metrics

collector/netframework_clrmemory.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrmemory"] = NewNETFramework_NETCLRMemoryCollector
+	registerCollector("netframework_clrmemory", NewNETFramework_NETCLRMemoryCollector)
 }
 
 // A NETFramework_NETCLRMemoryCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRMemory metrics

collector/netframework_clrremoting.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrremoting"] = NewNETFramework_NETCLRRemotingCollector
+	registerCollector("netframework_clrremoting", NewNETFramework_NETCLRRemotingCollector)
 }
 
 // A NETFramework_NETCLRRemotingCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRRemoting metrics

collector/netframework_clrsecurity.go

@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	Factories["netframework_clrsecurity"] = NewNETFramework_NETCLRSecurityCollector
+	registerCollector("netframework_clrsecurity", NewNETFramework_NETCLRSecurityCollector)
 }
 
 // A NETFramework_NETCLRSecurityCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRSecurity metrics

collector/os.go

@@ -12,11 +12,12 @@ import (
 )
 
 func init() {
-	Factories["os"] = NewOSCollector
+	registerCollector("os", NewOSCollector)
 }
 
 // A OSCollector is a Prometheus collector for WMI metrics
 type OSCollector struct {
+	OSInformation           *prometheus.Desc
 	PhysicalMemoryFreeBytes *prometheus.Desc
 	PagingFreeBytes         *prometheus.Desc
 	VirtualMemoryFreeBytes  *prometheus.Desc
@@ -36,6 +37,12 @@ func NewOSCollector() (Collector, error) {
 	const subsystem = "os"
 
 	return &OSCollector{
+		OSInformation: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "info"),
+			"OperatingSystem.Caption, OperatingSystem.Version",
+			[]string{"product", "version"},
+			nil,
+		),
 		PagingLimitBytes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "paging_limit_bytes"),
 			"OperatingSystem.SizeStoredInPagingFiles",
@@ -124,9 +131,11 @@ func (c *OSCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) e
 // Win32_OperatingSystem docs:
 // - https://msdn.microsoft.com/en-us/library/aa394239 - Win32_OperatingSystem class
 type Win32_OperatingSystem struct {
+	Caption                 string
 	FreePhysicalMemory      uint64
 	FreeSpaceInPagingFiles  uint64
 	FreeVirtualMemory       uint64
+	LocalDateTime           time.Time
 	MaxNumberOfProcesses    uint32
 	MaxProcessMemorySize    uint64
 	NumberOfProcesses       uint32
@@ -134,7 +143,7 @@ type Win32_OperatingSystem struct {
 	SizeStoredInPagingFiles uint64
 	TotalVirtualMemorySize  uint64
 	TotalVisibleMemorySize  uint64
-	LocalDateTime           time.Time
+	Version                 string
 }
 
 func (c *OSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
@@ -148,6 +157,14 @@ func (c *OSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, er
 		return nil, errors.New("WMI query returned empty result set")
 	}
 
+	ch <- prometheus.MustNewConstMetric(
+		c.OSInformation,
+		prometheus.GaugeValue,
+		1.0,
+		dst[0].Caption,
+		dst[0].Version,
+	)
+
 	ch <- prometheus.MustNewConstMetric(
 		c.PhysicalMemoryFreeBytes,
 		prometheus.GaugeValue,

collector/perflib.go

@@ -3,14 +3,21 @@ package collector
 import (
 	"fmt"
 	"reflect"
+	"strconv"
 
 	perflibCollector "github.com/leoluk/perflib_exporter/collector"
 	"github.com/leoluk/perflib_exporter/perflib"
 	"github.com/prometheus/common/log"
 )
 
-func getPerflibSnapshot() (map[string]*perflib.PerfObject, error) {
+var nametable = perflib.QueryNameTable("Counter 009") // Reads the names in English TODO: validate that the English names are always present
-	objects, err := perflib.QueryPerformanceData("Global")
+
+func MapCounterToIndex(name string) string {
+	return strconv.Itoa(int(nametable.LookupIndex(name)))
+}
+
+func getPerflibSnapshot(objNames string) (map[string]*perflib.PerfObject, error) {
+	objects, err := perflib.QueryPerformanceData(objNames)
 	if err != nil {
 		return nil, err
 	}

collector/process.go

@@ -3,6 +3,8 @@
 package collector
 
 import (
+	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -13,18 +15,21 @@ import (
 )
 
 func init() {
-	Factories["process"] = NewProcessCollector
+	registerCollector("process", newProcessCollector, "Process")
 }
 
 var (
-	processWhereClause = kingpin.Flag(
+	processWhitelist = kingpin.Flag(
-		"collector.process.processes-where",
+		"collector.process.whitelist",
-		"WQL 'where' clause to use in WMI metrics query. Limits the response to the processes you specify and reduces the size of the response.",
+		"Regexp of processes to include. Process name must both match whitelist and not match blacklist to be included.",
+	).Default(".*").String()
+	processBlacklist = kingpin.Flag(
+		"collector.process.blacklist",
+		"Regexp of processes to exclude. Process name must both match whitelist and not match blacklist to be included.",
 	).Default("").String()
 )
 
-// A ProcessCollector is a Prometheus collector for WMI Win32_PerfRawData_PerfProc_Process metrics
+type processCollector struct {
-type ProcessCollector struct {
 	StartTime         *prometheus.Desc
 	CPUTimeTotal      *prometheus.Desc
 	HandleCount       *prometheus.Desc
@@ -39,18 +44,19 @@ type ProcessCollector struct {
 	VirtualBytes      *prometheus.Desc
 	WorkingSet        *prometheus.Desc
 
-	queryWhereClause string
+	processWhitelistPattern *regexp.Regexp
+	processBlacklistPattern *regexp.Regexp
 }
 
 // NewProcessCollector ...
-func NewProcessCollector() (Collector, error) {
+func newProcessCollector() (Collector, error) {
 	const subsystem = "process"
 
-	if *processWhereClause == "" {
+	if *processWhitelist == ".*" && *processBlacklist == "" {
-		log.Warn("No where-clause specified for process collector. This will generate a very large number of metrics!")
+		log.Warn("No filters specified for process collector. This will generate a very large number of metrics!")
 	}
 
-	return &ProcessCollector{
+	return &processCollector{
 		StartTime: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "start_time"),
 			"Time of process start.",
@@ -129,66 +135,53 @@ func NewProcessCollector() (Collector, error) {
 			[]string{"process", "process_id", "creating_process_id"},
 			nil,
 		),
-		queryWhereClause: *processWhereClause,
+		processWhitelistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *processWhitelist)),
+		processBlacklistPattern: regexp.MustCompile(fmt.Sprintf("^(?:%s)$", *processBlacklist)),
 	}, nil
 }
 
-// Collect sends the metric values for each metric
+type perflibProcess struct {
-// to the provided prometheus Metric channel.
-func (c *ProcessCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		log.Error("failed collecting process metrics:", desc, err)
-		return err
-	}
-	return nil
-}
-
-// Win32_PerfRawData_PerfProc_Process docs:
-// - https://msdn.microsoft.com/en-us/library/aa394323(v=vs.85).aspx
-type Win32_PerfRawData_PerfProc_Process struct {
 	Name                    string
-	CreatingProcessID       uint32
+	PercentProcessorTime    float64 `perflib:"% Processor Time"`
-	ElapsedTime             uint64
+	PercentPrivilegedTime   float64 `perflib:"% Privileged Time"`
-	Frequency_Object        uint64
+	PercentUserTime         float64 `perflib:"% User Time"`
-	HandleCount             uint32
+	CreatingProcessID       float64 `perflib:"Creating Process ID"`
-	IDProcess               uint32
+	ElapsedTime             float64 `perflib:"Elapsed Time"`
-	IODataBytesPersec       uint64
+	HandleCount             float64 `perflib:"Handle Count"`
-	IODataOperationsPersec  uint64
+	IDProcess               float64 `perflib:"ID Process"`
-	IOOtherBytesPersec      uint64
+	IODataBytesPerSec       float64 `perflib:"IO Data Bytes/sec"`
-	IOOtherOperationsPersec uint64
+	IODataOperationsPerSec  float64 `perflib:"IO Data Operations/sec"`
-	IOReadBytesPersec       uint64
+	IOOtherBytesPerSec      float64 `perflib:"IO Other Bytes/sec"`
-	IOReadOperationsPersec  uint64
+	IOOtherOperationsPerSec float64 `perflib:"IO Other Operations/sec"`
-	IOWriteBytesPersec      uint64
+	IOReadBytesPerSec       float64 `perflib:"IO Read Bytes/sec"`
-	IOWriteOperationsPersec uint64
+	IOReadOperationsPerSec  float64 `perflib:"IO Read Operations/sec"`
-	PageFaultsPersec        uint32
+	IOWriteBytesPerSec      float64 `perflib:"IO Write Bytes/sec"`
-	PageFileBytes           uint64
+	IOWriteOperationsPerSec float64 `perflib:"IO Write Operations/sec"`
-	PageFileBytesPeak       uint64
+	PageFaultsPerSec        float64 `perflib:"Page Faults/sec"`
-	PercentPrivilegedTime   uint64
+	PageFileBytesPeak       float64 `perflib:"Page File Bytes Peak"`
-	PercentProcessorTime    uint64
+	PageFileBytes           float64 `perflib:"Page File Bytes"`
-	PercentUserTime         uint64
+	PoolNonpagedBytes       float64 `perflib:"Pool Nonpaged Bytes"`
-	PoolNonpagedBytes       uint32
+	PoolPagedBytes          float64 `perflib:"Pool Paged Bytes"`
-	PoolPagedBytes          uint32
+	PriorityBase            float64 `perflib:"Priority Base"`
-	PriorityBase            uint32
+	PrivateBytes            float64 `perflib:"Private Bytes"`
-	PrivateBytes            uint64
+	ThreadCount             float64 `perflib:"Thread Count"`
-	ThreadCount             uint32
+	VirtualBytesPeak        float64 `perflib:"Virtual Bytes Peak"`
-	Timestamp_Object        uint64
+	VirtualBytes            float64 `perflib:"Virtual Bytes"`
-	VirtualBytes            uint64
+	WorkingSetPrivate       float64 `perflib:"Working Set - Private"`
-	VirtualBytesPeak        uint64
+	WorkingSetPeak          float64 `perflib:"Working Set Peak"`
-	WorkingSet              uint64
+	WorkingSet              float64 `perflib:"Working Set"`
-	WorkingSetPeak          uint64
-	WorkingSetPrivate       uint64
 }
 
 type WorkerProcess struct {
 	AppPoolName string
-	ProcessId   uint32
+	ProcessId   uint64
 }
 
-func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *processCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []Win32_PerfRawData_PerfProc_Process
+	data := make([]perflibProcess, 0)
-	q := queryAllWhere(&dst, c.queryWhereClause)
+	err := unmarshalObject(ctx.perfObjects["Process"], &data)
-	if err := wmi.Query(q, &dst); err != nil {
+	if err != nil {
-		return nil, err
+		return err
 	}
 
 	var dst_wp []WorkerProcess
@@ -197,9 +190,10 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		log.Debugf("Could not query WebAdministration namespace for IIS worker processes: %v. Skipping", err)
 	}
 
-	for _, process := range dst {
+	for _, process := range data {
-
+		if process.Name == "_Total" ||
-		if process.Name == "_Total" {
+			c.processBlacklistPattern.MatchString(process.Name) ||
+			!c.processWhitelistPattern.MatchString(process.Name) {
 			continue
 		}
 		// Duplicate processes are suffixed # and an index number. Remove those.
@@ -208,7 +202,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		cpid := strconv.FormatUint(uint64(process.CreatingProcessID), 10)
 
 		for _, wp := range dst_wp {
-			if wp.ProcessId == process.IDProcess {
+			if wp.ProcessId == uint64(process.IDProcess) {
 				processName = strings.Join([]string{processName, wp.AppPoolName}, "_")
 				break
 			}
@@ -217,8 +211,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.StartTime,
 			prometheus.GaugeValue,
-			// convert from Windows timestamp (1 jan 1601) to unix timestamp (1 jan 1970)
+			process.ElapsedTime,
-			float64(process.ElapsedTime-116444736000000000)/float64(process.Frequency_Object),
 			processName,
 			pid,
 			cpid,
@@ -227,7 +220,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.HandleCount,
 			prometheus.GaugeValue,
-			float64(process.HandleCount),
+			process.HandleCount,
 			processName,
 			pid,
 			cpid,
@@ -236,7 +229,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.CPUTimeTotal,
 			prometheus.CounterValue,
-			float64(process.PercentPrivilegedTime)*ticksToSecondsScaleFactor,
+			process.PercentPrivilegedTime,
 			processName,
 			pid,
 			cpid,
@@ -246,7 +239,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.CPUTimeTotal,
 			prometheus.CounterValue,
-			float64(process.PercentUserTime)*ticksToSecondsScaleFactor,
+			process.PercentUserTime,
 			processName,
 			pid,
 			cpid,
@@ -256,7 +249,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.IOBytesTotal,
 			prometheus.CounterValue,
-			float64(process.IOOtherBytesPersec),
+			process.IOOtherBytesPerSec,
 			processName,
 			pid,
 			cpid,
@@ -266,7 +259,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.IOOperationsTotal,
 			prometheus.CounterValue,
-			float64(process.IOOtherOperationsPersec),
+			process.IOOtherOperationsPerSec,
 			processName,
 			pid,
 			cpid,
@@ -276,7 +269,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.IOBytesTotal,
 			prometheus.CounterValue,
-			float64(process.IOReadBytesPersec),
+			process.IOReadBytesPerSec,
 			processName,
 			pid,
 			cpid,
@@ -286,7 +279,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.IOOperationsTotal,
 			prometheus.CounterValue,
-			float64(process.IOReadOperationsPersec),
+			process.IOReadOperationsPerSec,
 			processName,
 			pid,
 			cpid,
@@ -296,7 +289,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.IOBytesTotal,
 			prometheus.CounterValue,
-			float64(process.IOWriteBytesPersec),
+			process.IOWriteBytesPerSec,
 			processName,
 			pid,
 			cpid,
@@ -306,7 +299,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.IOOperationsTotal,
 			prometheus.CounterValue,
-			float64(process.IOWriteOperationsPersec),
+			process.IOWriteOperationsPerSec,
 			processName,
 			pid,
 			cpid,
@@ -316,7 +309,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.PageFaultsTotal,
 			prometheus.CounterValue,
-			float64(process.PageFaultsPersec),
+			process.PageFaultsPerSec,
 			processName,
 			pid,
 			cpid,
@@ -325,7 +318,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.PageFileBytes,
 			prometheus.GaugeValue,
-			float64(process.PageFileBytes),
+			process.PageFileBytes,
 			processName,
 			pid,
 			cpid,
@@ -334,7 +327,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.PoolBytes,
 			prometheus.GaugeValue,
-			float64(process.PoolNonpagedBytes),
+			process.PoolNonpagedBytes,
 			processName,
 			pid,
 			cpid,
@@ -344,7 +337,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.PoolBytes,
 			prometheus.GaugeValue,
-			float64(process.PoolPagedBytes),
+			process.PoolPagedBytes,
 			processName,
 			pid,
 			cpid,
@@ -354,7 +347,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.PriorityBase,
 			prometheus.GaugeValue,
-			float64(process.PriorityBase),
+			process.PriorityBase,
 			processName,
 			pid,
 			cpid,
@@ -363,7 +356,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.PrivateBytes,
 			prometheus.GaugeValue,
-			float64(process.PrivateBytes),
+			process.PrivateBytes,
 			processName,
 			pid,
 			cpid,
@@ -372,7 +365,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.ThreadCount,
 			prometheus.GaugeValue,
-			float64(process.ThreadCount),
+			process.ThreadCount,
 			processName,
 			pid,
 			cpid,
@@ -381,7 +374,7 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.VirtualBytes,
 			prometheus.GaugeValue,
-			float64(process.VirtualBytes),
+			process.VirtualBytes,
 			processName,
 			pid,
 			cpid,
@@ -390,12 +383,12 @@ func (c *ProcessCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 		ch <- prometheus.MustNewConstMetric(
 			c.WorkingSet,
 			prometheus.GaugeValue,
-			float64(process.WorkingSet),
+			process.WorkingSet,
 			processName,
 			pid,
 			cpid,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

collector/remote_fx.go

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

collector/service.go

@@ -3,6 +3,7 @@
 package collector
 
 import (
+	"strconv"
 	"strings"
 
 	"github.com/StackExchange/wmi"
@@ -12,7 +13,7 @@ import (
 )
 
 func init() {
-	Factories["service"] = NewserviceCollector
+	registerCollector("service", NewserviceCollector)
 }
 
 var (
@@ -24,9 +25,10 @@ var (
 
 // A serviceCollector is a Prometheus collector for WMI Win32_Service metrics
 type serviceCollector struct {
-	State     *prometheus.Desc
+	Information *prometheus.Desc
-	StartMode *prometheus.Desc
+	State       *prometheus.Desc
-	Status    *prometheus.Desc
+	StartMode   *prometheus.Desc
+	Status      *prometheus.Desc
 
 	queryWhereClause string
 }
@@ -40,6 +42,12 @@ func NewserviceCollector() (Collector, error) {
 	}
 
 	return &serviceCollector{
+		Information: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "info"),
+			"A metric with a constant '1' value labeled with service information",
+			[]string{"name", "display_name", "process_id"},
+			nil,
+		),
 		State: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "state"),
 			"The state of the service (State)",
@@ -75,10 +83,12 @@ func (c *serviceCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metr
 // Win32_Service docs:
 // - https://msdn.microsoft.com/en-us/library/aa394418(v=vs.85).aspx
 type Win32_Service struct {
-	Name      string
+	DisplayName string
-	State     string
+	Name        string
-	Status    string
+	ProcessId   uint32
-	StartMode string
+	State       string
+	Status      string
+	StartMode   string
 }
 
 var (
@@ -123,6 +133,16 @@ func (c *serviceCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Des
 	}
 
 	for _, service := range dst {
+		pid := strconv.FormatUint(uint64(service.ProcessId), 10)
+		ch <- prometheus.MustNewConstMetric(
+			c.Information,
+			prometheus.GaugeValue,
+			1.0,
+			strings.ToLower(service.Name),
+			service.DisplayName,
+			pid,
+		)
+
 		for _, state := range allStates {
 			isCurrentState := 0.0
 			if state == strings.ToLower(service.State) {

collector/system.go

@@ -3,14 +3,12 @@
 package collector
 
 import (
-	"errors"
-	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
 )
 
 func init() {
-	Factories["system"] = NewSystemCollector
+	registerCollector("system", NewSystemCollector, "System")
 }
 
 // A SystemCollector is a Prometheus collector for WMI metrics
@@ -70,7 +68,7 @@ func NewSystemCollector() (Collector, error) {
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *SystemCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
+	if desc, err := c.collect(ctx, ch); err != nil {
 		log.Error("failed collecting system metrics:", desc, err)
 		return err
 	}
@@ -79,57 +77,50 @@ func (c *SystemCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 
 // Win32_PerfRawData_PerfOS_System docs:
 // - https://web.archive.org/web/20050830140516/http://msdn.microsoft.com/library/en-us/wmisdk/wmi/win32_perfrawdata_perfos_system.asp
-type Win32_PerfRawData_PerfOS_System struct {
+type system struct {
-	ContextSwitchesPersec     uint32
+	ContextSwitchesPersec     float64 `perflib:"Context Switches/sec"`
-	ExceptionDispatchesPersec uint32
+	ExceptionDispatchesPersec float64 `perflib:"Exception Dispatches/sec"`
-	Frequency_Object          uint64
+	ProcessorQueueLength      float64 `perflib:"Processor Queue Length"`
-	ProcessorQueueLength      uint32
+	SystemCallsPersec         float64 `perflib:"System Calls/sec"`
-	SystemCallsPersec         uint32
+	SystemUpTime              float64 `perflib:"System Up Time"`
-	SystemUpTime              uint64
+	Threads                   float64 `perflib:"Threads"`
-	Threads                   uint32
-	Timestamp_Object          uint64
 }
 
-func (c *SystemCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *SystemCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []Win32_PerfRawData_PerfOS_System
+	var dst []system
-	q := queryAll(&dst)
+	if err := unmarshalObject(ctx.perfObjects["System"], &dst); err != nil {
-	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
-	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
-	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ContextSwitchesTotal,
 		prometheus.CounterValue,
-		float64(dst[0].ContextSwitchesPersec),
+		dst[0].ContextSwitchesPersec,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.ExceptionDispatchesTotal,
 		prometheus.CounterValue,
-		float64(dst[0].ExceptionDispatchesPersec),
+		dst[0].ExceptionDispatchesPersec,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.ProcessorQueueLength,
 		prometheus.GaugeValue,
-		float64(dst[0].ProcessorQueueLength),
+		dst[0].ProcessorQueueLength,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemCallsTotal,
 		prometheus.CounterValue,
-		float64(dst[0].SystemCallsPersec),
+		dst[0].SystemCallsPersec,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemUpTime,
 		prometheus.GaugeValue,
-		// convert from Windows timestamp (1 jan 1601) to unix timestamp (1 jan 1970)
+		dst[0].SystemUpTime,
-		float64(dst[0].SystemUpTime-116444736000000000)/float64(dst[0].Frequency_Object),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.Threads,
 		prometheus.GaugeValue,
-		float64(dst[0].Threads),
+		dst[0].Threads,
 	)
 	return nil, nil
 }

collector/tcp.go

@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	Factories["tcp"] = NewTCPCollector
+	registerCollector("tcp", NewTCPCollector)
 }
 
 // A TCPCollector is a Prometheus collector for WMI Win32_PerfRawData_Tcpip_TCPv4 metrics
@@ -136,7 +136,7 @@ func (c *TCPCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, e
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.ConnectionsEstablished,
-		prometheus.CounterValue,
+		prometheus.GaugeValue,
 		float64(dst[0].ConnectionsEstablished),
 	)
 	ch <- prometheus.MustNewConstMetric(

collector/terminal_services.go

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

collector/textfile.go

@@ -37,10 +37,10 @@ var (
 	textFileDirectory = kingpin.Flag(
 		"collector.textfile.directory",
 		"Directory to read text files with metrics from.",
-	).Default("C:\\Program Files\\wmi_exporter\\textfile_inputs").String()
+	).Default("C:\\Program Files\\windows_exporter\\textfile_inputs").String()
 
 	mtimeDesc = prometheus.NewDesc(
-		"wmi_textfile_mtime_seconds",
+		prometheus.BuildFQName(Namespace, "textfile", "mtime_seconds"),
 		"Unixtime mtime of textfiles successfully read.",
 		[]string{"file"},
 		nil,
@@ -54,7 +54,7 @@ type textFileCollector struct {
 }
 
 func init() {
-	Factories["textfile"] = NewTextFileCollector
+	registerCollector("textfile", NewTextFileCollector)
 }
 
 // NewTextFileCollector returns a new Collector exposing metrics read from files
@@ -281,7 +281,7 @@ fileLoop:
 	// Export if there were errors.
 	ch <- prometheus.MustNewConstMetric(
 		prometheus.NewDesc(
-			"wmi_textfile_scrape_error",
+			prometheus.BuildFQName(Namespace, "textfile", "scrape_error"),
 			"1 if there was an error opening or reading a file, 0 otherwise",
 			nil, nil,
 		),

collector/thermalzone.go

@@ -7,7 +7,7 @@ import (
 )
 
 func init() {
-	Factories["thermalzone"] = NewThermalZoneCollector
+	registerCollector("thermalzone", NewThermalZoneCollector)
 }
 
 // A thermalZoneCollector is a Prometheus collector for WMI Win32_PerfRawData_Counters_ThermalZoneInformation metrics

collector/vmware.go

@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	Factories["vmware"] = NewVmwareCollector
+	registerCollector("vmware", NewVmwareCollector)
 }
 
 // A VmwareCollector is a Prometheus collector for WMI Win32_PerfRawData_vmGuestLib_VMem/Win32_PerfRawData_vmGuestLib_VCPU metrics

contrib/console_templates/windows-overview.html

@@ -0,0 +1,140 @@
+{{ 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" }}

contrib/console_templates/wmi-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(wmi_cpu_time_total{job='node',instance='{{ .Params.instance }}',mode!='idle'}[5m]))",
-    renderer: 'area',
-    max: {{ with printf "count(count by (cpu)(wmi_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(wmi_net_bytes_sent_total{job='node',instance='{{ .Params.instance }}',nic!~'^isatap_ec2_internal'}[5m])",
-      "irate(wmi_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(wmi_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: [
-      "wmi_cs_physical_memory_bytes{job='node',instance='{{ .Params.instance }}'}",
-      "wmi_os_physical_memory_free_bytes{job='node',instance='{{ .Params.instance }}'}",
-      "wmi_cs_physical_memory__bytes{job='node',instance='{{ .Params.instance }}'} - wmi_os_physical_memory_free_bytes{job='node',instance='{{.Params.instance}}'}",
-      "wmi_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(wmi_cpu_time_total{job='node',instance='%s',mode='user'}[5m])) * 100 / count(count by (cpu)(wmi_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(wmi_cpu_time_total{job='node',instance='%s',mode='privileged'}[5m])) * 100 / count(count by (cpu)(wmi_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 "wmi_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 "wmi_os_physical_memory_free_bytes{job='node',instance='%s'}" .Params.instance) "B" "humanize1024") }}</td>
-  </tr>
-<tr>
-  <th colspan="2">Network</th>
-</tr>
-{{ range printf "wmi_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(wmi_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(wmi_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 "wmi_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(wmi_logical_disk_idle_seconds_total{job='node',instance='%s',volume='%s'}[5m]) * 100" .Labels.instance .Labels.volume) "%" "printf.1f") }}</td>
-  </tr>
-{{ end }}
-{{ range printf "wmi_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(wmi_logical_disk_read_bytes_total{job='node',instance='%s',volume='%s'}[5m]) + irate(wmi_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 "wmi_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 - wmi_logical_disk_free_bytes{job='node',instance='%s',volume='%s'} / wmi_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

@@ -1,10 +1,12 @@
 # Documentation
-This directory contains documentation of the collectors in the WMI exporter, with information such as what metrics are exported, any flags for additional configuration, and some example usage in alerts and queries.
+This directory contains documentation of the collectors in the windows_exporter, with information such as what metrics are exported, any flags for additional configuration, and some example usage in alerts and queries.
 
 # Collectors
 - [`ad`](collector.ad.md)
+- [`adfs`](collector.adfs.md)
 - [`cpu`](collector.cpu.md)
 - [`cs`](collector.cs.md)
+- [`dhcp`](collector.dhcp.md)
 - [`dns`](collector.dns.md)
 - [`hyperv`](collector.hyperv.md)
 - [`iis`](collector.iis.md)
@@ -24,8 +26,10 @@ This directory contains documentation of the collectors in the WMI exporter, wit
 - [`net`](collector.net.md)
 - [`os`](collector.os.md)
 - [`process`](collector.process.md)
+- [`remote_fx`](collector.remote_fx.md)
 - [`service`](collector.service.md)
 - [`system`](collector.system.md)
 - [`tcp`](collector.tcp.md)
+- [`terminal_services`](collector.terminal_services.md)
 - [`textfile`](collector.textfile.md)
 - [`vmware`](collector.vmware.md)

docs/collector-template.md

@@ -20,13 +20,13 @@ Example: `--collector....`
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_...` | ... | counter/gauge/histogram/summary | ...
+`windows_...` | ... | counter/gauge/histogram/summary | ...
 
 ### Example metric
 
 ...:
 
-`wmi_...{...} 1`
+`windows_...{...} 1`
 
 ## Useful queries
 ### Add queries...

docs/collector.ad.md

@@ -16,67 +16,67 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_ad_address_book_operations_total` | _Not yet documented_ | counter | `operation`
+`windows_ad_address_book_operations_total` | _Not yet documented_ | counter | `operation`
-`wmi_ad_address_book_client_sessions` | _Not yet documented_ | gauge | None
+`windows_ad_address_book_client_sessions` | _Not yet documented_ | gauge | None
-`wmi_ad_approximate_highest_distinguished_name_tag` | _Not yet documented_ | gauge | None
+`windows_ad_approximate_highest_distinguished_name_tag` | _Not yet documented_ | gauge | None
-`wmi_ad_atq_estimated_delay_seconds` | _Not yet documented_ | gauge | None
+`windows_ad_atq_estimated_delay_seconds` | _Not yet documented_ | gauge | None
-`wmi_ad_atq_outstanding_requests` | _Not yet documented_ | gauge | None
+`windows_ad_atq_outstanding_requests` | _Not yet documented_ | gauge | None
-`wmi_ad_atq_average_request_latency` | _Not yet documented_ | gauge | None
+`windows_ad_atq_average_request_latency` | _Not yet documented_ | gauge | None
-`wmi_ad_atq_current_threads` | _Not yet documented_ | gauge | `service`
+`windows_ad_atq_current_threads` | _Not yet documented_ | gauge | `service`
-`wmi_ad_searches_total` | _Not yet documented_ | counter | `scope`
+`windows_ad_searches_total` | _Not yet documented_ | counter | `scope`
-`wmi_ad_database_operations_total` | _Not yet documented_ | counter | `operation`
+`windows_ad_database_operations_total` | _Not yet documented_ | counter | `operation`
-`wmi_ad_binds_total` | _Not yet documented_ | counter | `bind_method`
+`windows_ad_binds_total` | _Not yet documented_ | counter | `bind_method`
-`wmi_ad_replication_highest_usn` | _Not yet documented_ | counter | `state`
+`windows_ad_replication_highest_usn` | _Not yet documented_ | counter | `state`
-`wmi_ad_replication_data_intrasite_bytes_total` | _Not yet documented_ | counter | `direction`
+`windows_ad_replication_data_intrasite_bytes_total` | _Not yet documented_ | counter | `direction`
-`wmi_ad_replication_data_intersite_bytes_total` | _Not yet documented_ | counter | `direction`
+`windows_ad_replication_data_intersite_bytes_total` | _Not yet documented_ | counter | `direction`
-`wmi_ad_replication_inbound_sync_objects_remaining` | _Not yet documented_ | gauge | None
+`windows_ad_replication_inbound_sync_objects_remaining` | _Not yet documented_ | gauge | None
-`wmi_ad_replication_inbound_link_value_updates_remaining` | _Not yet documented_ | gauge | None
+`windows_ad_replication_inbound_link_value_updates_remaining` | _Not yet documented_ | gauge | None
-`wmi_ad_replication_inbound_objects_updated_total` | _Not yet documented_ | counter | None
+`windows_ad_replication_inbound_objects_updated_total` | _Not yet documented_ | counter | None
-`wmi_ad_replication_inbound_objects_filtered_total` | _Not yet documented_ | counter | None
+`windows_ad_replication_inbound_objects_filtered_total` | _Not yet documented_ | counter | None
-`wmi_ad_replication_inbound_properties_updated_total` | _Not yet documented_ | counter | None
+`windows_ad_replication_inbound_properties_updated_total` | _Not yet documented_ | counter | None
-`wmi_ad_replication_inbound_properties_filtered_total` | _Not yet documented_ | counter | None
+`windows_ad_replication_inbound_properties_filtered_total` | _Not yet documented_ | counter | None
-`wmi_ad_replication_pending_operations` | _Not yet documented_ | gauge | None
+`windows_ad_replication_pending_operations` | _Not yet documented_ | gauge | None
-`wmi_ad_replication_pending_synchronizations` | _Not yet documented_ | gauge | None
+`windows_ad_replication_pending_synchronizations` | _Not yet documented_ | gauge | None
-`wmi_ad_replication_sync_requests_total` | _Not yet documented_ | counter | None
+`windows_ad_replication_sync_requests_total` | _Not yet documented_ | counter | None
-`wmi_ad_replication_sync_requests_success_total` | _Not yet documented_ | counter | None
+`windows_ad_replication_sync_requests_success_total` | _Not yet documented_ | counter | None
-`wmi_ad_replication_sync_requests_schema_mismatch_failure_total` | _Not yet documented_ | counter | None
+`windows_ad_replication_sync_requests_schema_mismatch_failure_total` | _Not yet documented_ | counter | None
-`wmi_ad_name_translations_total` | _Not yet documented_ | counter | `target_name`
+`windows_ad_name_translations_total` | _Not yet documented_ | counter | `target_name`
-`wmi_ad_change_monitors_registered` | _Not yet documented_ | gauge | None
+`windows_ad_change_monitors_registered` | _Not yet documented_ | gauge | None
-`wmi_ad_change_monitor_updates_pending` | _Not yet documented_ | gauge | None
+`windows_ad_change_monitor_updates_pending` | _Not yet documented_ | gauge | None
-`wmi_ad_name_cache_hits_total` | _Not yet documented_ | counter | None
+`windows_ad_name_cache_hits_total` | _Not yet documented_ | counter | None
-`wmi_ad_name_cache_lookups_total` | _Not yet documented_ | counter | None
+`windows_ad_name_cache_lookups_total` | _Not yet documented_ | counter | None
-`wmi_ad_directory_operations_total` | _Not yet documented_ | counter | `operation`, `origin`
+`windows_ad_directory_operations_total` | _Not yet documented_ | counter | `operation`, `origin`
-`wmi_ad_directory_search_suboperations_total` | _Not yet documented_ | counter | None
+`windows_ad_directory_search_suboperations_total` | _Not yet documented_ | counter | None
-`wmi_ad_security_descriptor_propagation_events_total` | _Not yet documented_ | counter | None
+`windows_ad_security_descriptor_propagation_events_total` | _Not yet documented_ | counter | None
-`wmi_ad_security_descriptor_propagation_events_queued` | _Not yet documented_ | gauge | None
+`windows_ad_security_descriptor_propagation_events_queued` | _Not yet documented_ | gauge | None
-`wmi_ad_security_descriptor_propagation_access_wait_total_seconds` | _Not yet documented_ | gauge | None
+`windows_ad_security_descriptor_propagation_access_wait_total_seconds` | _Not yet documented_ | gauge | None
-`wmi_ad_security_descriptor_propagation_items_queued_total` | _Not yet documented_ | counter | None
+`windows_ad_security_descriptor_propagation_items_queued_total` | _Not yet documented_ | counter | None
-`wmi_ad_directory_service_threads` | _Not yet documented_ | gauge | None
+`windows_ad_directory_service_threads` | _Not yet documented_ | gauge | None
-`wmi_ad_ldap_closed_connections_total` | _Not yet documented_ | counter | None
+`windows_ad_ldap_closed_connections_total` | _Not yet documented_ | counter | None
-`wmi_ad_ldap_opened_connections_total` | _Not yet documented_ | counter | `type`
+`windows_ad_ldap_opened_connections_total` | _Not yet documented_ | counter | `type`
-`wmi_ad_ldap_active_threads` | _Not yet documented_ | gauge | None
+`windows_ad_ldap_active_threads` | _Not yet documented_ | gauge | None
-`wmi_ad_ldap_last_bind_time_seconds` | _Not yet documented_ | gauge | None
+`windows_ad_ldap_last_bind_time_seconds` | _Not yet documented_ | gauge | None
-`wmi_ad_ldap_searches_total` | _Not yet documented_ | counter | None
+`windows_ad_ldap_searches_total` | _Not yet documented_ | counter | None
-`wmi_ad_ldap_udp_operations_total` | _Not yet documented_ | counter | None
+`windows_ad_ldap_udp_operations_total` | _Not yet documented_ | counter | None
-`wmi_ad_ldap_writes_total` | _Not yet documented_ | counter | None
+`windows_ad_ldap_writes_total` | _Not yet documented_ | counter | None
-`wmi_ad_link_values_cleaned_total` | _Not yet documented_ | counter | None
+`windows_ad_link_values_cleaned_total` | _Not yet documented_ | counter | None
-`wmi_ad_phantom_objects_cleaned_total` | _Not yet documented_ | counter | None
+`windows_ad_phantom_objects_cleaned_total` | _Not yet documented_ | counter | None
-`wmi_ad_phantom_objects_visited_total` | _Not yet documented_ | counter | None
+`windows_ad_phantom_objects_visited_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_group_membership_evaluations_total` | _Not yet documented_ | counter | `group_type`
+`windows_ad_sam_group_membership_evaluations_total` | _Not yet documented_ | counter | `group_type`
-`wmi_ad_sam_group_membership_global_catalog_evaluations_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_group_membership_global_catalog_evaluations_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_group_membership_evaluations_nontransitive_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_group_membership_evaluations_nontransitive_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_group_membership_evaluations_transitive_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_group_membership_evaluations_transitive_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_group_evaluation_latency` | _Not yet documented_ | gauge | `evaluation_type`
+`windows_ad_sam_group_evaluation_latency` | _Not yet documented_ | gauge | `evaluation_type`
-`wmi_ad_sam_computer_creation_requests_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_computer_creation_requests_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_computer_creation_successful_requests_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_computer_creation_successful_requests_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_user_creation_requests_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_user_creation_requests_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_user_creation_successful_requests_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_user_creation_successful_requests_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_query_display_requests_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_query_display_requests_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_enumerations_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_enumerations_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_membership_changes_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_membership_changes_total` | _Not yet documented_ | counter | None
-`wmi_ad_sam_password_changes_total` | _Not yet documented_ | counter | None
+`windows_ad_sam_password_changes_total` | _Not yet documented_ | counter | None
-`wmi_ad_tombstoned_objects_collected_total` | _Not yet documented_ | counter | None
+`windows_ad_tombstoned_objects_collected_total` | _Not yet documented_ | counter | None
-`wmi_ad_tombstoned_objects_visited_total` | _Not yet documented_ | counter | None
+`windows_ad_tombstoned_objects_visited_total` | _Not yet documented_ | counter | None
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.adfs.md

@@ -0,0 +1,51 @@
+# adfs collector
+
+The adfs collector exposes metrics about Active Directory Federation Services. Note that this collector has only been tested against ADFS 4.0 (2016).
+Other ADFS versions may work but are not tested.
+
+|||
+-|-
+Metric name prefix  | `adfs`
+Data source         | Perflib
+Counters            | `AD FS`
+Enabled by default? | No
+
+## Flags
+
+None
+
+## Metrics
+
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`windows_adfs_ad_login_connection_failures` | Total number of connection failures between the ADFS server and the Active Directory domain controller(s) | counter | None
+`windows_adfs_certificate_authentications` | Total number of [User Certificate](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/configure-user-certificate-authentication) authentications. I.E. smart cards or mobile devices with provisioned client certificates | counter | None
+`windows_adfs_device_authentications` | Total number of [device authentications](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/device-authentication-controls-in-ad-fs) (SignedToken, clientTLS, PkeyAuth). Device authentication is only available on ADFS 2016 or later | counter | None
+`windows_adfs_extranet_account_lockouts` | Total number of [extranet lockouts](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/configure-ad-fs-extranet-smart-lockout-protection). Requires the Extranet Lockout feature to be enabled | counter | None
+`windows_adfs_federated_authentications` | Total number of authentications from federated sources. E.G. Office365 | counter | None
+`windows_adfs_passport_authentications` | Total number of authentications from [Microsoft Passport](https://en.wikipedia.org/wiki/Microsoft_account) (now named Microsoft Account) | counter | None
+`windows_adfs_password_change_failed` | Total number of failed password changes. The Password Change Portal must be enabled in the AD FS Management tool in order to allow user password changes | counter | None
+`windows_adfs_password_change_succeeded` | Total number of succeeded password changes. The Password Change Portal must be enabled in the AD FS Management tool in order to allow user password changes | counter | None
+`windows_adfs_token_requests` | Total number of requested access tokens | counter | None
+`windows_adfs_windows_integrated_authentications` | Total number of Windows integrated authentications using Kerberos or NTLM | counter | None
+
+### Example metric
+Show rate of device authentications in AD FS:
+```
+rate(windows_adfs_device_authentications)[2m]
+```
+
+## Useful queries
+
+## Alerting examples
+**prometheus.rules**
+```yaml
+  - alert: "HighExtranetLockouts"
+    expr: "rate(windows_adfs_extranet_account_lockouts)[2m] > 100"
+    for: "10m"
+    labels:
+      severity: "high"
+    annotations:
+      summary: "High number of AD FS extranet lockouts"
+      description: "High number of AD FS extranet lockouts may indicate a password spray attack.\n Server: {{ $labels.instance }}\n Number of lockouts: {{ $value }}"
+```

docs/collector.container.md

@@ -15,23 +15,23 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_container_available` | Available | counter | `container_id`
+`windows_container_available` | Available | counter | `container_id`
-`wmi_container_count` | Number of containers | gauge | `container_id`
+`windows_container_count` | Number of containers | gauge | `container_id`
-`wmi_container_cpu_usage_seconds_kernelmode` | Run time in Kernel mode in Seconds | counter | `container_id`
+`windows_container_cpu_usage_seconds_kernelmode` | Run time in Kernel mode in Seconds | counter | `container_id`
-`wmi_container_cpu_usage_seconds_usermode` | Run Time in User mode in Seconds | counter | `container_id`
+`windows_container_cpu_usage_seconds_usermode` | Run Time in User mode in Seconds | counter | `container_id`
-`wmi_container_cpu_usage_seconds_total` | Total Run time in Seconds | counter | `container_id`
+`windows_container_cpu_usage_seconds_total` | Total Run time in Seconds | counter | `container_id`
-`wmi_container_memory_usage_commit_bytes` | Memory Usage Commit Bytes | gauge | `container_id`
+`windows_container_memory_usage_commit_bytes` | Memory Usage Commit Bytes | gauge | `container_id`
-`wmi_container_memory_usage_commit_peak_bytes` | Memory Usage Commit Peak Bytes | gauge | `container_id`
+`windows_container_memory_usage_commit_peak_bytes` | Memory Usage Commit Peak Bytes | gauge | `container_id`
-`wmi_container_memory_usage_private_working_set_bytes` | Memory Usage Private Working Set Bytes | gauge | `container_id`
+`windows_container_memory_usage_private_working_set_bytes` | Memory Usage Private Working Set Bytes | gauge | `container_id`
-`wmi_container_network_receive_bytes_total` | Bytes Received on Interface | counter | `container_id`, `interface`
+`windows_container_network_receive_bytes_total` | Bytes Received on Interface | counter | `container_id`, `interface`
-`wmi_container_network_receive_packets_total` | Packets Received on Interface | counter | `container_id`, `interface`
+`windows_container_network_receive_packets_total` | Packets Received on Interface | counter | `container_id`, `interface`
-`wmi_container_network_receive_packets_dropped_total` | Dropped Incoming Packets on Interface | counter | `container_id`, `interface`
+`windows_container_network_receive_packets_dropped_total` | Dropped Incoming Packets on Interface | counter | `container_id`, `interface`
-`wmi_container_network_transmit_bytes_total` | Bytes Sent on Interface | counter | `container_id`, `interface`
+`windows_container_network_transmit_bytes_total` | Bytes Sent on Interface | counter | `container_id`, `interface`
-`wmi_container_network_transmit_packets_total` | Packets Sent on Interface | counter | `container_id`, `interface`
+`windows_container_network_transmit_packets_total` | Packets Sent on Interface | counter | `container_id`, `interface`
-`wmi_container_network_transmit_packets_dropped_total` | Dropped Outgoing Packets on Interface | counter | `container_id`, `interface`
+`windows_container_network_transmit_packets_dropped_total` | Dropped Outgoing Packets on Interface | counter | `container_id`, `interface`
 
 ### Example metric
-_wmi_container_network_receive_bytes_total{container_id="docker://1bd30e8b8ac28cbd76a9b697b4d7bb9d760267b0733d1bc55c60024e98d1e43e",interface="822179E7-002C-4280-ABBA-28BCFE401826"} 9.3305343e+07_
+_windows_container_network_receive_bytes_total{container_id="docker://1bd30e8b8ac28cbd76a9b697b4d7bb9d760267b0733d1bc55c60024e98d1e43e",interface="822179E7-002C-4280-ABBA-28BCFE401826"} 9.3305343e+07_
 
 This metric means that total _9.3305343e+07_ bytes received on interface _822179E7-002C-4280-ABBA-28BCFE401826_ for container _docker://1bd30e8b8ac28cbd76a9b697b4d7bb9d760267b0733d1bc55c60024e98d1e43e_
 

docs/collector.cpu.md

@@ -18,39 +18,39 @@ These metrics are available on all versions of Windows:
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_cpu_cstate_seconds_total` | Time spent in low-power idle states | counter | `core`, `state`
+`windows_cpu_cstate_seconds_total` | Time spent in low-power idle states | counter | `core`, `state`
-`wmi_cpu_time_total` | Time that processor spent in different modes (idle, user, system, ...) | counter | `core`, `mode`
+`windows_cpu_time_total` | Time that processor spent in different modes (idle, user, system, ...) | counter | `core`, `mode`
-`wmi_cpu_interrupts_total` | Total number of received and serviced hardware interrupts | counter | `core`
+`windows_cpu_interrupts_total` | Total number of received and serviced hardware interrupts | counter | `core`
-`wmi_cpu_dpcs_total` | Total number of received and serviced deferred procedure calls (DPCs) | 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
 -----|-------------|------|-------
-`wmi_cpu_clock_interrupts_total` | Total number of received and serviced clock tick interrupts | `core`
+`windows_cpu_clock_interrupts_total` | Total number of received and serviced clock tick interrupts | `core`
-`wmi_cpu_idle_break_events_total` | Total number of time processor was woken from idle | `core`
+`windows_cpu_idle_break_events_total` | Total number of time processor was woken from idle | `core`
-`wmi_cpu_parking_status` | Parking Status represents whether a processor is parked or not | `gauge`
+`windows_cpu_parking_status` | Parking Status represents whether a processor is parked or not | `gauge`
-`wmi_cpu_core_frequency_mhz` | Core frequency in megahertz | `gauge`
+`windows_cpu_core_frequency_mhz` | Core frequency in megahertz | `gauge`
-`wmi_cpu_processor_performance` | 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% | `gauge`
+`windows_cpu_processor_performance` | 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% | `gauge`
 
 ### Example metric
 Show frequency of host CPU cores
 ```
-wmi_cpu_core_frequency_mhz{instance="localhost"}
+windows_cpu_core_frequency_mhz{instance="localhost"}
 ```
 
 ## Useful queries
 Show cpu usage by mode.
 ```
-sum by (mode) (irate(wmi_cpu_time_total{instance="localhost"}[5m]))
+sum by (mode) (irate(windows_cpu_time_total{instance="localhost"}[5m]))
 ```
 
 ## Alerting examples
 **prometheus.rules**
-```
+```yaml
 # Alert on hosts with more than 80% CPU usage over a 10 minute period
 - alert: CpuUsage
-  expr: 100 - (avg by (instance) (irate(wmi_cpu_time_total{mode="idle"}[2m])) * 100) > 80
+  expr: 100 - (avg by (instance) (irate(windows_cpu_time_total{mode="idle"}[2m])) * 100) > 80
   for: 10m
   labels:
     severity: warning

docs/collector.cs.md

@@ -16,8 +16,9 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_cs_logical_processors` | Number of installed logical processors | gauge | None
+`windows_cs_logical_processors` | Number of installed logical processors | gauge | None
-`wmi_cs_physical_memory_bytes` | Total installed physical memory | gauge | None
+`windows_cs_physical_memory_bytes` | Total installed physical memory | gauge | None
+`windows_cs_hostname` | Labeled system hostname information | gauge | `hostname`, `domain`, `fqdn`
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.dhcp.md

@@ -0,0 +1,53 @@
+# dhcp collector
+
+The dhcp collector exposes DHCP Server metrics
+
+|||
+-|-
+Metric name prefix  | `dhcp`
+Data source         | Perflib
+Classes             | `DHCP Server`
+Enabled by default? | No
+
+## Flags
+
+None
+
+## Metrics
+
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`packets_received_total` | Total number of packets received by the DHCP server | counter | None
+`duplicates_dropped_total` | Total number of duplicate packets received by the DHCP server | counter | None
+`packets_expired_total` | Total number of packets expired in the DHCP server message queue | counter | None
+`active_queue_length` | Number of packets in the processing queue of the DHCP server | gauge | None
+`conflict_check_queue_length` | Number of packets in the DHCP server queue waiting on conflict detection (ping) | gauge | None
+`discovers_total` | Total DHCP Discovers received by the DHCP server | counter | None
+`offers_total` | Total DHCP Offers sent by the DHCP server | counter | None
+`requests_total` | Total DHCP Requests received by the DHCP server | counter | None
+`informs_total` | Total DHCP Informs received by the DHCP server | counter | None
+`acks_total` | Total DHCP Acks sent by the DHCP server | counter | None
+`nacks_total` | Total DHCP Nacks sent by the DHCP server | counter | None
+`declines_total` | Total DHCP Declines received by the DHCP server | counter | None
+`releases_total` | Total DHCP Releases received by the DHCP server | counter | None
+`offer_queue_length` | Number of packets in the offer queue of the DHCP server | gauge | None
+`denied_due_to_match_total` | Total number of DHCP requests denied, based on matches from the Deny List | gauge | None
+`denied_due_to_nonmatch_total` | Total number of DHCP requests denied, based on non-matches from the Allow List | gauge | None
+`failover_bndupd_sent_total` | Number of DHCP failover Binding Update messages sent | counter | None
+`failover_bndupd_received_total` | Number of DHCP failover Binding Update messages received | counter | None
+`failover_bndack_sent_total` | Number of DHCP failover Binding Ack messages sent | counter | None
+`failover_bndack_received_total` | Number of DHCP failover Binding Ack messages received | counter | None
+`failover_bndupd_pending_in_outbound_queue` | Number of pending outbound DHCP failover Binding Update messages | counter | None
+`failover_transitions_communicationinterrupted_state_total` | Total number of transitions into COMMUNICATION INTERRUPTED state | counter | None
+`failover_transitions_partnerdown_state_total` | Total number of transitions into PARTNER DOWN state | counter | None
+`failover_transitions_recover_total` | Total number of transitions into RECOVER state | counter | None
+`failover_bndupd_dropped_total` | Total number of DHCP faileover Binding Updates dropped | 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/collector.dns.md

@@ -16,28 +16,28 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_dns_zone_transfer_requests_received_total` | _Not yet documented_ | counter | `qtype`
+`windows_dns_zone_transfer_requests_received_total` | _Not yet documented_ | counter | `qtype`
-`wmi_dns_zone_transfer_requests_sent_total` | _Not yet documented_ | counter | `qtype`
+`windows_dns_zone_transfer_requests_sent_total` | _Not yet documented_ | counter | `qtype`
-`wmi_dns_zone_transfer_response_received_total` | _Not yet documented_ | counter | `qtype`
+`windows_dns_zone_transfer_response_received_total` | _Not yet documented_ | counter | `qtype`
-`wmi_dns_zone_transfer_success_received_total` | _Not yet documented_ | counter | `qtype`, `protocol`
+`windows_dns_zone_transfer_success_received_total` | _Not yet documented_ | counter | `qtype`, `protocol`
-`wmi_dns_zone_transfer_success_sent_total` | _Not yet documented_ | counter | `qtype`
+`windows_dns_zone_transfer_success_sent_total` | _Not yet documented_ | counter | `qtype`
-`wmi_dns_zone_transfer_failures_total` | _Not yet documented_ | counter | None
+`windows_dns_zone_transfer_failures_total` | _Not yet documented_ | counter | None
-`wmi_dns_memory_used_bytes_total` | _Not yet documented_ | gauge | `area`
+`windows_dns_memory_used_bytes_total` | _Not yet documented_ | gauge | `area`
-`wmi_dns_dynamic_updates_queued` | _Not yet documented_ | gauge | None
+`windows_dns_dynamic_updates_queued` | _Not yet documented_ | gauge | None
-`wmi_dns_dynamic_updates_received_total` | _Not yet documented_ | counter | `operation`
+`windows_dns_dynamic_updates_received_total` | _Not yet documented_ | counter | `operation`
-`wmi_dns_dynamic_updates_failures_total` | _Not yet documented_ | counter | `reason`
+`windows_dns_dynamic_updates_failures_total` | _Not yet documented_ | counter | `reason`
-`wmi_dns_notify_received_total` | _Not yet documented_ | counter | None
+`windows_dns_notify_received_total` | _Not yet documented_ | counter | None
-`wmi_dns_notify_sent_total` | _Not yet documented_ | counter | None
+`windows_dns_notify_sent_total` | _Not yet documented_ | counter | None
-`wmi_dns_secure_update_failures_total` | _Not yet documented_ | counter | None
+`windows_dns_secure_update_failures_total` | _Not yet documented_ | counter | None
-`wmi_dns_secure_update_received_total` | _Not yet documented_ | counter | None
+`windows_dns_secure_update_received_total` | _Not yet documented_ | counter | None
-`wmi_dns_queries_total` | _Not yet documented_ | counter | `protocol`
+`windows_dns_queries_total` | _Not yet documented_ | counter | `protocol`
-`wmi_dns_responses_total` | _Not yet documented_ | counter | `protocol`
+`windows_dns_responses_total` | _Not yet documented_ | counter | `protocol`
-`wmi_dns_recursive_queries_total` | _Not yet documented_ | counter | None
+`windows_dns_recursive_queries_total` | _Not yet documented_ | counter | None
-`wmi_dns_recursive_query_failures_total` | _Not yet documented_ | counter | None
+`windows_dns_recursive_query_failures_total` | _Not yet documented_ | counter | None
-`wmi_dns_recursive_query_send_timeouts_total` | _Not yet documented_ | counter | None
+`windows_dns_recursive_query_send_timeouts_total` | _Not yet documented_ | counter | None
-`wmi_dns_wins_queries_total` | _Not yet documented_ | counter | `direction`
+`windows_dns_wins_queries_total` | _Not yet documented_ | counter | `direction`
-`wmi_dns_wins_responses_total` | _Not yet documented_ | counter | `direction`
+`windows_dns_wins_responses_total` | _Not yet documented_ | counter | `direction`
-`wmi_dns_unmatched_responses_total` | _Not yet documented_ | counter | None
+`windows_dns_unmatched_responses_total` | _Not yet documented_ | counter | None
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.exchange.md

@@ -0,0 +1,67 @@
+# exchange collector
+
+The exchange collector collects metrics from MS Exchange hosts through perflib
+=======
+
+
+|||
+-|-
+Metric name prefix  | `exchange`
+Classes 			| [Win32_PerfRawData_MSExchangeADAccess_MSExchangeADAccessProcesses](https://docs.microsoft.com/en-us/exchange/)<br/> [Win32_PerfRawData_MSExchangeTransportQueues_MSExchangeTransportueues](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
+
+## Flags
+
+### `--collectors.exchange.list`
+Lists the Perflib Objects that are queried for data along with the perlfib object id
+
+## 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 lengt
+`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
+
+### 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.hyperv.md

@@ -1,4 +1,4 @@
-# hyperv collector
+ # hyperv collector
 
 The hyperv collector exposes metrics about the Hyper-V hypervisor
 
@@ -16,81 +16,81 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_hyper_health_critical` | _Not yet documented_ | counter | None
+`windows_hyperv_health_critical` | _Not yet documented_ | counter | None
-`wmi_hyper_health_ok` | _Not yet documented_ | counter | None
+`windows_hyperv_health_ok` | _Not yet documented_ | counter | None
-`wmi_hyper_vid_physical_pages_allocated` | _Not yet documented_ | counter | `vm`
+`windows_hyperv_vid_physical_pages_allocated` | _Not yet documented_ | counter | `vm`
-`wmi_hyper_vid_preferred_numa_node_index` | _Not yet documented_ | counter | `vm`
+`windows_hyperv_vid_preferred_numa_node_index` | _Not yet documented_ | counter | `vm`
-`wmi_hyper_vid_remote_physical_pages` | _Not yet documented_ | counter | `vm`
+`windows_hyperv_vid_remote_physical_pages` | _Not yet documented_ | counter | `vm`
-`wmi_hyper_root_partition_address_spaces` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_address_spaces` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_attached_devices` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_attached_devices` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_deposited_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_deposited_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_device_dma_errors` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_device_dma_errors` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_device_interrupt_errors` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_device_interrupt_errors` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_device_interrupt_mappings` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_device_interrupt_mappings` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_device_interrupt_throttle_events` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_device_interrupt_throttle_events` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_preferred_numa_node_index` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_preferred_numa_node_index` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_gpa_space_modifications` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_gpa_space_modifications` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_io_tlb_flush_cost` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_io_tlb_flush_cost` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_io_tlb_flush` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_io_tlb_flush` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_recommended_virtual_tlb_size` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_recommended_virtual_tlb_size` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_physical_pages_allocated` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_physical_pages_allocated` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_1G_device_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_1G_device_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_1G_gpa_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_1G_gpa_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_2M_device_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_2M_device_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_2M_gpa_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_2M_gpa_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_4K_device_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_4K_device_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_4K_gpa_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_4K_gpa_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_virtual_tlb_flush_entires` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_virtual_tlb_flush_entires` | _Not yet documented_ | counter | None
-`wmi_hyper_root_partition_virtual_tlb_pages` | _Not yet documented_ | counter | None
+`windows_hyperv_root_partition_virtual_tlb_pages` | _Not yet documented_ | counter | None
-`wmi_hyper_hypervisor_virtual_processors` | _Not yet documented_ | counter | None
+`windows_hyperv_hypervisor_virtual_processors` | _Not yet documented_ | counter | None
-`wmi_hyper_hypervisor_logical_processors` | _Not yet documented_ | counter | None
+`windows_hyperv_hypervisor_logical_processors` | _Not yet documented_ | counter | None
-`wmi_hyper_host_cpu_guest_run_time` | _Not yet documented_ | counter | `core`
+`windows_hyperv_host_cpu_guest_run_time` | _Not yet documented_ | counter | `core`
-`wmi_hyper_host_cpu_hypervisor_run_time` | _Not yet documented_ | counter | `core`
+`windows_hyperv_host_cpu_hypervisor_run_time` | _Not yet documented_ | counter | `core`
-`wmi_hyper_host_cpu_remote_run_time` | _Not yet documented_ | counter | `core`
+`windows_hyperv_host_cpu_remote_run_time` | _Not yet documented_ | counter | `core`
-`wmi_hyper_host_cpu_total_run_time` | _Not yet documented_ | counter | `core`
+`windows_hyperv_host_cpu_total_run_time` | _Not yet documented_ | counter | `core`
-`wmi_hyper_vm_cpu_guest_run_time` | _Not yet documented_ | counter | `vm`, `core`
+`windows_hyperv_vm_cpu_guest_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`wmi_hyper_vm_cpu_hypervisor_run_time` | _Not yet documented_ | counter | `vm`, `core`
+`windows_hyperv_vm_cpu_hypervisor_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`wmi_hyper_vm_cpu_remote_run_time` | _Not yet documented_ | counter | `vm`, `core`
+`windows_hyperv_vm_cpu_remote_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`wmi_hyper_vm_cpu_total_run_time` | _Not yet documented_ | counter | `vm`, `core`
+`windows_hyperv_vm_cpu_total_run_time` | _Not yet documented_ | counter | `vm`, `core`
-`wmi_hyper_vswitch_broadcast_packets_received_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_broadcast_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_broadcast_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_broadcast_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_bytes_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_bytes_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_bytes_received_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_bytes_received_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_bytes_sent_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_bytes_sent_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_directed_packets_received_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_directed_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_directed_packets_send_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_directed_packets_send_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_dropped_packets_incoming_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_dropped_packets_incoming_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_dropped_packets_outcoming_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_dropped_packets_outcoming_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_extensions_dropped_packets_incoming_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_extensions_dropped_packets_incoming_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_extensions_dropped_packets_outcoming_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_extensions_dropped_packets_outcoming_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_learned_mac_addresses_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_learned_mac_addresses_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_multicast_packets_received_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_multicast_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_multicast_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_multicast_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_number_of_send_channel_moves_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_number_of_send_channel_moves_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_number_of_vmq_moves_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_number_of_vmq_moves_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_packets_flooded_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_packets_flooded_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_packets_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_packets_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_packets_received_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_packets_received_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_packets_sent_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_vswitch_purged_mac_addresses_total` | _Not yet documented_ | counter | `vswitch`
+`windows_hyperv_vswitch_purged_mac_addresses_total` | _Not yet documented_ | counter | `vswitch`
-`wmi_hyper_ethernet_bytes_dropped` | _Not yet documented_ | counter | `adapter`
+`windows_hyperv_ethernet_bytes_dropped` | _Not yet documented_ | counter | `adapter`
-`wmi_hyper_ethernet_bytes_received` | _Not yet documented_ | counter | `adapter`
+`windows_hyperv_ethernet_bytes_received` | _Not yet documented_ | counter | `adapter`
-`wmi_hyper_ethernet_bytes_sent` | _Not yet documented_ | counter | `adapter`
+`windows_hyperv_ethernet_bytes_sent` | _Not yet documented_ | counter | `adapter`
-`wmi_hyper_ethernet_frames_dropped` | _Not yet documented_ | counter | `adapter`
+`windows_hyperv_ethernet_frames_dropped` | _Not yet documented_ | counter | `adapter`
-`wmi_hyper_ethernet_frames_received` | _Not yet documented_ | counter | `adapter`
+`windows_hyperv_ethernet_frames_received` | _Not yet documented_ | counter | `adapter`
-`wmi_hyper_ethernet_frames_sent` | _Not yet documented_ | counter | `adapter`
+`windows_hyperv_ethernet_frames_sent` | _Not yet documented_ | counter | `adapter`
-`wmi_hyper_vm_device_error_count` | _Not yet documented_ | counter | `vm_device`
+`windows_hyperv_vm_device_error_count` | _Not yet documented_ | counter | `vm_device`
-`wmi_hyper_vm_device_queue_length` | _Not yet documented_ | counter | `vm_device`
+`windows_hyperv_vm_device_queue_length` | _Not yet documented_ | counter | `vm_device`
-`wmi_hyper_vm_device_bytes_read` | _Not yet documented_ | counter | `vm_device`
+`windows_hyperv_vm_device_bytes_read` | _Not yet documented_ | counter | `vm_device`
-`wmi_hyper_vm_device_operations_read` | _Not yet documented_ | counter | `vm_device`
+`windows_hyperv_vm_device_operations_read` | _Not yet documented_ | counter | `vm_device`
-`wmi_hyper_vm_device_bytes_written` | _Not yet documented_ | counter | `vm_device`
+`windows_hyperv_vm_device_bytes_written` | _Not yet documented_ | counter | `vm_device`
-`wmi_hyper_vm_device_operations_written` | _Not yet documented_ | counter | `vm_device`
+`windows_hyperv_vm_device_operations_written` | _Not yet documented_ | counter | `vm_device`
-`wmi_hyper_vm_interface_bytes_received` | _Not yet documented_ | counter | `vm_interface`
+`windows_hyperv_vm_interface_bytes_received` | _Not yet documented_ | counter | `vm_interface`
-`wmi_hyper_vm_interface_bytes_sent` | _Not yet documented_ | counter | `vm_interface`
+`windows_hyperv_vm_interface_bytes_sent` | _Not yet documented_ | counter | `vm_interface`
-`wmi_hyper_vm_interface_packets_incoming_dropped` | _Not yet documented_ | counter | `vm_interface`
+`windows_hyperv_vm_interface_packets_incoming_dropped` | _Not yet documented_ | counter | `vm_interface`
-`wmi_hyper_vm_interface_packets_outgoing_dropped` | _Not yet documented_ | counter | `vm_interface`
+`windows_hyperv_vm_interface_packets_outgoing_dropped` | _Not yet documented_ | counter | `vm_interface`
-`wmi_hyper_vm_interface_packets_received` | _Not yet documented_ | counter | `vm_interface`
+`windows_hyperv_vm_interface_packets_received` | _Not yet documented_ | counter | `vm_interface`
-`wmi_hyper_vm_interface_packets_sent` | _Not yet documented_ | counter | `vm_interface`
+`windows_hyperv_vm_interface_packets_sent` | _Not yet documented_ | counter | `vm_interface`
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.iis.md

@@ -30,105 +30,105 @@ If given, an application needs to *not* match the blacklist regexp in order for
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_iis_current_anonymous_users` | _Not yet documented_ | counter | `site`
+`windows_iis_current_anonymous_users` | _Not yet documented_ | counter | `site`
-`wmi_iis_current_blocked_async_io_requests` | _Not yet documented_ | counter | `site`
+`windows_iis_current_blocked_async_io_requests` | _Not yet documented_ | counter | `site`
-`wmi_iis_current_cgi_requests` | _Not yet documented_ | counter | `site`
+`windows_iis_current_cgi_requests` | _Not yet documented_ | counter | `site`
-`wmi_iis_current_connections` | _Not yet documented_ | counter | `site`
+`windows_iis_current_connections` | _Not yet documented_ | counter | `site`
-`wmi_iis_current_isapi_extension_requests` | _Not yet documented_ | counter | `site`
+`windows_iis_current_isapi_extension_requests` | _Not yet documented_ | counter | `site`
-`wmi_iis_current_non_anonymous_users` | _Not yet documented_ | counter | `site`
+`windows_iis_current_non_anonymous_users` | _Not yet documented_ | counter | `site`
-`wmi_iis_received_bytes_total` | _Not yet documented_ | counter | `site`
+`windows_iis_received_bytes_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_sent_bytes_total` | _Not yet documented_ | counter | `site`
+`windows_iis_sent_bytes_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_anonymous_users_total` | _Not yet documented_ | counter | `site`
+`windows_iis_anonymous_users_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_blocked_async_io_requests_total` | _Not yet documented_ | counter | `site`
+`windows_iis_blocked_async_io_requests_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_cgi_requests_total` | _Not yet documented_ | counter | `site`
+`windows_iis_cgi_requests_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_connection_attempts_all_instances_total` | _Not yet documented_ | counter | `site`
+`windows_iis_connection_attempts_all_instances_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_requests_total` | _Not yet documented_ | counter | `site`, `method`
+`windows_iis_requests_total` | _Not yet documented_ | counter | `site`, `method`
-`wmi_iis_files_received_total` | _Not yet documented_ | counter | `site`
+`windows_iis_files_received_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_files_sent_total` | _Not yet documented_ | counter | `site`
+`windows_iis_files_sent_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_ipapi_extension_requests_total` | _Not yet documented_ | counter | `site`
+`windows_iis_ipapi_extension_requests_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_locked_errors_total` | _Not yet documented_ | counter | `site`
+`windows_iis_locked_errors_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_logon_attempts_total` | _Not yet documented_ | counter | `site`
+`windows_iis_logon_attempts_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_non_anonymous_users_total` | _Not yet documented_ | counter | `site`
+`windows_iis_non_anonymous_users_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_not_found_errors_total` | _Not yet documented_ | counter | `site`
+`windows_iis_not_found_errors_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_rejected_async_io_requests_total` | _Not yet documented_ | counter | `site`
+`windows_iis_rejected_async_io_requests_total` | _Not yet documented_ | counter | `site`
-`wmi_iis_current_application_pool_state` | _Not yet documented_ | counter | `app`, `state`
+`windows_iis_current_application_pool_state` | _Not yet documented_ | counter | `app`, `state`
-`wmi_iis_current_application_pool_start_time` | _Not yet documented_ | counter | `app`
+`windows_iis_current_application_pool_start_time` | _Not yet documented_ | counter | `app`
-`wmi_iis_current_worker_processes` | _Not yet documented_ | counter | `app`
+`windows_iis_current_worker_processes` | _Not yet documented_ | counter | `app`
-`wmi_iis_maximum_worker_processes` | _Not yet documented_ | counter | `app`
+`windows_iis_maximum_worker_processes` | _Not yet documented_ | counter | `app`
-`wmi_iis_recent_worker_process_failures` | _Not yet documented_ | counter | `app`
+`windows_iis_recent_worker_process_failures` | _Not yet documented_ | counter | `app`
-`wmi_iis_time_since_last_worker_process_failure` | _Not yet documented_ | counter | `app`
+`windows_iis_time_since_last_worker_process_failure` | _Not yet documented_ | counter | `app`
-`wmi_iis_total_application_pool_recycles` | _Not yet documented_ | counter | `app`
+`windows_iis_total_application_pool_recycles` | _Not yet documented_ | counter | `app`
-`wmi_iis_total_application_pool_start_time` | _Not yet documented_ | counter | `app`
+`windows_iis_total_application_pool_start_time` | _Not yet documented_ | counter | `app`
-`wmi_iis_total_worker_processes_created` | _Not yet documented_ | counter | `app`
+`windows_iis_total_worker_processes_created` | _Not yet documented_ | counter | `app`
-`wmi_iis_total_worker_process_failures` | _Not yet documented_ | counter | `app`
+`windows_iis_total_worker_process_failures` | _Not yet documented_ | counter | `app`
-`wmi_iis_total_worker_process_ping_failures` | _Not yet documented_ | counter | `app`
+`windows_iis_total_worker_process_ping_failures` | _Not yet documented_ | counter | `app`
-`wmi_iis_total_worker_process_shutdown_failures` | _Not yet documented_ | counter | `app`
+`windows_iis_total_worker_process_shutdown_failures` | _Not yet documented_ | counter | `app`
-`wmi_iis_total_worker_process_startup_failures` | _Not yet documented_ | counter | `app`
+`windows_iis_total_worker_process_startup_failures` | _Not yet documented_ | counter | `app`
-`wmi_iis_worker_cache_active_flushed_entries` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_cache_active_flushed_entries` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_max_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_max_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_items` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_items_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_items_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_file_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_file_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_uri_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_uri_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_uri_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_uri_cache_items` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_uri_cache_items_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_items_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_uri_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_metadata_cache_items` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_metadata_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_metadata_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_metadata_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_metadata_cache_items_cached_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_items_cached_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_metadata_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_output_cache_active_flushed_items` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_output_cache_active_flushed_items` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_output_cache_items` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_output_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_output_cache_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_output_cache_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_output_queries_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_output_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_output_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_output_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_output_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_output_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_output_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_output_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_threads` | _Not yet documented_ | counter | `app`, `pid`, `state`
+`windows_iis_worker_threads` | _Not yet documented_ | counter | `app`, `pid`, `state`
-`wmi_iis_worker_max_threads` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_max_threads` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_requests_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_requests_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_current_requests` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_current_requests` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_request_errors_total` | _Not yet documented_ | counter | `app`, `pid`, `status_code`
+`windows_iis_worker_request_errors_total` | _Not yet documented_ | counter | `app`, `pid`, `status_code`
-`wmi_iis_worker_current_websocket_requests` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_current_websocket_requests` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_websocket_connection_attempts_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_websocket_connection_attempts_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_websocket_connection_accepted_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_websocket_connection_accepted_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_worker_websocket_connection_rejected_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_worker_websocket_connection_rejected_total` | _Not yet documented_ | counter | `app`, `pid`
-`wmi_iis_server_cache_active_flushed_entries` | _Not yet documented_ | counter | None
+`windows_iis_server_cache_active_flushed_entries` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_memory_bytes` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_memory_bytes` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_max_memory_bytes` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_max_memory_bytes` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_flushes_total` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_flushes_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_queries_total` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_queries_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_hits_total` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_hits_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_items` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_items` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_items_total` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_items_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_file_cache_items_flushed_total` | _Not yet documented_ | counter | None
+`windows_iis_server_file_cache_items_flushed_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_uri_cache_flushes_total` | _Not yet documented_ | counter | `mode`
+`windows_iis_server_uri_cache_flushes_total` | _Not yet documented_ | counter | `mode`
-`wmi_iis_server_uri_cache_queries_total` | _Not yet documented_ | counter | `mode`
+`windows_iis_server_uri_cache_queries_total` | _Not yet documented_ | counter | `mode`
-`wmi_iis_server_uri_cache_hits_total` | _Not yet documented_ | counter | `mode`
+`windows_iis_server_uri_cache_hits_total` | _Not yet documented_ | counter | `mode`
-`wmi_iis_server_uri_cache_items` | _Not yet documented_ | counter | `mode`
+`windows_iis_server_uri_cache_items` | _Not yet documented_ | counter | `mode`
-`wmi_iis_server_uri_cache_items_total` | _Not yet documented_ | counter | `mode`
+`windows_iis_server_uri_cache_items_total` | _Not yet documented_ | counter | `mode`
-`wmi_iis_server_uri_cache_items_flushed_total` | _Not yet documented_ | counter | `mode`
+`windows_iis_server_uri_cache_items_flushed_total` | _Not yet documented_ | counter | `mode`
-`wmi_iis_server_metadata_cache_items` | _Not yet documented_ | counter | None
+`windows_iis_server_metadata_cache_items` | _Not yet documented_ | counter | None
-`wmi_iis_server_metadata_cache_flushes_total` | _Not yet documented_ | counter | None
+`windows_iis_server_metadata_cache_flushes_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_metadata_cache_queries_total` | _Not yet documented_ | counter | None
+`windows_iis_server_metadata_cache_queries_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_metadata_cache_hits_total` | _Not yet documented_ | counter | None
+`windows_iis_server_metadata_cache_hits_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_metadata_cache_items_cached_total` | _Not yet documented_ | counter | None
+`windows_iis_server_metadata_cache_items_cached_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_metadata_cache_items_flushed_total` | _Not yet documented_ | counter | None
+`windows_iis_server_metadata_cache_items_flushed_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_output_cache_active_flushed_items` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_active_flushed_items` | _Not yet documented_ | counter | None
-`wmi_iis_server_output_cache_items` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_items` | _Not yet documented_ | counter | None
-`wmi_iis_server_output_cache_memory_bytes` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_memory_bytes` | _Not yet documented_ | counter | None
-`wmi_iis_server_output_cache_queries_total` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_queries_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_output_cache_hits_total` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_hits_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_output_cache_items_flushed_total` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_items_flushed_total` | _Not yet documented_ | counter | None
-`wmi_iis_server_output_cache_flushes_total` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_flushes_total` | _Not yet documented_ | counter | None
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.logical_disk.md

@@ -5,7 +5,8 @@ The logical_disk collector exposes metrics about logical disks (in contrast to p
 |||
 -|-
 Metric name prefix  | `logical_disk`
-Classes             | [`Win32_PerfRawData_PerfDisk_LogicalDisk`](https://msdn.microsoft.com/en-us/windows/hardware/aa394307(v=vs.71))
+Data source         | Perflib
+Counters             | `LogicalDisk` ([`Win32_PerfRawData_PerfDisk_LogicalDisk`](https://msdn.microsoft.com/en-us/windows/hardware/aa394307(v=vs.71)))
 Enabled by default? | Yes
 
 ## Flags
@@ -37,25 +38,25 @@ Name | Description | Type | Labels
 ### Example metric
 Query the rate of write operations to a disk
 ```
-rate(wmi_logical_disk_read_bytes_total{instance="localhost", volume=~"C:"}[2m])
+rate(windows_logical_disk_read_bytes_total{instance="localhost", volume=~"C:"}[2m])
 ```
 
 ## Useful queries
 Calculate rate of total IOPS for disk
 ```
-rate(wmi_logical_disk_reads_total{instance="localhost", volume="C:"}[2m]) + rate(wmi_logical_disk_writes_total{instance="localhost", volume="C:"}[2m])
+rate(windows_logical_disk_reads_total{instance="localhost", volume="C:"}[2m]) + rate(windows_logical_disk_writes_total{instance="localhost", volume="C:"}[2m])
 ```
 
 ## Alerting examples
 **prometheus.rules**
-```
+```yaml
 groups:
 - name: Windows Disk Alerts
   rules:
 
   # Sends an alert when disk space usage is above 95%
   - alert: DiskSpaceUsage
-    expr: 100.0 - 100 * (wmi_logical_disk_free_bytes / wmi_logical_disk_size_bytes) > 95
+    expr: 100.0 - 100 * (windows_logical_disk_free_bytes / windows_logical_disk_size_bytes) > 95
     for: 10m
     labels:
       severity: high
@@ -65,7 +66,7 @@ groups:
 
   # Alerts on disks with over 85% space usage predicted to fill within the next four days
   - alert: DiskFilling
-    expr: 100 * (wmi_logical_disk_free_bytes / wmi_logical_disk_size_bytes) < 15 and predict_linear(wmi_logical_disk_free_bytes[6h], 4 * 24 * 3600) < 0
+    expr: 100 * (windows_logical_disk_free_bytes / windows_logical_disk_size_bytes) < 15 and predict_linear(windows_logical_disk_free_bytes[6h], 4 * 24 * 3600) < 0
     for: 10m
     labels:
       severity: warning

docs/collector.logon.md

@@ -16,18 +16,18 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_logon_logon_type` | Number of active user logon sessions | gauge | status
+`windows_logon_logon_type` | Number of active user logon sessions | gauge | status
 
 ### Example metric
 Query the total number of interactive logon sessions
 ```
-wmi_logon_logon_type{status="interactive"}
+windows_logon_logon_type{status="interactive"}
 ```
 
 ## Useful queries
 Query the total number of local and remote (I.E. Terminal Services) interactive sessions.
 ```
-wmi_logon_logon_type{status=~"interactive|remoteinteractive"}
+windows_logon_logon_type{status=~"interactive|remoteinteractive"}
 ```
 
 ## Alerting examples

docs/collector.memory.md

@@ -5,6 +5,7 @@ The memory collector exposes metrics about system memory usage
 |||
 -|-
 Metric name prefix  | `memory`
+Data source         | Perflib
 Classes             | `Win32_PerfRawData_PerfOS_Memory`
 Enabled by default? | Yes
 
@@ -16,40 +17,40 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_cs_logical_processors` | Number of installed logical processors | gauge | None
+`windows_cs_logical_processors` | Number of installed logical processors | gauge | None
-`wmi_cs_physical_memory_bytes` | Total installed physical memory | gauge | None
+`windows_cs_physical_memory_bytes` | Total installed physical memory | gauge | None
-`wmi_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_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
-`wmi_memory_cache_bytes` | Number of bytes currently being used by the file system cache | gauge | None
+`windows_memory_cache_bytes` | Number of bytes currently being used by the file system cache | gauge | None
-`wmi_memory_cache_bytes_peak` | Maximum number of CacheBytes after the system was last restarted | gauge | None
+`windows_memory_cache_bytes_peak` | Maximum number of CacheBytes after the system was last restarted | gauge | None
-`wmi_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) | 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) | gauge | None
-`wmi_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_commit_limit` | Amount of virtual memory, in bytes, that can be committed without having to extend the paging file(s) | gauge | None
-`wmi_memory_committed_bytes` | Amount of committed virtual memory, in bytes | gauge | None
+`windows_memory_committed_bytes` | Amount of committed virtual memory, in bytes | gauge | None
-`wmi_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 | 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 | gauge | None
-`wmi_memory_free_and_zero_page_list_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_free_and_zero_page_list_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_free_system_page_table_entries` | Number of page table entries not being used by the system | gauge | None
+`windows_memory_free_system_page_table_entries` | Number of page table entries not being used by the system | gauge | None
-`wmi_memory_modified_page_list_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_modified_page_list_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_page_faults_total` | Overall rate at which faulted pages are handled by the processor | gauge | None
+`windows_memory_page_faults_total` | Overall rate at which faulted pages are handled by the processor | gauge | None
-`wmi_memory_swap_page_reads_total` | Number of disk page reads (a single read operation reading several pages is still only counted once) | gauge | None
+`windows_memory_swap_page_reads_total` | Number of disk page reads (a single read operation reading several pages is still only counted once) | gauge | None
-`wmi_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) | gauge | 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) | gauge | None
-`wmi_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) | gauge | 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) | gauge | None
-`wmi_memory_swap_page_operations_total` | Total number of swap page read and writes (PagesPersec) | gauge | None
+`windows_memory_swap_page_operations_total` | Total number of swap page read and writes (PagesPersec) | gauge | None
-`wmi_memory_swap_page_writes_total` | Number of disk page writes (a single write operation writing several pages is still only counted once) | gauge | None
+`windows_memory_swap_page_writes_total` | Number of disk page writes (a single write operation writing several pages is still only counted once) | gauge | None
-`wmi_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 | 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 | gauge | None
-`wmi_memory_pool_nonpaged_bytes_total` | Number of bytes in the non-paged pool | gauge | None
+`windows_memory_pool_nonpaged_bytes_total` | Number of bytes in the non-paged pool | gauge | None
-`wmi_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 | 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 | gauge | None
-`wmi_memory_pool_paged_bytes` | Number of bytes in the paged pool | gauge | None
+`windows_memory_pool_paged_bytes` | Number of bytes in the paged pool | gauge | None
-`wmi_memory_pool_paged_resident_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_pool_paged_resident_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_standby_cache_core_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_standby_cache_core_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_standby_cache_normal_priority_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_standby_cache_normal_priority_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_standby_cache_reserve_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_standby_cache_reserve_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_system_cache_resident_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_system_cache_resident_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_system_code_resident_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_system_code_resident_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_system_code_total_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_system_code_total_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_system_driver_resident_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_system_driver_resident_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_system_driver_total_bytes` | _Not yet documented_ | gauge | None
+`windows_memory_system_driver_total_bytes` | _Not yet documented_ | gauge | None
-`wmi_memory_transition_faults_total` | _Not yet documented_ | gauge | None
+`windows_memory_transition_faults_total` | _Not yet documented_ | gauge | None
-`wmi_memory_transition_pages_repurposed_total` | _Not yet documented_ | gauge | None
+`windows_memory_transition_pages_repurposed_total` | _Not yet documented_ | gauge | None
-`wmi_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 | gauge | 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 | gauge | None
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.msmq.md

@@ -18,10 +18,10 @@ A WMI filter on which queues to include. `%` is a wildcard, and can be used to m
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_msmq_bytes_in_journal_queue` | Size of queue journal in bytes | gauge | `name`
+`windows_msmq_bytes_in_journal_queue` | Size of queue journal in bytes | gauge | `name`
-`wmi_msmq_bytes_in_queue` | Size of queue in bytes | gauge | `name`
+`windows_msmq_bytes_in_queue` | Size of queue in bytes | gauge | `name`
-`wmi_msmq_messages_in_journal_queue` | Count messages in queue journal | gauge | `name`
+`windows_msmq_messages_in_journal_queue` | Count messages in queue journal | gauge | `name`
-`wmi_msmq_messages_in_queue` | Count messages in queue | 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

@@ -22,234 +22,254 @@ If true, print available mssql WMI classes and exit.  Only displays if the mssql
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_mssql_collector_duration_seconds` | The time taken for each sub-collector to return | counter | `collector`, `instance`
+`windows_mssql_collector_duration_seconds` | The time taken for each sub-collector to return | counter | `collector`, `instance`
-`wmi_mssql_collector_success` | 1 if sub-collector succeeded, 0 otherwise | counter | `collector`, `instance`
+`windows_mssql_collector_success` | 1 if sub-collector succeeded, 0 otherwise | counter | `collector`, `instance`
-`wmi_mssql_accessmethods_au_batch_cleanups` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_au_cleanups` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_by_reference_lob_creates` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_by_reference_lob_uses` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_lob_read_aheads` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_lob_read_aheads` | The total count of lob pages on which readahead was issued | counter | `instance`
-`wmi_mssql_accessmethods_column_value_pulls` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_column_value_pulls` | The total count of column values that were pulled in-row from off-row | counter | `instance`
-`wmi_mssql_accessmethods_column_value_pushes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_column_value_pushes` | The total count of column values that were pushed from in-row to off-row | counter | `instance`
-`wmi_mssql_accessmethods_deferred_dropped_aus` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_accessmethods_deferred_dropped_rowsets` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_accessmethods_dropped_rowset_cleanups` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_dropped_rowset_skips` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_extent_deallocations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_extent_deallocations` | Number of extents deallocated per second in all databases in this instance of SQL Server | counter | `instance`
-`wmi_mssql_accessmethods_extent_allocations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_extent_allocations` | Number of extents allocated per second in all databases in this instance of SQL Server | counter | `instance`
-`wmi_mssql_accessmethods_au_batch_cleanup_failures` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_leaf_page_cookie_failures` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_tree_page_cookie_failures` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_forwarded_records` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_forwarded_records` | Number of records per second fetched through forwarded record pointers | counter | `instance`
-`wmi_mssql_accessmethods_free_space_page_fetches` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_free_space_scans` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_full_scans` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_full_scans` | Number of unrestricted full scans per second. These can be either base-table or full-index scans | counter | `instance`
-`wmi_mssql_accessmethods_index_searches` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_insysxact_waits` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_insysxact_waits` | Number of times a reader needs to wait for a page because the InSysXact bit is set | counter | `instance`
-`wmi_mssql_accessmethods_lob_handle_creates` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_lob_handle_creates` | Count of temporary lobs created | counter | `instance`
-`wmi_mssql_accessmethods_lob_handle_destroys` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_lob_handle_destroys` | Count of temporary lobs destroyed | counter | `instance`
-`wmi_mssql_accessmethods_lob_ss_provider_creates` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_lob_ss_provider_creates` | Count of LOB Storage Service Providers (LobSSP) created. One worktable created per LobSSP | counter | `instance`
-`wmi_mssql_accessmethods_lob_ss_provider_destroys` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_lob_ss_provider_destroys` | Count of LobSSP destroyed | counter | `instance`
-`wmi_mssql_accessmethods_lob_ss_provider_truncations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_lob_ss_provider_truncations` | Count of LobSSP truncated | counter | `instance`
-`wmi_mssql_accessmethods_mixed_page_allocations` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_page_compression_attempts` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_page_deallocations` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_page_allocations` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_page_compressions` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_page_splits` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_page_splits` | Number of page splits per second that occur as the result of overflowing index pages | counter | `instance`
-`wmi_mssql_accessmethods_probe_scans` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_range_scans` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_range_scans` | Number of qualified range scans through indexes per second | counter | `instance`
-`wmi_mssql_accessmethods_scan_point_revalidations` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_ghost_record_skips` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_ghost_record_skips` | Number of ghosted records per second skipped during scans | counter | `instance`
-`wmi_mssql_accessmethods_table_lock_escalations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_accessmethods_table_lock_escalations` | Number of times locks on a table were escalated to the TABLE or HoBT granularity | counter | `instance`
-`wmi_mssql_accessmethods_leaf_page_cookie_uses` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_tree_page_cookie_uses` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_workfile_creates` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_worktables_creates` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_accessmethods_worktables_from_cache_ratio` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_availreplica_received_from_replica_bytes` | _Not yet documented_ | counter | `instance`, `replica`
+`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 | `instance`, `replica`
-`wmi_mssql_availreplica_sent_to_replica_bytes` | _Not yet documented_ | counter | `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 | `instance`, `replica`
-`wmi_mssql_availreplica_sent_to_transport_bytes` | _Not yet documented_ | counter | `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 | `instance`, `replica`
-`wmi_mssql_availreplica_initiated_flow_controls` | _Not yet documented_ | counter | `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 | `instance`, `replica`
-`wmi_mssql_availreplica_flow_control_wait_seconds` | _Not yet documented_ | counter | `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 | `instance`, `replica`
-`wmi_mssql_availreplica_receives_from_replica` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_availreplica_receives_from_replica` | Number of Always On messages received from thereplica per second | counter | `instance`, `replica`
-`wmi_mssql_availreplica_resent_messages` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_availreplica_resent_messages` | Number of Always On messages resent in the last second | counter | `instance`, `replica`
-`wmi_mssql_availreplica_sends_to_replica` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_availreplica_sends_to_replica` | Number of Always On messages sent to this availability replica per second | counter | `instance`, `replica`
-`wmi_mssql_availreplica_sends_to_transport` | _Not yet documented_ | counter | `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 | `instance`, `replica`
-`wmi_mssql_bufman_background_writer_pages` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_background_writer_pages` | Number of pages flushed to enforce the recovery interval settings | counter | `instance`
-`wmi_mssql_bufman_buffer_cache_hit_ratio` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_bufman_checkpoint_pages` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_bufman_database_pages` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_database_pages` | Indicates the number of pages in the buffer pool with database content | counter | `instance`
-`wmi_mssql_bufman_extension_allocated_pages` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_allocated_pages` | Total number of non-free cache pages in the buffer pool extension file | counter | `instance`
-`wmi_mssql_bufman_extension_free_pages` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_free_pages` | Total number of free cache pages in the buffer pool extension file | counter | `instance`
-`wmi_mssql_bufman_extension_in_use_as_percentage` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_in_use_as_percentage` | _Not yet documented_ | counter | `instance`
-`wmi_mssql_bufman_extension_outstanding_io` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_outstanding_io` | Percentage of the buffer pool extension paging file occupied by buffer manager pages | counter | `instance`
-`wmi_mssql_bufman_extension_page_evictions` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_page_evictions` | Number of pages evicted from the buffer pool extension file per second | counter | `instance`
-`wmi_mssql_bufman_extension_page_reads` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_page_reads` | Number of pages read from the buffer pool extension file per second | counter | `instance`
-`wmi_mssql_bufman_extension_page_unreferenced_seconds` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_page_unreferenced_seconds` | Average seconds a page will stay in the buffer pool extension without references to it | counter | `instance`
-`wmi_mssql_bufman_extension_page_writes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_extension_page_writes` | Number of pages written to the buffer pool extension file per second | counter | `instance`
-`wmi_mssql_bufman_free_list_stalls` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_free_list_stalls` | Indicates the number of requests per second that had to wait for a free page | counter | `instance`
-`wmi_mssql_bufman_integral_controller_slope` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_integral_controller_slope` | The slope that integral controller for the buffer pool last used, times -10 billion | counter | `instance`
-`wmi_mssql_bufman_lazywrites` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_lazywrites` | Indicates the number of buffers written per second by the buffer manager's lazy writer | counter | `instance`
-`wmi_mssql_bufman_page_life_expectancy_seconds` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_page_life_expectancy_seconds` | Indicates the number of seconds a page will stay in the buffer pool without references | counter | `instance`
-`wmi_mssql_bufman_page_lookups` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_page_lookups` | Indicates the number of requests per second to find a page in the buffer pool | counter | `instance`
-`wmi_mssql_bufman_page_reads` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_page_reads` | Indicates the number of physical database page reads that are issued per second | counter | `instance`
-`wmi_mssql_bufman_page_writes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_page_writes` | Indicates the number of physical database page writes that are issued per second | counter | `instance`
-`wmi_mssql_bufman_read_ahead_pages` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_read_ahead_pages` | Indicates the number of pages read per second in anticipation of use | counter | `instance`
-`wmi_mssql_bufman_read_ahead_issuing_seconds` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_read_ahead_issuing_seconds` | Time (microseconds) spent issuing readahead | counter | `instance`
-`wmi_mssql_bufman_target_pages` | _Not yet documented_ | counter | `instance`
+`windows_mssql_bufman_target_pages` | Ideal number of pages in the buffer pool | counter | `instance`
-`wmi_mssql_dbreplica_database_flow_control_wait_seconds` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_database_flow_control_wait_seconds` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_database_initiated_flow_controls` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_database_initiated_flow_controls` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_received_file_bytes` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_received_file_bytes` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_group_commits` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_group_commits` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_group_commit_stall_seconds` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_group_commit_stall_seconds` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_apply_pending_queue` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_apply_pending_queue` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_apply_ready_queue` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_apply_ready_queue` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_compressed_bytes` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_compressed_bytes` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_decompressed_bytes` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_decompressed_bytes` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_received_bytes` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_received_bytes` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_compression_cachehits` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_compression_cachehits` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_compression_cachemisses` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_compression_cachemisses` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_compressions` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_compressions` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_decompressions` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_decompressions` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_remaining_for_undo` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_log_remaining_for_undo` | The amount of log, in bytes, remaining to complete the undo phase | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_log_send_queue` | _Not yet documented_ | counter | `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 | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_mirrored_write_transactions` | _Not yet documented_ | counter | `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 | `instance`, `replica`
-`wmi_mssql_dbreplica_recovery_queue_records` | _Not yet documented_ | counter | `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 | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_redo_blocks` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_redo_blocks` | Number of times the redo thread was blocked on locks held by readers of the database | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_redo_remaining_bytes` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_redo_remaining_bytes` | The amount of log, in kilobytes, remaining to be redone to finish the reverting phase | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_redone_bytes` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_redone_bytes` | Amount of log records redone on the secondary database in the last second | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_redones` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_redones` | _Not yet documented_ | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_total_log_requiring_undo` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_total_log_requiring_undo` | Total kilobytes of log that must be undone | counter | `instance`, `replica`
-`wmi_mssql_dbreplica_transaction_delay_seconds` | _Not yet documented_ | counter | `instance`, `replica`
+`windows_mssql_dbreplica_transaction_delay_seconds` | Delay in waiting for unterminated commit acknowledgment for all the current transactions | counter | `instance`, `replica`
-`wmi_mssql_databases_active_transactions` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_active_transactions` | Number of active transactions for the database | counter | `instance`, `database`
-`wmi_mssql_databases_backup_restore_operations` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_backup_restore_operations` | Read/write throughput for backup and restore operations of a database per second | counter | `instance`, `database`
-`wmi_mssql_databases_bulk_copy_rows` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_bulk_copy_rows` | Number of rows bulk copied per second | counter | `instance`, `database`
-`wmi_mssql_databases_bulk_copy_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_bulk_copy_bytes` | Amount of data bulk copied (in kilobytes) per second | counter | `instance`, `database`
-`wmi_mssql_databases_commit_table_entries` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_commit_table_entries` | he size (row count) of the in-memory portion of the commit table for the database | counter | `instance`, `database`
-`wmi_mssql_databases_data_files_size_bytes` | _Not yet documented_ | counter | `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 | counter | `instance`, `database`
-`wmi_mssql_databases_dbcc_logical_scan_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_dbcc_logical_scan_bytes` | Number of logical read scan bytes per second for database console commands (DBCC) | counter | `instance`, `database`
-`wmi_mssql_databases_group_commit_stall_seconds` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_group_commit_stall_seconds` | Group stall time (microseconds) per second | counter | `instance`, `database`
-`wmi_mssql_databases_log_flushed_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_flushed_bytes` | Total number of log bytes flushed | counter | `instance`, `database`
-`wmi_mssql_databases_log_cache_hit_ratio` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_cache_hit_ratio` | Percentage of log cache reads satisfied from the log cache | counter | `instance`, `database`
-`wmi_mssql_databases_log_cache_reads` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_cache_reads` | Reads performed per second through the log manager cache | counter | `instance`, `database`
-`wmi_mssql_databases_log_files_size_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_files_size_bytes` | Cumulative size (in kilobytes) of all the transaction log files in the database | counter | `instance`, `database`
-`wmi_mssql_databases_log_files_used_size_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_files_used_size_bytes` | The cumulative used size of all the log files in the database | counter | `instance`, `database`
-`wmi_mssql_databases_log_flushes` | _Not yet documented_ | counter | `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 | `instance`, `database`
-`wmi_mssql_databases_log_flush_waits` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_flush_waits` | Number of commits per second waiting for the log flush | counter | `instance`, `database`
-`wmi_mssql_databases_log_flush_wait_seconds` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_flush_wait_seconds` | Number of commits per second waiting for the log flush | counter | `instance`, `database`
-`wmi_mssql_databases_log_flush_write_seconds` | _Not yet documented_ | counter | `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 | counter | `instance`, `database`
-`wmi_mssql_databases_log_growths` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_growths` | Total number of times the transaction log for the database has been expanded | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_cache_misses` | _Not yet documented_ | counter | `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 | `instance`, `database`
-`wmi_mssql_databases_log_pool_disk_reads` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_disk_reads` | Number of disk reads that the log pool issued to fetch log blocks | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_hash_deletes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_hash_deletes` | Rate of raw hash entry deletes from the Log Pool | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_hash_inserts` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_hash_inserts` | Rate of raw hash entry inserts into the Log Pool | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_invalid_hash_entries` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_invalid_hash_entries` | Rate of hash lookups failing due to being invalid | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_log_scan_pushes` | _Not yet documented_ | counter | `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 | `instance`, `database`
-`wmi_mssql_databases_log_pool_log_writer_pushes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_log_writer_pushes` | Rate of Log block pushes by log writer thread | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_empty_free_pool_pushes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_empty_free_pool_pushes` | Rate of Log block push fails due to empty free pool | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_low_memory_pushes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_low_memory_pushes` | Rate of Log block push fails due to being low on memory | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_no_free_buffer_pushes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_no_free_buffer_pushes` | Rate of Log block push fails due to free buffer unavailable | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_req_behind_trunc` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_req_behind_trunc` | Log pool cache misses due to block requested being behind truncation LSN | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_requests_old_vlf` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_requests_old_vlf` | Log Pool requests that were not in the last VLF of the log | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_requests` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_requests` | The number of log-block requests processed by the log pool | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_total_active_log_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_total_active_log_bytes` | Current total active log stored in the shared cache buffer manager in bytes | counter | `instance`, `database`
-`wmi_mssql_databases_log_pool_total_shared_pool_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_pool_total_shared_pool_bytes` | Current total memory usage of the shared cache buffer manager in bytes | counter | `instance`, `database`
-`wmi_mssql_databases_log_shrinks` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_shrinks` | Total number of log shrinks for this database | counter | `instance`, `database`
-`wmi_mssql_databases_log_truncations` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_truncations` | The number of times the transaction log has been truncated (in Simple Recovery Model) | counter | `instance`, `database`
-`wmi_mssql_databases_log_used_percent` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_log_used_percent` | Percentage of space in the log that is in use | counter | `instance`, `database`
-`wmi_mssql_databases_pending_repl_transactions` | _Not yet documented_ | counter | `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 | counter | `instance`, `database`
-`wmi_mssql_databases_repl_transactions` | _Not yet documented_ | counter | `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 | `instance`, `database`
-`wmi_mssql_databases_shrink_data_movement_bytes` | _Not yet documented_ | counter | `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 | `instance`, `database`
-`wmi_mssql_databases_tracked_transactions` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_tracked_transactions` | Number of committed transactions recorded in the commit table for the database | counter | `instance`, `database`
-`wmi_mssql_databases_transactions` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_transactions` | Number of transactions started for the database per second | counter | `instance`, `database`
-`wmi_mssql_databases_write_transactions` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_write_transactions` | Number of transactions that wrote to the database and committed, in the last second | counter | `instance`, `database`
-`wmi_mssql_databases_xtp_controller_dlc_fetch_latency_seconds` | _Not yet documented_ | counter | `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 | counter | `instance`, `database`
-`wmi_mssql_databases_xtp_controller_dlc_peak_latency_seconds` | _Not yet documented_ | counter | `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 | counter | `instance`, `database`
-`wmi_mssql_databases_xtp_controller_log_processed_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_xtp_controller_log_processed_bytes` | The amount of log bytes processed by the XTP controller thread, per second | counter | `instance`, `database`
-`wmi_mssql_databases_xtp_memory_used_bytes` | _Not yet documented_ | counter | `instance`, `database`
+`windows_mssql_databases_xtp_memory_used_bytes` | The amount of memory used by XTP in the database | counter | `instance`, `database`
-`wmi_mssql_genstats_active_temp_tables` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_active_temp_tables` | Number of temporary tables/table variables in use | counter | `instance`
-`wmi_mssql_genstats_connection_resets` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_connection_resets` | Total number of logins started from the connection pool | counter | `instance`
-`wmi_mssql_genstats_event_notifications_delayed_drop` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_event_notifications_delayed_drop` | Number of event notifications waiting to be dropped by a system thread | counter | `instance`
-`wmi_mssql_genstats_http_authenticated_requests` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_http_authenticated_requests` | Number of authenticated HTTP requests started per second | counter | `instance`
-`wmi_mssql_genstats_logical_connections` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_logical_connections` | Number of logical connections to the system | counter | `instance`
-`wmi_mssql_genstats_logins` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_logins` | Total number of logins started per second. This does not include pooled connections | counter | `instance`
-`wmi_mssql_genstats_logouts` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_logouts` | Total number of logout operations started per second | counter | `instance`
-`wmi_mssql_genstats_mars_deadlocks` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_mars_deadlocks` | Number of MARS deadlocks detected | counter | `instance`
-`wmi_mssql_genstats_non_atomic_yields` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_non_atomic_yields` | Number of non-atomic yields per second | counter | `instance`
-`wmi_mssql_genstats_blocked_processes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_blocked_processes` | Number of currently blocked processes | counter | `instance`
-`wmi_mssql_genstats_soap_empty_requests` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_soap_empty_requests` | Number of empty SOAP requests started per second | counter | `instance`
-`wmi_mssql_genstats_soap_method_invocations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_soap_method_invocations` | Number of SOAP method invocations started per second | counter | `instance`
-`wmi_mssql_genstats_soap_session_initiate_requests` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_soap_session_initiate_requests` | Number of SOAP Session initiate requests started per second | counter | `instance`
-`wmi_mssql_genstats_soap_session_terminate_requests` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_soap_session_terminate_requests` | Number of SOAP Session terminate requests started per second | counter | `instance`
-`wmi_mssql_genstats_soapsql_requests` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_soapsql_requests` | Number of SOAP SQL requests started per second | counter | `instance`
-`wmi_mssql_genstats_soapwsdl_requests` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_soapwsdl_requests` | Number of SOAP Web Service Description Language requests started per second | counter | `instance`
-`wmi_mssql_genstats_sql_trace_io_provider_lock_waits` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_sql_trace_io_provider_lock_waits` | Number of waits for the File IO Provider lock per second | counter | `instance`
-`wmi_mssql_genstats_tempdb_recovery_unit_ids_generated` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_tempdb_recovery_unit_ids_generated` | Number of duplicate tempdb recovery unit id generated | counter | `instance`
-`wmi_mssql_genstats_tempdb_rowset_ids_generated` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_tempdb_rowset_ids_generated` | Number of duplicate tempdb rowset id generated | counter | `instance`
-`wmi_mssql_genstats_temp_tables_creations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_temp_tables_creations` | Number of temporary tables/table variables created per second | counter | `instance`
-`wmi_mssql_genstats_temp_tables_awaiting_destruction` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_temp_tables_awaiting_destruction` | Number of temporary tables/table variables waiting to be destroyed by the cleanup system thread | counter | `instance`
-`wmi_mssql_genstats_trace_event_notification_queue_size` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_genstats_transactions` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_transactions` | Number of transaction enlistments (local, DTC, bound all combined) | counter | `instance`
-`wmi_mssql_genstats_user_connections` | _Not yet documented_ | counter | `instance`
+`windows_mssql_genstats_user_connections` | Counts the number of users currently connected to SQL Server | counter | `instance`
-`wmi_mssql_locks_average_wait_seconds` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_locks_average_wait_seconds` | Average amount of wait time (in milliseconds) for each lock request that resulted in a wait | counter | `instance`, `resource`
-`wmi_mssql_locks_lock_requests` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_locks_lock_requests` | Number of new locks and lock conversions per second requested from the lock manager | counter | `instance`, `resource`
-`wmi_mssql_locks_lock_timeouts` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_locks_lock_timeouts` | Number of lock requests per second that timed out, but excluding requests for NOWAIT locks | counter | `instance`, `resource`
-`wmi_mssql_locks_lock_timeouts_excluding_NOWAIT` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_locks_lock_timeouts_excluding_NOWAIT` | Number of lock requests per second that timed out, including requests for NOWAIT locks | counter | `instance`, `resource`
-`wmi_mssql_locks_lock_waits` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_locks_lock_waits` | Total wait time (in milliseconds) for locks in the last second | counter | `instance`, `resource`
-`wmi_mssql_locks_lock_wait_seconds` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_locks_lock_wait_seconds` | Number of lock requests per second that required the caller to wait | counter | `instance`, `resource`
-`wmi_mssql_locks_deadlocks` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_locks_deadlocks` | Number of lock requests per second that resulted in a deadlock | counter | `instance`, `resource`
-`wmi_mssql_memmgr_connection_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_connection_memory_bytes` | Specifies the total amount of dynamic memory the server is using for maintaining connections | counter | `instance`
-`wmi_mssql_memmgr_database_cache_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_database_cache_memory_bytes` | Specifies the amount of memory the server is currently using for the database pages cache | counter | `instance`
-`wmi_mssql_memmgr_external_benefit_of_memory` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_external_benefit_of_memory` | An internal estimation of the performance benefit from adding memory to a specific cache | counter | `instance`
-`wmi_mssql_memmgr_free_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_free_memory_bytes` | Specifies the amount of committed memory currently not used by the server | counter | `instance`
-`wmi_mssql_memmgr_granted_workspace_memory_bytes` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_memmgr_lock_blocks` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_memmgr_allocated_lock_blocks` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_memmgr_lock_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_lock_memory_bytes` | Specifies the total amount of dynamic memory the server is using for locks | counter | `instance`
-`wmi_mssql_memmgr_lock_owner_blocks` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_memmgr_allocated_lock_owner_blocks` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_allocated_lock_owner_blocks` | _Not yet documented_ | counter | `instance`
-`wmi_mssql_memmgr_log_pool_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_log_pool_memory_bytes` | Total amount of dynamic memory the server is using for Log Pool | counter | `instance`
-`wmi_mssql_memmgr_maximum_workspace_memory_bytes` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_memmgr_outstanding_memory_grants` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_outstanding_memory_grants` | Specifies the total number of processes that have successfully acquired a workspace memory grant | counter | `instance`
-`wmi_mssql_memmgr_pending_memory_grants` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_pending_memory_grants` | Specifies the total number of processes waiting for a workspace memory grant | counter | `instance`
-`wmi_mssql_memmgr_optimizer_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_optimizer_memory_bytes` | Specifies the total amount of dynamic memory the server is using for query optimization | counter | `instance`
-`wmi_mssql_memmgr_reserved_server_memory_bytes` | _Not yet documented_ | counter | `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 | counter | `instance`
-`wmi_mssql_memmgr_sql_cache_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_sql_cache_memory_bytes` | Specifies the total amount of dynamic memory the server is using for the dynamic SQL cache | counter | `instance`
-`wmi_mssql_memmgr_stolen_server_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_stolen_server_memory_bytes` | Specifies the amount of memory the server is using for purposes other than database pages | counter | `instance`
-`wmi_mssql_memmgr_target_server_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_target_server_memory_bytes` | Indicates the ideal amount of memory the server can consume | counter | `instance`
-`wmi_mssql_memmgr_total_server_memory_bytes` | _Not yet documented_ | counter | `instance`
+`windows_mssql_memmgr_total_server_memory_bytes` | Specifies the amount of memory the server has committed using the memory manager | counter | `instance`
-`wmi_mssql_sqlstats_auto_parameterization_attempts` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_sqlstats_batch_requests` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_batch_requests` | _Not yet documented_ | counter | `instance`
-`wmi_mssql_sqlstats_failed_auto_parameterization_attempts` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_failed_auto_parameterization_attempts` | _Not yet documented_ | counter | `instance`
-`wmi_mssql_sqlstats_forced_parameterizations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_forced_parameterizations` | Number of successful forced parameterizations per second | counter | `instance`
-`wmi_mssql_sqlstats_guided_plan_executions` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_sqlstats_misguided_plan_executions` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_sqlstats_safe_auto_parameterization_attempts` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_safe_auto_parameterization_attempts` | Number of safe auto-parameterization attempts per second | counter | `instance`
-`wmi_mssql_sqlstats_sql_attentions` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_sql_attentions` | Number of attentions per second | counter | `instance`
-`wmi_mssql_sqlstats_sql_compilations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_sql_compilations` | Number of SQL compilations per second | counter | `instance`
-`wmi_mssql_sqlstats_sql_recompilations` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_sql_recompilations` | Number of statement recompiles per second | counter | `instance`
-`wmi_mssql_sqlstats_unsafe_auto_parameterization_attempts` | _Not yet documented_ | counter | `instance`
+`windows_mssql_sqlstats_unsafe_auto_parameterization_attempts` | Number of unsafe auto-parameterization attempts per second. | counter | `instance`
-`wmi_mssql_sql_errors_total` | _Not yet documented_ | counter | `instance`, `resource`
+`windows_mssql_sql_errors_total` | Information for all errors | counter | `instance`, `resource`
-`wmi_mssql_transactions_tempdb_free_space_bytes` | _Not yet documented_ | gauge | `instance`
+`windows_mssql_transactions_tempdb_free_space_bytes` | The amount of space (in kilobytes) available in tempdb | gauge | `instance`
-`wmi_mssql_transactions_longest_transaction_running_seconds` | _Not yet documented_ | gauge | `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 | `instance`
-`wmi_mssql_transactions_nonsnapshot_version_active_total` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_transactions_snapshot_active_total` | _Not yet documented_ | counter | `instance`
+`windows_mssql_transactions_snapshot_active_total` | The number of currently active transactions using the snapshot isolation level | counter | `instance`
-`wmi_mssql_transactions_active_total` | _Not yet documented_ | counter | `instance`
+`windows_mssql_transactions_active_total` | The number of currently active transactions of all types | counter | `instance`
-`wmi_mssql_transactions_update_conflicts_total` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_transactions_update_snapshot_active_total` | _Not yet documented_ | counter | `instance`
+`windows_mssql_transactions_update_snapshot_active_total` | The number of currently active transactions using the snapshot isolation level and have modified data | counter | `instance`
-`wmi_mssql_transactions_version_cleanup_rate_bytes` | _Not yet documented_ | gauge | `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 | `instance`
-`wmi_mssql_transactions_version_generation_rate_bytes` | _Not yet documented_ | gauge | `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 | `instance`
-`wmi_mssql_transactions_version_store_size_bytes` | _Not yet documented_ | gauge | `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 | `instance`
-`wmi_mssql_transactions_version_store_units` | _Not yet documented_ | counter | `instance`
+`windows_mssql_transactions_version_store_units` | The number of active allocation units in the snapshot isolation version store in tempdb | counter | `instance`
-`wmi_mssql_transactions_version_store_creation_units` | _Not yet documented_ | counter | `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 | `instance`
-`wmi_mssql_transactions_version_store_truncation_units` | _Not yet documented_ | counter | `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 | `instance`
 
 ### 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!_
+
+### Buffer Cache Hit Ratio
+
+When you read the counter in perfmon you will get the the percentage pages found in the buffer cache. This percentage is calculated internally based on the total number of cache hits divided by the total number of cache lookups over the last few thousand page accesses.
+This collector retrieves the two internal values separately. In order to calculate the Buffer Cache Hit Ratio in PromQL.
+
+```
+windows_mssql_bufman_buffer_cache_hits{instance="host:9182", exported_instance="MSSQLSERVER"} /
+windows_mssql_bufman_buffer_cache_lookups{instance="host:9182", exported_instance="MSSQLSERVER"}
+```
+
+This principal can be used for following metrics too:
+- AccessMethodsWorktablesFromCacheHitRatio
+  - accessmethods_worktables_from_cache_hits
+  - accessmethods_worktables_from_cache_lookups
+- LogCacheHitRatio
+  - databases_log_cache_hits
+  - databases_log_cache_lookups
+- AverageLockWaitTime
+  - locks_wait_time_seconds
+  - locks_count
 
 ## Alerting examples
 _This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.net.md

@@ -5,6 +5,7 @@ The net collector exposes metrics about network interfaces
 |||
 -|-
 Metric name prefix  | `net`
+Data source         | Perflib
 Classes             | [`Win32_PerfRawData_Tcpip_NetworkInterface`](https://technet.microsoft.com/en-us/security/aa394340(v=vs.80))
 Enabled by default? | Yes
 
@@ -22,36 +23,36 @@ If given, an interface name needs to *not* match the blacklist regexp in order f
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_net_bytes_received_total` | Total bytes received by interface | counter | `nic`
+`windows_net_bytes_received_total` | Total bytes received by interface | counter | `nic`
-`wmi_net_bytes_sent_total` | Total bytes transmitted by interface | counter | `nic`
+`windows_net_bytes_sent_total` | Total bytes transmitted by interface | counter | `nic`
-`wmi_net_bytes_total` | Total bytes received and transmitted by interface | counter | `nic`
+`windows_net_bytes_total` | Total bytes received and transmitted by interface | counter | `nic`
-`wmi_net_packets_outbound_discarded` | Total outbound packets that were chosen to be discarded even though no errors had been detected to prevent transmission | counter | `nic`
+`windows_net_packets_outbound_discarded` | Total outbound packets that were chosen to be discarded even though no errors had been detected to prevent transmission | counter | `nic`
-`wmi_net_packets_outbound_errors` | Total packets that could not be transmitted due to errors | counter | `nic`
+`windows_net_packets_outbound_errors` | Total packets that could not be transmitted due to errors | counter | `nic`
-`wmi_net_packets_received_discarded` | Total inbound packets that were chosen to be discarded even though no errors had been detected to prevent delivery | counter | `nic`
+`windows_net_packets_received_discarded` | Total inbound packets that were chosen to be discarded even though no errors had been detected to prevent delivery | counter | `nic`
-`wmi_net_packets_received_errors` | Total packets that could not be received due to errors  | counter | `nic`
+`windows_net_packets_received_errors` | Total packets that could not be received due to errors  | counter | `nic`
-`wmi_net_packets_received_total` | Total packets received by interface | counter | `nic`
+`windows_net_packets_received_total` | Total packets received by interface | counter | `nic`
-`wmi_net_packets_received_unknown` | Total packets received by interface that were discarded because of an unknown or unsupported protocol | counter | `nic`
+`windows_net_packets_received_unknown` | Total packets received by interface that were discarded because of an unknown or unsupported protocol | counter | `nic`
-`wmi_net_packets_total` | Total packets received and transmitted by interface | counter | `nic`
+`windows_net_packets_total` | Total packets received and transmitted by interface | counter | `nic`
-`wmi_net_packets_sent_total` | Total packets transmitted by interface | counter | `nic`
+`windows_net_packets_sent_total` | Total packets transmitted by interface | counter | `nic`
-`wmi_net_current_bandwidth` | Estimate of the interface's current bandwidth in bits per second (bps) | counter | `nic`
+`windows_net_current_bandwidth` | Estimate of the interface's current bandwidth in bits per second (bps) | gauge | `nic`
 
 ### Example metric
 Query the rate of transmitted network traffic
 ```
-rate(wmi_net_bytes_sent_total{instance="localhost"}[2m])
+rate(windows_net_bytes_sent_total{instance="localhost"}[2m])
 ```
 
 ## Useful queries
 Get total utilisation of network interface as a percentage
 ```
-rate(wmi_net_bytes_total{instance="localhost", nic="Microsoft_Hyper_V_Network_Adapter__1"}[2m]) * 8 / wmi_net_current_bandwidth{instance="locahost", nic="Microsoft_Hyper_V_Network_Adapter__1"} * 100
+rate(windows_net_bytes_total{instance="localhost", nic="Microsoft_Hyper_V_Network_Adapter__1"}[2m]) * 8 / windows_net_current_bandwidth{instance="locahost", nic="Microsoft_Hyper_V_Network_Adapter__1"} * 100
 ```
 
 ## Alerting examples
 **prometheus.rules**
-```
+```yaml
 - alert: NetInterfaceUsage
-  expr: rate(wmi_net_bytes_total[2m]) * 8 / wmi_net_current_bandwidth * 100 > 90
+  expr: rate(windows_net_bytes_total[2m]) * 8 / windows_net_current_bandwidth * 100 > 95
   for: 10m
   labels:
     severity: high

docs/collector.netframework_clrexceptions.md

@@ -16,11 +16,10 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_...` | ... | counter/gauge/histogram/summary | ...
+`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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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!_

docs/collector.netframework_clrinterop.md

@@ -16,10 +16,9 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_...` | ... | counter/gauge/histogram/summary | ...
+`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`
-`wmi_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`
-`wmi_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`
-`wmi_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!_

docs/collector.netframework_clrjit.md

@@ -16,11 +16,10 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_...` | ... | counter/gauge/histogram/summary | ...
+`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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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!_

docs/collector.netframework_clrloading.md

@@ -16,16 +16,15 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_...` | ... | counter/gauge/histogram/summary | ...
+`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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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!_

docs/collector.netframework_clrlocksandthreads.md

@@ -16,14 +16,13 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_...` | ... | counter/gauge/histogram/summary | ...
+`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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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!_

docs/collector.netframework_clrmemory.md

@@ -16,19 +16,18 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_...` | ... | counter/gauge/histogram/summary | ...
+`windows_netframework_clrmemory_allocated_bytes_total` | Displays the total number of bytes allocated on the garbage collection heap. | counter | `process`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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`
-`wmi_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!_

docs/collector.netframework_clrremoting.md

@@ -16,12 +16,12 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_netframework_clrremoting_channels_total` | Displays the total number of remoting channels registered across all application domains since application started. | counter | `process`
+`windows_netframework_clrremoting_channels_total` | Displays the total number of remoting channels registered across all application domains since application started. | counter | `process`
-`wmi_netframework_clrremoting_context_bound_classes_loaded` | Displays the current number of context-bound classes that are loaded. | gauge | `process`
+`windows_netframework_clrremoting_context_bound_classes_loaded` | Displays the current number of context-bound classes that are loaded. | gauge | `process`
-`wmi_netframework_clrremoting_context_bound_objects_total` | Displays the total number of context-bound objects allocated. | counter | `process`
+`windows_netframework_clrremoting_context_bound_objects_total` | Displays the total number of context-bound objects allocated. | counter | `process`
-`wmi_netframework_clrremoting_context_proxies_total` | Displays the total number of remoting proxy objects in this process since it started. | counter | `process`
+`windows_netframework_clrremoting_context_proxies_total` | Displays the total number of remoting proxy objects in this process since it started. | counter | `process`
-`wmi_netframework_clrremoting_contexts` | Displays the current number of remoting contexts in the application. | gauge | `process`
+`windows_netframework_clrremoting_contexts` | Displays the current number of remoting contexts in the application. | gauge | `process`
-`wmi_netframework_clrremoting_remote_calls_total` | Displays the total number of remote procedure calls invoked since the application started. | counter | `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!_

docs/collector.netframework_clrsecurity.md

@@ -16,10 +16,10 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_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_link_time_checks_total` | Displays the total number of link-time code access security checks since the application started. | counter | `process`
-`wmi_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_rt_checks_time_percent` | Displays the percentage of time spent performing runtime code access security checks in the last sample. | gauge | `process`
-`wmi_netframework_clrsecurity_stack_walk_depth` | Displays the depth of the stack during that last runtime code access security check. | gauge | `process`
+`windows_netframework_clrsecurity_stack_walk_depth` | Displays the depth of the stack during that last runtime code access security check. | gauge | `process`
-`wmi_netframework_clrsecurity_runtime_checks_total` | Displays the total number of runtime code access security checks performed since the application started. | counter | `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!_

docs/collector.os.md

@@ -16,24 +16,51 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_os_paging_limit_bytes` | _Not yet documented_ | gauge | None
+`windows_os_info` | Contains full product name & version in labels | gauge | `product`, `version`
-`wmi_os_paging_free_bytes` | _Not yet documented_ | gauge | None
+`windows_os_paging_limit_bytes` | Total number of bytes that can be sotred in the operating system paging files. 0 (zero) indicates that there are no paging files | gauge | None
-`wmi_os_physical_memory_free_bytes` | _Not yet documented_ | 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
-`wmi_os_time` | _Not yet documented_ | gauge | None
+`windows_os_physical_memory_free_bytes` | Bytes of physical memory currently unused and available | gauge | None
-`wmi_os_timezone` | _Not yet documented_ | gauge | `timezone`
+`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
-`wmi_os_processes` | _Not yet documented_ | 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`
-`wmi_os_processes_limit` | _Not yet documented_ | gauge | None
+`windows_os_processes` | Number of process contexts currently loaded or running on the operating system | gauge | None
-`wmi_os_process_memory_limix_bytes` | _Not yet documented_ | 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
-`wmi_os_users` | _Not yet documented_ | gauge | None
+`windows_os_process_memory_limit_bytes` | Maximum number of bytes of memory that can be allocated to a process | gauge | None
-`wmi_os_virtual_memory_bytes` | _Not yet documented_ | 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
-`wmi_os_visible_memory_bytes` | _Not yet documented_ | gauge | None
+`windows_os_virtual_memory_bytes` | Bytes of virtual memory | gauge | None
-`wmi_os_virtual_memory_free_bytes` | _Not yet documented_ | 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
 
 ### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
+Show current number of processes
+```
+windows_os_processes{instance="localhost"}
+```
 
 ## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
+Find all devices not set to UTC timezone
+```
+windows_os_timezone{timezone != "UTC"}
+```
 
 ## 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_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%"
+```

docs/collector.process.md

@@ -5,36 +5,55 @@ The process collector exposes metrics about processes
 |||
 -|-
 Metric name prefix  | `process`
-Classes             | [`Win32_PerfRawData_PerfProc_Process`](https://msdn.microsoft.com/en-us/library/aa394323(v=vs.85).aspx)
+Data source         | Perflib
+Counters            | `Process`
 Enabled by default? | No
 
 ## Flags
 
-### `--collector.process.processes-where`
+### `--collector.process.whitelist`
 
-A WMI filter on which processes to include. Recommended to keep down number of returned metrics.
+Regexp of processes to include. Process name must both match whitelist and not
+match blacklist to be included. Recommended to keep down number of returned
+metrics.
 
-`%` is a wildcard, and can be used to match on substrings.
+### `--collector.process.blacklist`
 
-Example: `--collector.process.processes-where="Name LIKE 'firefox%'`
+Regexp of processes to exclude. Process name must both match whitelist and not
+match blacklist to be included. Recommended to keep down number of returned
+metrics.
+
+### Example
+To match all firefox processes: `--collector.process.whitelist="firefox.+"`.
+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.whitelist="FIREFOX.+"` will **NOT** match a process named `firefox` . 
+
+To specify multiple names, use the pipe `|` character:
+```
+--collector.process.whitelist="firefox.+|FIREFOX.+|chrome.+"
+```
+This will match all processes named `firefox`, `FIREFOX` or `chrome` .
 
 ## Metrics
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_process_start_time` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_start_time` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_cpu_time_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
+`windows_process_cpu_time_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
-`wmi_process_handle_count` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_handle_count` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_io_bytes_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
+`windows_process_io_bytes_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
-`wmi_process_io_operations_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
+`windows_process_io_operations_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
-`wmi_process_page_faults_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
+`windows_process_page_faults_total` | _Not yet documented_ | counter | `process`, `process_id`, `creating_process_id`
-`wmi_process_page_file_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_page_file_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_pool_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_pool_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_priority_base` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_priority_base` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_private_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_private_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_thread_count` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_thread_count` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_virtual_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_virtual_bytes` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
-`wmi_process_working_set` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
+`windows_process_working_set` | _Not yet documented_ | gauge | `process`, `process_id`, `creating_process_id`
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.remote_fx.md

@@ -0,0 +1,51 @@
+# remote_fx collector
+
+The remote_fx collector exposes Performance Counters regarding the RemoteFX protocol (RDP). It exposes both network and graphics related performance counters.
+
+|||
+-|-
+Metric name prefix  | `remote_fx`
+Data source         | Perflib
+Classes             | [`Win32_PerfRawData_Counters_RemoteFXNetwork`](https://wutils.com/wmi/root/cimv2/win32_perfrawdata_counters_remotefxnetwork/), [`Win32_PerfRawData_Counters_RemoteFXGraphics`](https://wutils.com/wmi/root/cimv2/win32_perfrawdata_counters_remotefxgraphics), [more info...](https://docs.microsoft.com/en-us/azure/virtual-desktop/remotefx-graphics-performance-counters)
+Enabled by default? | No
+
+
+## Flags
+
+None
+
+## Metrics (Network)
+
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`windows_remote_fx_net_base_udp_rtt_seconds` | Base UDP round-trip time (RTT) detected in seconds. | gauge | `session_name`
+`windows_remote_fx_net_base_tcp_rtt_seconds` | Base TCP round-trip time (RTT) detected in seconds. | gauge | `session_name`
+`windows_remote_fx_net_current_tcp_bandwidth` | TCP Bandwidth detected in bytes per second. | gauge | `session_name`
+`windows_remote_fx_net_current_tcp_rtt_seconds` | Average TCP round-trip time (RTT) detected in seconds. | gauge | `session_name`
+`windows_remote_fx_net_current_udp_bandwidth` | UDP Bandwidth detected in bytes per second. | gauge | `session_name`
+`windows_remote_fx_net_current_udp_rtt_seconds` | Average UDP round-trip time (RTT) detected in seconds. | gauge | `session_name`
+`windows_remote_fx_net_received_bytes_total` | _Not yet documented_ | counter | `session_name`
+`windows_remote_fx_net_sent_bytes_total` | _Not yet documented_ | counter | `session_name`
+`windows_remote_fx_net_udp_packets_received_total` | Rate in packets per second at which packets are received over UDP. | counter | `session_name`
+`windows_remote_fx_net_udp_packets_sent_total` | Rate in packets per second at which packets are sent over UDP. | counter | `session_name`
+
+## Metrics (Graphics)
+
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`windows_remote_fx_gfx_average_encoding_time_seconds` | Average frame encoding time. | gauge | `session_name`
+`windows_remote_fx_gfx_frame_quality` | Quality of the output frame expressed as a percentage of the quality of the source frame. | gauge | `session_name`
+`windows_remote_fx_gfx_frames_skipped_insufficient_resource_total` | Number of frames skipped per second due to insufficient resources. resources are client, server or network. | counter | `session_name`, `resource`
+`windows_remote_fx_gfx_graphics_compression_ratio` | Ratio of the number of bytes encoded to the number of bytes input. | gauge | `session_name`
+`windows_remote_fx_gfx_input_frames_total` | Number of sources frames provided as input to RemoteFX graphics per second. | counter | `session_name`
+`windows_remote_fx_gfx_output_frames_total` | Number of frames sent to the client per second. | counter | `session_name`
+`windows_remote_fx_gfx_source_frames_total` | Number of frames composed by the source (DWM) per second. | counter | `session_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.service.md

@@ -14,15 +14,16 @@ Enabled by default? | Yes
 
 A WMI filter on which services to include. Recommended to keep down number of returned metrics.
 
-Example: `--collector.service.services-where="Name='wmi_exporter'"`
+Example: `--collector.service.services-where="Name='windows_exporter'"`
 
 ## Metrics
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_service_state` | The state of the service, 1 if the current state, 0 otherwise | gauge | name, state
+`windows_service_info` | Contains service information in labels, constant 1 | gauge | name, display_name, process_id
-`wmi_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
-`wmi_service_status` | The status of the service, 1 if the current status, 0 otherwise | gauge | name, status
+`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` and `status` labels, see below.
 
@@ -68,25 +69,25 @@ Note that there is some overlap with service state.
 ### Example metric
 Lists the services that have a 'disabled' start mode.
 ```
-wmi_service_start_mode{exported_name=~"(mssqlserver|sqlserveragent)",start_mode="disabled"}
+windows_service_start_mode{exported_name=~"(mssqlserver|sqlserveragent)",start_mode="disabled"}
 ```
 
 ## Useful queries
 Counts the number of Microsoft SQL Server/Agent Processes
 ```
-count(wmi_service_state{exported_name=~"(sqlserveragent|mssqlserver)",state="running"})
+count(windows_service_state{exported_name=~"(sqlserveragent|mssqlserver)",state="running"})
 ```
 
 ## Alerting examples
 **prometheus.rules**
-```
+```yaml
 groups:
 - name: Microsoft SQL Server Alerts
   rules:
 
   # Sends an alert when the 'sqlserveragent' service is not in the running state for 3 minutes.
   - alert: SQL Server Agent DOWN
-    expr: wmi_service_state{instance="SQL",exported_name="sqlserveragent",state="running"} == 0
+    expr: windows_service_state{instance="SQL",exported_name="sqlserveragent",state="running"} == 0
     for: 3m
     labels:
       severity: high
@@ -96,7 +97,7 @@ groups:
 
   # Sends an alert when the 'mssqlserver' service is not in the running state for 3 minutes.
   - alert: SQL Server DOWN
-    expr: wmi_service_state{instance="SQL",exported_name="mssqlserver",state="running"} == 0
+    expr: windows_service_state{instance="SQL",exported_name="mssqlserver",state="running"} == 0
     for: 3m
     labels:
       severity: high

docs/collector.system.md

@@ -5,6 +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)
 Enabled by default? | Yes
 
@@ -16,23 +17,23 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_system_context_switches_total` | Total number of [context switches](https://en.wikipedia.org/wiki/Context_switch) | counter | None
+`windows_system_context_switches_total` | Total number of [context switches](https://en.wikipedia.org/wiki/Context_switch) | counter | None
-`wmi_system_exception_dispatches_total` | Total exceptions dispatched by the system | counter | None
+`windows_system_exception_dispatches_total` | Total exceptions dispatched by the system | counter | None
-`wmi_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_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
-`wmi_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_calls_total` | Total combined calls to Windows NT system service routines by all processes running on the computer | counter | None
-`wmi_system_system_up_time` | Time of last boot of system | gauge | None
+`windows_system_system_up_time` | Time of last boot of system | gauge | None
-`wmi_system_threads` | Number of Windows system [threads](https://en.wikipedia.org/wiki/Thread_(computing)) | gauge | 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
 ```
-wmi_system_threads{instance="localhost"}
+windows_system_threads{instance="localhost"}
 ```
 
 ## Useful queries
 Find hosts that have rebooted in the last 24 hours
 ```
-time() - wmi_system_system_up_time < 86400
+time() - windows_system_system_up_time < 86400
 ```
 
 ## Alerting examples

docs/collector.tcp.md

@@ -16,15 +16,15 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_tcp_connection_failures` | _Not yet documented_ | counter | None
+`windows_tcp_connection_failures` | 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 | None
-`wmi_tcp_connections_active` | _Not yet documented_ | counter | None
+`windows_tcp_connections_active` |  Number of times TCP connections have made a direct transition from the CLOSED state to the SYN-SENT state.| counter | None
-`wmi_tcp_connections_established` | _Not yet documented_ | counter | None
+`windows_tcp_connections_established` | Number of TCP connections for which the current state is either ESTABLISHED or CLOSE-WAIT. | counter | None
-`wmi_tcp_connections_passive` | _Not yet documented_ | counter | None
+`windows_tcp_connections_passive` | Number of times TCP connections have made a direct transition from the LISTEN state to the SYN-RCVD state. | counter | None
-`wmi_tcp_connections_reset` | _Not yet documented_ | counter | None
+`windows_tcp_connections_reset` | Number of times TCP connections have made a direct transition from the LISTEN state to the SYN-RCVD state. | counter | None
-`wmi_tcp_segments_total` | _Not yet documented_ | counter | None
+`windows_tcp_segments_total` | Total segments sent or received using the TCP protocol | counter | None
-`wmi_tcp_segments_received_total` | _Not yet documented_ | counter | None
+`windows_tcp_segments_received_total` | Total segments received, including those received in error. This count includes segments received on currently established connections | counter | None
-`wmi_tcp_segments_retransmitted_total` | _Not yet documented_ | counter | None
+`windows_tcp_segments_retransmitted_total` | Total segments retransmitted. That is, segments transmitted that contain one or more previously transmitted bytes | counter | None
-`wmi_tcp_segments_sent_total` | _Not yet documented_ | counter | None
+`windows_tcp_segments_sent_total` | Total segments sent, including those on current connections, but excluding those containing *only* retransmitted bytes | counter | None
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.terminal_services.md

@@ -0,0 +1,48 @@
+# terminal_services collector
+
+The terminal_services collector exposes terminal services (Remote Desktop Services) performance metrics.
+
+|||
+-|-
+Metric name prefix  | `terminal_services`
+Data source         | Perflib/WMI
+Classes             | [`Win32_PerfRawData_LocalSessionManager_TerminalServices`](https://wutils.com/wmi/root/cimv2/win32_perfrawdata_localsessionmanager_terminalservices/), [`Win32_PerfRawData_TermService_TerminalServicesSession`](https://docs.microsoft.com/en-us/previous-versions/aa394344(v%3Dvs.85)), [`Win32_PerfRawData_RemoteDesktopConnectionBrokerPerformanceCounterProvider_RemoteDesktopConnectionBrokerCounterset`](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/mt729067(v%3Dws.11))
+Enabled by default? | No
+
+## Flags
+
+None
+
+## Metrics
+
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`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_handle_count` | 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`
+`windows_terminal_services_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 | `session_name`
+`windows_terminal_services_page_file_bytes_peak` | Maximum number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. | gauge | `session_name`
+`windows_terminal_services_privileged_time_seconds_total` | total elapsed time that the threads of the process have spent executing code in privileged mode. | Counter | `session_name`
+`windows_terminal_services_processor_time_seconds_total` | total elapsed time that all of the threads of this process used the processor to execute instructions. | Counter | `session_name`
+`windows_terminal_services_user_time_seconds_total` | total elapsed time that this process's threads have spent executing code in user mode. Applications, environment subsystems, and integral subsystems execute in user mode. | Counter | `session_name`
+`windows_terminal_services_pool_non_paged_bytes` | Number of bytes in the non-paged pool, an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. This property displays the last observed value only; it is not an average. | gauge | `session_name`
+`windows_terminal_services_pool_paged_bytes` | Number of bytes in the paged pool, an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. This property displays the last observed value only; it is not an average. | gauge | `session_name`
+`windows_terminal_services_private_bytes` | Current number of bytes this process has allocated that cannot be shared with other processes. | gauge | `session_name`
+`windows_terminal_services_thread_count` | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread. | gauge | `session_name`
+`windows_terminal_services_virtual_bytes` | Current size, in bytes, of the virtual address space the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries. | gauge | `session_name`
+`windows_terminal_services_virtual_bytes_peak` | Maximum number of bytes of virtual address space the process has used at any one time. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process might limit its ability to load libraries. | gauge | `session_name`
+`windows_terminal_services_working_set_bytes` | Current number of bytes in the working set of this process. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory. | gauge | `session_name`
+`windows_terminal_services_working_set_bytes_peak` | Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory. | gauge | `session_name`
+
+`* windows_terminal_services_connection_broker_performance_total` only collected if server has `Remote Desktop Connection Broker` role.
+
+
+### 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.textfile.md

@@ -12,9 +12,9 @@ Enabled by default? | Yes
 
 ### `--collector.textfile.directory`
 
-The directory containing the files to be ingested. Only files with the extension `.prom` are read.
+The directory containing the files to be ingested. Only files with the extension `.prom` are read. The `.prom` file must end with an empty line feed to work properly.
 
-Default value: `C:\Program Files\wmi_exporter\textfile_inputs`
+Default value: `C:\Program Files\windows_exporter\textfile_inputs`
 
 Required: No
 
@@ -25,8 +25,8 @@ are collected to give information about the reading of the metrics themselves.
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_textfile_scrape_error` | 1 if there was an error opening or reading a file, 0 otherwise | gauge | None
+`windows_textfile_scrape_error` | 1 if there was an error opening or reading a file, 0 otherwise | gauge | None
-`wmi_textfile_mtime_seconds` | Unix epoch-formatted mtime (modified time) of textfiles successfully read | gauge | file
+`windows_textfile_mtime_seconds` | Unix epoch-formatted mtime (modified time) of textfiles successfully read | gauge | file
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_
@@ -38,7 +38,7 @@ _This collector does not yet have any useful queries added, we would appreciate
 _This collector does not yet have alerting examples, we would appreciate your help adding them!_
 
 # Example use
-This Powershell script, when run in the `collector.textfile.directory` (default `C:\Program Files\wmi_exporter\textfile_inputs`), generates a valid `.prom` file that should successfully ingested by wmi_exporter.
+This Powershell script, when run in the `collector.textfile.directory` (default `C:\Program Files\windows_exporter\textfile_inputs`), generates a valid `.prom` file that should successfully ingested by windows_exporter.
 
 ```Powershell
 $alpha = 42

docs/collector.thermalzone.md

@@ -16,9 +16,9 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_thermalzone_percent_passive_limit` | % Passive Limit is the current limit this thermal zone is placing on the devices it controls. A limit of 100% indicates the devices are unconstrained. A limit of 0% indicates the devices are fully constrained. | gauge | None
+`windows_thermalzone_percent_passive_limit` | % Passive Limit is the current limit this thermal zone is placing on the devices it controls. A limit of 100% indicates the devices are unconstrained. A limit of 0% indicates the devices are fully constrained. | gauge | None
-`wmi_thermalzone_temperature_celsius ` | Temperature of the thermal zone, in degrees Celsius. | gauge | None
+`windows_thermalzone_temperature_celsius ` | Temperature of the thermal zone, in degrees Celsius. | gauge | None
-`wmi_thermalzone_throttle_reasons ` | Throttle Reasons indicate reasons why the thermal zone is limiting performance of the devices it controls. 0x0 – The zone is not throttled. 0x1 – The zone is throttled for thermal reasons. 0x2 – The zone is throttled to limit electrical current. | gauge | None
+`windows_thermalzone_throttle_reasons ` | Throttle Reasons indicate reasons why the thermal zone is limiting performance of the devices it controls. 0x0 - The zone is not throttled. 0x1 - The zone is throttled for thermal reasons. 0x2 - The zone is throttled to limit electrical current. | gauge | None
 
 [`Throttle reasons` source](https://docs.microsoft.com/en-us/windows-hardware/design/device-experiences/examples--requirements-and-diagnostics)
 

docs/collector.vmware.md

@@ -16,25 +16,25 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`wmi_vmware_mem_active_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_active_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_ballooned_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_ballooned_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_limit_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_limit_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_mapped_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_mapped_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_overhead_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_overhead_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_reservation_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_reservation_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_shared_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_shared_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_shared_saved_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_shared_saved_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_shares` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_shares` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_swapped_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_swapped_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_target_size_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_target_size_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_mem_used_bytes` | _Not yet documented_ | gauge | None
+`windows_vmware_mem_used_bytes` | _Not yet documented_ | gauge | None
-`wmi_vmware_cpu_limit_mhz` | _Not yet documented_ | gauge | None
+`windows_vmware_cpu_limit_mhz` | _Not yet documented_ | gauge | None
-`wmi_vmware_cpu_reservation_mhz` | _Not yet documented_ | gauge | None
+`windows_vmware_cpu_reservation_mhz` | _Not yet documented_ | gauge | None
-`wmi_vmware_cpu_shares` | _Not yet documented_ | gauge | None
+`windows_vmware_cpu_shares` | _Not yet documented_ | gauge | None
-`wmi_vmware_cpu_stolen_seconds_total` | _Not yet documented_ | counter | None
+`windows_vmware_cpu_stolen_seconds_total` | _Not yet documented_ | counter | None
-`wmi_vmware_cpu_time_seconds_total` | _Not yet documented_ | counter | None
+`windows_vmware_cpu_time_seconds_total` | _Not yet documented_ | counter | None
-`wmi_vmware_effective_vm_speed_mhz` | _Not yet documented_ | gauge | None
+`windows_vmware_effective_vm_speed_mhz` | _Not yet documented_ | gauge | None
-`wmi_vmware_host_processor_speed_mhz` | _Not yet documented_ | gauge | None
+`windows_vmware_host_processor_speed_mhz` | _Not yet documented_ | gauge | None
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

exporter.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	_ "net/http/pprof"
-	"os"
 	"sort"
 	"strconv"
 	"strings"
@@ -16,7 +15,7 @@ import (
 	"golang.org/x/sys/windows/svc"
 
 	"github.com/StackExchange/wmi"
-	"github.com/martinlindhe/wmi_exporter/collector"
+	"github.com/prometheus-community/windows_exporter/collector"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/log"
@@ -24,8 +23,7 @@ import (
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
-// WmiCollector implements the prometheus.Collector interface.
+type windowsCollector struct {
-type WmiCollector struct {
 	maxScrapeDuration time.Duration
 	collectors        map[string]collector.Collector
 }
@@ -33,25 +31,25 @@ type WmiCollector struct {
 const (
 	defaultCollectors            = "cpu,cs,logical_disk,net,os,service,system,textfile"
 	defaultCollectorsPlaceholder = "[defaults]"
-	serviceName                  = "wmi_exporter"
+	serviceName                  = "windows_exporter"
 )
 
 var (
 	scrapeDurationDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(collector.Namespace, "exporter", "collector_duration_seconds"),
-		"wmi_exporter: Duration of a collection.",
+		"windows_exporter: Duration of a collection.",
 		[]string{"collector"},
 		nil,
 	)
 	scrapeSuccessDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(collector.Namespace, "exporter", "collector_success"),
-		"wmi_exporter: Whether the collector was successful.",
+		"windows_exporter: Whether the collector was successful.",
 		[]string{"collector"},
 		nil,
 	)
 	scrapeTimeoutDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(collector.Namespace, "exporter", "collector_timeout"),
-		"wmi_exporter: Whether the collector timed out.",
+		"windows_exporter: Whether the collector timed out.",
 		[]string{"collector"},
 		nil,
 	)
@@ -75,7 +73,7 @@ var (
 
 // Describe sends all the descriptors of the collectors included to
 // the provided channel.
-func (coll WmiCollector) Describe(ch chan<- *prometheus.Desc) {
+func (coll windowsCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- scrapeDurationDesc
 	ch <- scrapeSuccessDesc
 }
@@ -90,7 +88,7 @@ const (
 
 // Collect sends the collected metrics from each of the collectors to
 // prometheus.
-func (coll WmiCollector) Collect(ch chan<- prometheus.Metric) {
+func (coll windowsCollector) Collect(ch chan<- prometheus.Metric) {
 	ch <- prometheus.MustNewConstMetric(
 		startTimeDesc,
 		prometheus.CounterValue,
@@ -98,7 +96,11 @@ func (coll WmiCollector) Collect(ch chan<- prometheus.Metric) {
 	)
 
 	t := time.Now()
-	scrapeContext, err := collector.PrepareScrapeContext()
+	cs := make([]string, 0, len(coll.collectors))
+	for name := range coll.collectors {
+		cs = append(cs, name)
+	}
+	scrapeContext, err := collector.PrepareScrapeContext(cs)
 	ch <- prometheus.MustNewConstMetric(
 		snapshotDuration,
 		prometheus.GaugeValue,
@@ -189,17 +191,6 @@ func (coll WmiCollector) Collect(ch chan<- prometheus.Metric) {
 	l.Unlock()
 }
 
-func filterAvailableCollectors(collectors string) string {
-	var availableCollectors []string
-	for _, c := range strings.Split(collectors, ",") {
-		_, ok := collector.Factories[c]
-		if ok {
-			availableCollectors = append(availableCollectors, c)
-		}
-	}
-	return strings.Join(availableCollectors, ",")
-}
-
 func execute(name string, c collector.Collector, ctx *collector.ScrapeContext, ch chan<- prometheus.Metric) collectorOutcome {
 	t := time.Now()
 	err := c.Collect(ctx, ch)
@@ -240,23 +231,20 @@ func loadCollectors(list string) (map[string]collector.Collector, error) {
 	enabled := expandEnabledCollectors(list)
 
 	for _, name := range enabled {
-		fn, ok := collector.Factories[name]
+		c, err := collector.Build(name)
-		if !ok {
-			return nil, fmt.Errorf("collector '%s' not available", name)
-		}
-		c, err := fn()
 		if err != nil {
 			return nil, err
 		}
 		collectors[name] = c
 	}
+
 	return collectors, nil
 }
 
 func initWbem() {
 	// This initialization prevents a memory leak on WMF 5+. See
-	// https://github.com/martinlindhe/wmi_exporter/issues/77 and linked issues
+	// https://github.com/prometheus-community/windows_exporter/issues/77 and
-	// for details.
+	// linked issues for details.
 	log.Debugf("Initializing SWbemServices")
 	s, err := wmi.InitializeSWbemServices(wmi.DefaultClient)
 	if err != nil {
@@ -270,16 +258,20 @@ func main() {
 	var (
 		listenAddress = kingpin.Flag(
 			"telemetry.addr",
-			"host:port for WMI exporter.",
+			"host:port for exporter.",
 		).Default(":9182").String()
 		metricsPath = kingpin.Flag(
 			"telemetry.path",
 			"URL path for surfacing collected metrics.",
 		).Default("/metrics").String()
+		maxRequests = kingpin.Flag(
+			"telemetry.max-requests",
+			"Maximum number of concurrent requests. 0 to disable.",
+		).Default("5").Int()
 		enabledCollectors = kingpin.Flag(
 			"collectors.enabled",
 			"Comma-separated list of collectors to use. Use '[defaults]' as a placeholder for all the collectors enabled by default.").
-			Default(filterAvailableCollectors(defaultCollectors)).String()
+			Default(defaultCollectors).String()
 		printCollectors = kingpin.Flag(
 			"collectors.print",
 			"If true, print available collectors and exit.",
@@ -291,13 +283,14 @@ func main() {
 	)
 
 	log.AddFlags(kingpin.CommandLine)
-	kingpin.Version(version.Print("wmi_exporter"))
+	kingpin.Version(version.Print("windows_exporter"))
 	kingpin.HelpFlag.Short('h')
 	kingpin.Parse()
 
 	if *printCollectors {
-		collectorNames := make(sort.StringSlice, 0, len(collector.Factories))
+		collectors := collector.Available()
-		for n := range collector.Factories {
+		collectorNames := make(sort.StringSlice, 0, len(collectors))
+		for _, n := range collectors {
 			collectorNames = append(collectorNames, n)
 		}
 		collectorNames.Sort()
@@ -318,7 +311,7 @@ func main() {
 	stopCh := make(chan bool)
 	if !isInteractive {
 		go func() {
-			err = svc.Run(serviceName, &wmiExporterService{stopCh: stopCh})
+			err = svc.Run(serviceName, &windowsExporterService{stopCh: stopCh})
 			if err != nil {
 				log.Errorf("Failed to start service: %v", err)
 			}
@@ -334,31 +327,38 @@ func main() {
 
 	h := &metricsHandler{
 		timeoutMargin: *timeoutMargin,
-		collectorFactory: func(timeout time.Duration) *WmiCollector {
+		collectorFactory: func(timeout time.Duration) *windowsCollector {
-			return &WmiCollector{
+			return &windowsCollector{
 				collectors:        collectors,
 				maxScrapeDuration: timeout,
 			}
 		},
 	}
 
-	http.Handle(*metricsPath, h)
+	http.HandleFunc(*metricsPath, withConcurrencyLimit(*maxRequests, h.ServeHTTP))
 	http.HandleFunc("/health", healthCheck)
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, *metricsPath, http.StatusMovedPermanently)
+		_, _ = w.Write([]byte(`<html>
+<head><title>windows_exporter</title></head>
+<body>
+<h1>windows_exporter</h1>
+<p><a href="` + *metricsPath + `">Metrics</a></p>
+<p><i>` + version.Info() + `</i></p>
+</body>
+</html>`))
 	})
 
-	log.Infoln("Starting WMI exporter", version.Info())
+	log.Infoln("Starting windows_exporter", version.Info())
 	log.Infoln("Build context", version.BuildContext())
 
 	go func() {
 		log.Infoln("Starting server on", *listenAddress)
-		log.Fatalf("cannot start WMI exporter: %s", http.ListenAndServe(*listenAddress, nil))
+		log.Fatalf("cannot start windows_exporter: %s", http.ListenAndServe(*listenAddress, nil))
 	}()
 
 	for {
 		if <-stopCh {
-			log.Info("Shutting down WMI exporter")
+			log.Info("Shutting down windows_exporter")
 			break
 		}
 	}
@@ -380,11 +380,30 @@ func keys(m map[string]collector.Collector) []string {
 	return ret
 }
 
-type wmiExporterService struct {
+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)
+	}
+}
+
+type windowsExporterService struct {
 	stopCh chan<- bool
 }
 
-func (s *wmiExporterService) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
+func (s *windowsExporterService) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
 	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown
 	changes <- svc.Status{State: svc.StartPending}
 	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
@@ -409,7 +428,7 @@ loop:
 
 type metricsHandler struct {
 	timeoutMargin    float64
-	collectorFactory func(timeout time.Duration) *WmiCollector
+	collectorFactory func(timeout time.Duration) *windowsCollector
 }
 
 func (mh *metricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -431,9 +450,9 @@ func (mh *metricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	reg := prometheus.NewRegistry()
 	reg.MustRegister(mh.collectorFactory(time.Duration(timeoutSeconds * float64(time.Second))))
 	reg.MustRegister(
-		prometheus.NewProcessCollector(os.Getpid(), ""),
+		prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}),
 		prometheus.NewGoCollector(),
-		version.NewCollector("wmi_exporter"),
+		version.NewCollector("windows_exporter"),
 	)
 
 	h := promhttp.HandlerFor(reg, promhttp.HandlerOpts{})

go.mod

@@ -0,0 +1,17 @@
+module github.com/prometheus-community/windows_exporter
+
+go 1.13
+
+require (
+	github.com/Microsoft/go-winio v0.4.14 // indirect
+	github.com/Microsoft/hcsshim v0.8.6
+	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6
+	github.com/dimchansky/utfbom v1.1.0
+	github.com/go-ole/go-ole v1.2.1 // indirect
+	github.com/leoluk/perflib_exporter v0.1.0
+	github.com/prometheus/client_golang v0.9.2
+	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
+	github.com/prometheus/common v0.2.0
+	golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b
+	gopkg.in/alecthomas/kingpin.v2 v2.2.6
+)

go.sum

@@ -0,0 +1,70 @@
+github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
+github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4=
+github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E=
+github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/leoluk/perflib_exporter v0.1.0 h1:fXe/mDaf9jR+Zk8FjFlcCSksACuIj2VNN4GyKHmQqtA=
+github.com/leoluk/perflib_exporter v0.1.0/go.mod h1:rpV0lYj7lemdTm31t7zpCqYqPnw7xs86f+BaaNBVYFM=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.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 v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67 h1:1Fzlr8kkDLQwqMP8GxrhptBLqZG/EDpiATneiZHY998=
+golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

gometalinter.config

@@ -1,28 +0,0 @@
-{
-    "Disable": [
-        "goconst",
-        "gocyclo",
-        "gosec",
-        "maligned",
-        "megacheck"
-    ],
-    "Enable": [
-        "deadcode",
-        "errcheck",
-        "golint",
-        "gotype",
-        "gotypex",
-        "ineffassign",
-        "interfacer",
-        "structcheck",
-        "unconvert",
-        "varcheck",
-        "vet",
-        "vetshadow"
-    ],
-    "Exclude": [
-        "don't use underscores in Go names",
-        "exported type .+ should have comment or be unexported",
-        "should be"
-    ]
-}

installer/build.ps1

@@ -48,13 +48,13 @@ Get-FileIfNotExists "https://github.com/wixtoolset/wix3/releases/download/wix311
 mkdir -Force WiX | Out-Null
 Expand-Archive -Path "${sourceDir}\wix-binaries.zip" -DestinationPath WiX -Force
 
-Copy-Item -Force $PathToExecutable Work/wmi_exporter.exe
+Copy-Item -Force $PathToExecutable Work/windows_exporter.exe
 
-Write-Verbose "Creating wmi_exporter-${Version}-${Arch}.msi"
+Write-Verbose "Creating windows_exporter-${Version}-${Arch}.msi"
 $wixArch = @{"amd64" = "x64"; "386" = "x86"}[$Arch]
 $wixOpts = "-ext WixFirewallExtension -ext WixUtilExtension"
-Invoke-Expression "WiX\candle.exe -nologo -arch $wixArch $wixOpts -out Work\wmi_exporter.wixobj -dVersion=`"$Version`" wmi_exporter.wxs"
+Invoke-Expression "WiX\candle.exe -nologo -arch $wixArch $wixOpts -out Work\windows_exporter.wixobj -dVersion=`"$Version`" windows_exporter.wxs"
-Invoke-Expression "WiX\light.exe -nologo -spdb $wixOpts -out `"Output\wmi_exporter-${Version}-${Arch}.msi`" Work\wmi_exporter.wixobj"
+Invoke-Expression "WiX\light.exe -nologo -spdb $wixOpts -out `"Output\windows_exporter-${Version}-${Arch}.msi`" Work\windows_exporter.wixobj"
 
 Write-Verbose "Done!"
 Pop-Location

installer/windows_exporter.wxs

@@ -9,11 +9,11 @@
   <?endif ?>
 
   <Product Id="*" UpgradeCode="66a6eb5b-1fc2-4b14-a362-5ceec6413308"
-           Name="WMI Exporter" Version="$(var.Version)" Manufacturer="Martin Lindhe" 
+           Name="windows_exporter" Version="$(var.Version)" Manufacturer="prometheus-community"
            Language="1033" Codepage="1252">
-    <Package Id="*" Manufacturer="Martin Lindhe" InstallScope="perMachine" 
+    <Package Id="*" Manufacturer="prometheus-community" InstallScope="perMachine"
-             Description="WMI Exporter $(var.Version) installer" Compressed="yes" />
+             Description="windows_exporter $(var.Version) installer" Compressed="yes" />
-    <Media Id="1" Cabinet="wmi_exporter.cab" EmbedCab="yes"/>
+    <Media Id="1" Cabinet="windows_exporter.cab" EmbedCab="yes"/>
     <MajorUpgrade Schedule="afterInstallExecute" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
 
     <Property Id="ENABLED_COLLECTORS" Secure="yes"/>
@@ -31,7 +31,7 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.PlatformProgramFiles)">
-        <Directory Id="APPLICATIONROOTDIRECTORY" Name="wmi_exporter">
+        <Directory Id="APPLICATIONROOTDIRECTORY" Name="windows_exporter">
           <Directory Id="textfile_inputs" Name="textfile_inputs" />
         </Directory>
       </Directory>
@@ -42,14 +42,14 @@
 
     <ComponentGroup Id="Files">
       <Component Directory="APPLICATIONROOTDIRECTORY">
-        <File Id="wmi_exporter.exe" Name="wmi_exporter.exe" Source="Work\wmi_exporter.exe" KeyPath="yes">
+        <File Id="windows_exporter.exe" Name="windows_exporter.exe" Source="Work\windows_exporter.exe" KeyPath="yes">
-          <fw:FirewallException Id="MetricsEndpoint" Name="WMI Exporter (HTTP [LISTEN_PORT])" Description="WMI Exporter HTTP endpoint" Port="[LISTEN_PORT]" Protocol="tcp" Scope="any" IgnoreFailure="yes" />
+          <fw:FirewallException Id="MetricsEndpoint" Name="windows_exporter (HTTP [LISTEN_PORT])" Description="windows_exporter HTTP endpoint" Port="[LISTEN_PORT]" Protocol="tcp" Scope="any" IgnoreFailure="yes" />
         </File>
-        <ServiceInstall Id="InstallExporterService" Name="wmi_exporter" DisplayName="WMI exporter" Description="Exports Prometheus metrics from WMI queries" ErrorControl="normal" Start="auto" Type="ownProcess" Arguments="--log.format logger:eventlog?name=wmi_exporter [CollectorsFlag] [ListenFlag] [MetricsPathFlag] [TextfileDirFlag] [ExtraFlags]">
+        <ServiceInstall Id="InstallExporterService" Name="windows_exporter" DisplayName="windows_exporter" Description="Exports Prometheus metrics from WMI queries" ErrorControl="normal" Start="auto" Type="ownProcess" Arguments="--log.format logger:eventlog?name=windows_exporter [CollectorsFlag] [ListenFlag] [MetricsPathFlag] [TextfileDirFlag] [ExtraFlags]">
           <util:ServiceConfig FirstFailureActionType="restart" SecondFailureActionType="restart" ThirdFailureActionType="restart" RestartServiceDelayInSeconds="5" />
         </ServiceInstall>
-        <ServiceControl Id="ServiceStateControl" Name="wmi_exporter" Remove="uninstall" Start="install" Stop="both" />
+        <ServiceControl Id="ServiceStateControl" Name="windows_exporter" Remove="uninstall" Start="install" Stop="both" />
-        <util:EventSource Log="Application" Name="wmi_exporter" EventMessageFile="%SystemRoot%\System32\EventCreate.exe" />
+        <util:EventSource Log="Application" Name="windows_exporter" EventMessageFile="%SystemRoot%\System32\EventCreate.exe" />
       </Component>
       <Component Id="CreateTextfileDirectory" Directory="textfile_inputs" Guid="d03ef58a-9cbf-4165-ad39-d143e9b27e14">
         <CreateFolder />

tools/collector-generator/New-Collector.ps1

@@ -11,16 +11,16 @@ Param(
 $ErrorActionPreference = "Stop"
 
 if($Credential -ne $null) {
-    $wmiObject = Get-WMIObject -ComputerName $ComputerName -Credential $Credential -Class $Class
+    $wmiObject = Get-CimInstance -ComputerName $ComputerName -Credential $Credential -Class $Class
 }
 else {
-    $wmiObject = Get-WMIObject -ComputerName $ComputerName -Class $Class
+    $wmiObject = Get-CimInstance -ComputerName $ComputerName -Class $Class
 }
 
 $members = $wmiObject `
     | Get-Member -MemberType Properties `
     | Where-Object { $_.Definition -Match '^u?int' -and $_.Name -NotMatch '_' } `
-    | Select-Object Name, @{Name="Type";Expression={$_.Definition.Split(" ")[0]}})
+    | Select-Object Name, @{Name="Type";Expression={$_.Definition.Split(" ")[0]}}
 $input = @{
     "Class"=$Class;
     "CollectorName"=$CollectorName;

tools/collector-generator/collector.template

@@ -5,7 +5,7 @@ import (
     "github.com/prometheus/common/log"
 )
 func init() {
-    Factories["{{ .CollectorName | toLower }}"] = New{{ .CollectorName }}Collector
+    registerCollector("{{ .CollectorName | toLower }}", new{{ .CollectorName }}Collector) // TODO: Add any perflib dependencies here
 }
 // A {{ .CollectorName }}Collector is a Prometheus collector for WMI {{ .Class }} metrics
 type {{ .CollectorName }}Collector struct {
@@ -13,8 +13,8 @@ type {{ .CollectorName }}Collector struct {
     {{ $m.Name }} *prometheus.Desc
 {{- end }}
 }
-// New{{ .CollectorName }}Collector ...
+
-func New{{ .CollectorName }}Collector() (Collector, error) {
+func new{{ .CollectorName }}Collector() (Collector, error) {
     const subsystem = "{{ .CollectorName | toLower }}"
     return &{{ .CollectorName }}Collector{
 {{- range $m := .Members }}
@@ -27,15 +27,7 @@ func New{{ .CollectorName }}Collector() (Collector, error) {
 {{- end }}
     }, nil
 }
-// Collect sends the metric values for each metric
+
-// to the provided prometheus Metric channel.
-func (c *{{ .CollectorName }}Collector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
-    if desc, err := c.collect(ch); err != nil {
-        log.Error("failed collecting {{ .CollectorName | toLower }} metrics:", desc, err)
-        return err
-    }
-    return nil
-}
 // {{ .Class }} docs:
 // - <add link to documentation here>
 type {{ .Class }} struct {
@@ -44,7 +36,10 @@ type {{ .Class }} struct {
     {{ $m.Name }} {{ $m.Type }}
 {{- end }}
 }
-func (c *{{ .CollectorName }}Collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *{{ .CollectorName }}Collector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
     var dst []{{ .Class }}
     q := queryAll(&dst)
     if err := wmi.Query(q, &dst); err != nil {

vendor/github.com/Microsoft/go-winio/.gitignore

@@ -1 +0,0 @@
-*.exe

vendor/github.com/Microsoft/go-winio/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

vendor/github.com/Microsoft/go-winio/README.md

@@ -1,22 +0,0 @@
-# go-winio
-
-This repository contains utilities for efficiently performing Win32 IO operations in
-Go. Currently, this is focused on accessing named pipes and other file handles, and
-for using named pipes as a net transport.
-
-This code relies on IO completion ports to avoid blocking IO on system threads, allowing Go
-to reuse the thread to schedule another goroutine. This limits support to Windows Vista and
-newer operating systems. This is similar to the implementation of network sockets in Go's net
-package.
-
-Please see the LICENSE file for licensing information.
-
-This project has adopted the [Microsoft Open Source Code of
-Conduct](https://opensource.microsoft.com/codeofconduct/). For more information
-see the [Code of Conduct
-FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact
-[opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional
-questions or comments.
-
-Thanks to natefinch for the inspiration for this library. See https://github.com/natefinch/npipe
-for another named pipe implementation.

vendor/github.com/Microsoft/go-winio/archive/tar/LICENSE

@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

vendor/github.com/Microsoft/go-winio/archive/tar/common.go

@@ -1,344 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package tar implements access to tar archives.
-// It aims to cover most of the variations, including those produced
-// by GNU and BSD tars.
-//
-// References:
-//   http://www.freebsd.org/cgi/man.cgi?query=tar&sektion=5
-//   http://www.gnu.org/software/tar/manual/html_node/Standard.html
-//   http://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html
-package tar
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"os"
-	"path"
-	"time"
-)
-
-const (
-	blockSize = 512
-
-	// Types
-	TypeReg           = '0'    // regular file
-	TypeRegA          = '\x00' // regular file
-	TypeLink          = '1'    // hard link
-	TypeSymlink       = '2'    // symbolic link
-	TypeChar          = '3'    // character device node
-	TypeBlock         = '4'    // block device node
-	TypeDir           = '5'    // directory
-	TypeFifo          = '6'    // fifo node
-	TypeCont          = '7'    // reserved
-	TypeXHeader       = 'x'    // extended header
-	TypeXGlobalHeader = 'g'    // global extended header
-	TypeGNULongName   = 'L'    // Next file has a long name
-	TypeGNULongLink   = 'K'    // Next file symlinks to a file w/ a long name
-	TypeGNUSparse     = 'S'    // sparse file
-)
-
-// A Header represents a single header in a tar archive.
-// Some fields may not be populated.
-type Header struct {
-	Name         string    // name of header file entry
-	Mode         int64     // permission and mode bits
-	Uid          int       // user id of owner
-	Gid          int       // group id of owner
-	Size         int64     // length in bytes
-	ModTime      time.Time // modified time
-	Typeflag     byte      // type of header entry
-	Linkname     string    // target name of link
-	Uname        string    // user name of owner
-	Gname        string    // group name of owner
-	Devmajor     int64     // major number of character or block device
-	Devminor     int64     // minor number of character or block device
-	AccessTime   time.Time // access time
-	ChangeTime   time.Time // status change time
-	CreationTime time.Time // creation time
-	Xattrs       map[string]string
-	Winheaders   map[string]string
-}
-
-// File name constants from the tar spec.
-const (
-	fileNameSize       = 100 // Maximum number of bytes in a standard tar name.
-	fileNamePrefixSize = 155 // Maximum number of ustar extension bytes.
-)
-
-// FileInfo returns an os.FileInfo for the Header.
-func (h *Header) FileInfo() os.FileInfo {
-	return headerFileInfo{h}
-}
-
-// headerFileInfo implements os.FileInfo.
-type headerFileInfo struct {
-	h *Header
-}
-
-func (fi headerFileInfo) Size() int64        { return fi.h.Size }
-func (fi headerFileInfo) IsDir() bool        { return fi.Mode().IsDir() }
-func (fi headerFileInfo) ModTime() time.Time { return fi.h.ModTime }
-func (fi headerFileInfo) Sys() interface{}   { return fi.h }
-
-// Name returns the base name of the file.
-func (fi headerFileInfo) Name() string {
-	if fi.IsDir() {
-		return path.Base(path.Clean(fi.h.Name))
-	}
-	return path.Base(fi.h.Name)
-}
-
-// Mode returns the permission and mode bits for the headerFileInfo.
-func (fi headerFileInfo) Mode() (mode os.FileMode) {
-	// Set file permission bits.
-	mode = os.FileMode(fi.h.Mode).Perm()
-
-	// Set setuid, setgid and sticky bits.
-	if fi.h.Mode&c_ISUID != 0 {
-		// setuid
-		mode |= os.ModeSetuid
-	}
-	if fi.h.Mode&c_ISGID != 0 {
-		// setgid
-		mode |= os.ModeSetgid
-	}
-	if fi.h.Mode&c_ISVTX != 0 {
-		// sticky
-		mode |= os.ModeSticky
-	}
-
-	// Set file mode bits.
-	// clear perm, setuid, setgid and sticky bits.
-	m := os.FileMode(fi.h.Mode) &^ 07777
-	if m == c_ISDIR {
-		// directory
-		mode |= os.ModeDir
-	}
-	if m == c_ISFIFO {
-		// named pipe (FIFO)
-		mode |= os.ModeNamedPipe
-	}
-	if m == c_ISLNK {
-		// symbolic link
-		mode |= os.ModeSymlink
-	}
-	if m == c_ISBLK {
-		// device file
-		mode |= os.ModeDevice
-	}
-	if m == c_ISCHR {
-		// Unix character device
-		mode |= os.ModeDevice
-		mode |= os.ModeCharDevice
-	}
-	if m == c_ISSOCK {
-		// Unix domain socket
-		mode |= os.ModeSocket
-	}
-
-	switch fi.h.Typeflag {
-	case TypeSymlink:
-		// symbolic link
-		mode |= os.ModeSymlink
-	case TypeChar:
-		// character device node
-		mode |= os.ModeDevice
-		mode |= os.ModeCharDevice
-	case TypeBlock:
-		// block device node
-		mode |= os.ModeDevice
-	case TypeDir:
-		// directory
-		mode |= os.ModeDir
-	case TypeFifo:
-		// fifo node
-		mode |= os.ModeNamedPipe
-	}
-
-	return mode
-}
-
-// sysStat, if non-nil, populates h from system-dependent fields of fi.
-var sysStat func(fi os.FileInfo, h *Header) error
-
-// Mode constants from the tar spec.
-const (
-	c_ISUID  = 04000   // Set uid
-	c_ISGID  = 02000   // Set gid
-	c_ISVTX  = 01000   // Save text (sticky bit)
-	c_ISDIR  = 040000  // Directory
-	c_ISFIFO = 010000  // FIFO
-	c_ISREG  = 0100000 // Regular file
-	c_ISLNK  = 0120000 // Symbolic link
-	c_ISBLK  = 060000  // Block special file
-	c_ISCHR  = 020000  // Character special file
-	c_ISSOCK = 0140000 // Socket
-)
-
-// Keywords for the PAX Extended Header
-const (
-	paxAtime        = "atime"
-	paxCharset      = "charset"
-	paxComment      = "comment"
-	paxCtime        = "ctime" // please note that ctime is not a valid pax header.
-	paxCreationTime = "LIBARCHIVE.creationtime"
-	paxGid          = "gid"
-	paxGname        = "gname"
-	paxLinkpath     = "linkpath"
-	paxMtime        = "mtime"
-	paxPath         = "path"
-	paxSize         = "size"
-	paxUid          = "uid"
-	paxUname        = "uname"
-	paxXattr        = "SCHILY.xattr."
-	paxWindows      = "MSWINDOWS."
-	paxNone         = ""
-)
-
-// FileInfoHeader creates a partially-populated Header from fi.
-// If fi describes a symlink, FileInfoHeader records link as the link target.
-// If fi describes a directory, a slash is appended to the name.
-// Because os.FileInfo's Name method returns only the base name of
-// the file it describes, it may be necessary to modify the Name field
-// of the returned header to provide the full path name of the file.
-func FileInfoHeader(fi os.FileInfo, link string) (*Header, error) {
-	if fi == nil {
-		return nil, errors.New("tar: FileInfo is nil")
-	}
-	fm := fi.Mode()
-	h := &Header{
-		Name:    fi.Name(),
-		ModTime: fi.ModTime(),
-		Mode:    int64(fm.Perm()), // or'd with c_IS* constants later
-	}
-	switch {
-	case fm.IsRegular():
-		h.Mode |= c_ISREG
-		h.Typeflag = TypeReg
-		h.Size = fi.Size()
-	case fi.IsDir():
-		h.Typeflag = TypeDir
-		h.Mode |= c_ISDIR
-		h.Name += "/"
-	case fm&os.ModeSymlink != 0:
-		h.Typeflag = TypeSymlink
-		h.Mode |= c_ISLNK
-		h.Linkname = link
-	case fm&os.ModeDevice != 0:
-		if fm&os.ModeCharDevice != 0 {
-			h.Mode |= c_ISCHR
-			h.Typeflag = TypeChar
-		} else {
-			h.Mode |= c_ISBLK
-			h.Typeflag = TypeBlock
-		}
-	case fm&os.ModeNamedPipe != 0:
-		h.Typeflag = TypeFifo
-		h.Mode |= c_ISFIFO
-	case fm&os.ModeSocket != 0:
-		h.Mode |= c_ISSOCK
-	default:
-		return nil, fmt.Errorf("archive/tar: unknown file mode %v", fm)
-	}
-	if fm&os.ModeSetuid != 0 {
-		h.Mode |= c_ISUID
-	}
-	if fm&os.ModeSetgid != 0 {
-		h.Mode |= c_ISGID
-	}
-	if fm&os.ModeSticky != 0 {
-		h.Mode |= c_ISVTX
-	}
-	// If possible, populate additional fields from OS-specific
-	// FileInfo fields.
-	if sys, ok := fi.Sys().(*Header); ok {
-		// This FileInfo came from a Header (not the OS). Use the
-		// original Header to populate all remaining fields.
-		h.Uid = sys.Uid
-		h.Gid = sys.Gid
-		h.Uname = sys.Uname
-		h.Gname = sys.Gname
-		h.AccessTime = sys.AccessTime
-		h.ChangeTime = sys.ChangeTime
-		if sys.Xattrs != nil {
-			h.Xattrs = make(map[string]string)
-			for k, v := range sys.Xattrs {
-				h.Xattrs[k] = v
-			}
-		}
-		if sys.Typeflag == TypeLink {
-			// hard link
-			h.Typeflag = TypeLink
-			h.Size = 0
-			h.Linkname = sys.Linkname
-		}
-	}
-	if sysStat != nil {
-		return h, sysStat(fi, h)
-	}
-	return h, nil
-}
-
-var zeroBlock = make([]byte, blockSize)
-
-// POSIX specifies a sum of the unsigned byte values, but the Sun tar uses signed byte values.
-// We compute and return both.
-func checksum(header []byte) (unsigned int64, signed int64) {
-	for i := 0; i < len(header); i++ {
-		if i == 148 {
-			// The chksum field (header[148:156]) is special: it should be treated as space bytes.
-			unsigned += ' ' * 8
-			signed += ' ' * 8
-			i += 7
-			continue
-		}
-		unsigned += int64(header[i])
-		signed += int64(int8(header[i]))
-	}
-	return
-}
-
-type slicer []byte
-
-func (sp *slicer) next(n int) (b []byte) {
-	s := *sp
-	b, *sp = s[0:n], s[n:]
-	return
-}
-
-func isASCII(s string) bool {
-	for _, c := range s {
-		if c >= 0x80 {
-			return false
-		}
-	}
-	return true
-}
-
-func toASCII(s string) string {
-	if isASCII(s) {
-		return s
-	}
-	var buf bytes.Buffer
-	for _, c := range s {
-		if c < 0x80 {
-			buf.WriteByte(byte(c))
-		}
-	}
-	return buf.String()
-}
-
-// isHeaderOnlyType checks if the given type flag is of the type that has no
-// data section even if a size is specified.
-func isHeaderOnlyType(flag byte) bool {
-	switch flag {
-	case TypeLink, TypeSymlink, TypeChar, TypeBlock, TypeDir, TypeFifo:
-		return true
-	default:
-		return false
-	}
-}

vendor/github.com/Microsoft/go-winio/archive/tar/example_test.go

@@ -1,80 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package tar_test
-
-import (
-	"archive/tar"
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-	"os"
-)
-
-func Example() {
-	// Create a buffer to write our archive to.
-	buf := new(bytes.Buffer)
-
-	// Create a new tar archive.
-	tw := tar.NewWriter(buf)
-
-	// Add some files to the archive.
-	var files = []struct {
-		Name, Body string
-	}{
-		{"readme.txt", "This archive contains some text files."},
-		{"gopher.txt", "Gopher names:\nGeorge\nGeoffrey\nGonzo"},
-		{"todo.txt", "Get animal handling license."},
-	}
-	for _, file := range files {
-		hdr := &tar.Header{
-			Name: file.Name,
-			Mode: 0600,
-			Size: int64(len(file.Body)),
-		}
-		if err := tw.WriteHeader(hdr); err != nil {
-			log.Fatalln(err)
-		}
-		if _, err := tw.Write([]byte(file.Body)); err != nil {
-			log.Fatalln(err)
-		}
-	}
-	// Make sure to check the error on Close.
-	if err := tw.Close(); err != nil {
-		log.Fatalln(err)
-	}
-
-	// Open the tar archive for reading.
-	r := bytes.NewReader(buf.Bytes())
-	tr := tar.NewReader(r)
-
-	// Iterate through the files in the archive.
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			log.Fatalln(err)
-		}
-		fmt.Printf("Contents of %s:\n", hdr.Name)
-		if _, err := io.Copy(os.Stdout, tr); err != nil {
-			log.Fatalln(err)
-		}
-		fmt.Println()
-	}
-
-	// Output:
-	// Contents of readme.txt:
-	// This archive contains some text files.
-	// Contents of gopher.txt:
-	// Gopher names:
-	// George
-	// Geoffrey
-	// Gonzo
-	// Contents of todo.txt:
-	// Get animal handling license.
-}

vendor/github.com/Microsoft/go-winio/archive/tar/stat_atim.go

@@ -1,20 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux dragonfly openbsd solaris
-
-package tar
-
-import (
-	"syscall"
-	"time"
-)
-
-func statAtime(st *syscall.Stat_t) time.Time {
-	return time.Unix(st.Atim.Unix())
-}
-
-func statCtime(st *syscall.Stat_t) time.Time {
-	return time.Unix(st.Ctim.Unix())
-}

vendor/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go

@@ -1,20 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin freebsd netbsd
-
-package tar
-
-import (
-	"syscall"
-	"time"
-)
-
-func statAtime(st *syscall.Stat_t) time.Time {
-	return time.Unix(st.Atimespec.Unix())
-}
-
-func statCtime(st *syscall.Stat_t) time.Time {
-	return time.Unix(st.Ctimespec.Unix())
-}

vendor/github.com/Microsoft/go-winio/archive/tar/stat_unix.go

@@ -1,32 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux darwin dragonfly freebsd openbsd netbsd solaris
-
-package tar
-
-import (
-	"os"
-	"syscall"
-)
-
-func init() {
-	sysStat = statUnix
-}
-
-func statUnix(fi os.FileInfo, h *Header) error {
-	sys, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		return nil
-	}
-	h.Uid = int(sys.Uid)
-	h.Gid = int(sys.Gid)
-	// TODO(bradfitz): populate username & group.  os/user
-	// doesn't cache LookupId lookups, and lacks group
-	// lookup functions.
-	h.AccessTime = statAtime(sys)
-	h.ChangeTime = statCtime(sys)
-	// TODO(bradfitz): major/minor device numbers?
-	return nil
-}