sendnrw/windows_exporter
2
0
Fork 0
mirror of https://github.com/prometheus-community/windows_exporter.git synced 2026-03-09 20:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
Jan-Otto Kröpke
2024-12-21 22:58:47 +01:00
committed by GitHub
parent 39c929eefe
commit a9f8b3b722
158 changed files with 7793 additions and 7748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
internal/collector/physical_disk/const.go
View File

@@ -1,31 +0,0 @@
// Copyright 2024 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//go:build windows
package physical_disk
const (
CurrentDiskQueueLength = "Current Disk Queue Length"
DiskReadBytesPerSec = "Disk Read Bytes/sec"
DiskReadsPerSec = "Disk Reads/sec"
DiskWriteBytesPerSec = "Disk Write Bytes/sec"
DiskWritesPerSec = "Disk Writes/sec"
PercentDiskReadTime = "% Disk Read Time"
PercentDiskWriteTime = "% Disk Write Time"
PercentIdleTime = "% Idle Time"
SplitIOPerSec = "Split IO/Sec"
AvgDiskSecPerRead = "Avg. Disk sec/Read"
AvgDiskSecPerWrite = "Avg. Disk sec/Write"
AvgDiskSecPerTransfer = "Avg. Disk sec/Transfer"
)

56
internal/collector/physical_disk/physical_disk.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/alecthomas/kingpin/v2"
"github.com/prometheus-community/windows_exporter/internal/mi"
"github.com/prometheus-community/windows_exporter/internal/perfdata"
"github.com/prometheus-community/windows_exporter/internal/pdh"
"github.com/prometheus-community/windows_exporter/internal/types"
"github.com/prometheus/client_golang/prometheus"
)
@@ -45,7 +45,8 @@ var ConfigDefaults = Config{
type Collector struct {
config Config
perfDataCollector *perfdata.Collector
perfDataCollector *pdh.Collector
perfDataObject []perfDataCounterValues
idleTime *prometheus.Desc
readBytesTotal *prometheus.Desc
@@ -126,24 +127,9 @@ func (c *Collector) Close() error {
}
func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
counters := []string{
CurrentDiskQueueLength,
DiskReadBytesPerSec,
DiskReadsPerSec,
DiskWriteBytesPerSec,
DiskWritesPerSec,
PercentDiskReadTime,
PercentDiskWriteTime,
PercentIdleTime,
SplitIOPerSec,
AvgDiskSecPerRead,
AvgDiskSecPerWrite,
AvgDiskSecPerTransfer,
}
var err error
c.perfDataCollector, err = perfdata.NewCollector("PhysicalDisk", perfdata.InstancesAll, counters)
c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues]("PhysicalDisk", pdh.InstancesAll)
if err != nil {
return fmt.Errorf("failed to create PhysicalDisk collector: %w", err)
}
@@ -238,102 +224,102 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
// Collect sends the metric values for each metric
// to the provided prometheus Metric channel.
func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
perfData, err := c.perfDataCollector.Collect()
err := c.perfDataCollector.Collect(&c.perfDataObject)
if err != nil {
return fmt.Errorf("failed to collect PhysicalDisk metrics: %w", err)
}
for name, disk := range perfData {
if c.config.DiskExclude.MatchString(name) ||
!c.config.DiskInclude.MatchString(name) {
for _, data := range c.perfDataObject {
if c.config.DiskExclude.MatchString(data.Name) ||
!c.config.DiskInclude.MatchString(data.Name) {
continue
}
// Parse physical disk number from disk.Name. Mountpoint information is
// sometimes included, e.g. "1 C:".
disk_number, _, _ := strings.Cut(name, " ")
disk_number, _, _ := strings.Cut(data.Name, " ")
ch <- prometheus.MustNewConstMetric(
c.requestsQueued,
prometheus.GaugeValue,
disk[CurrentDiskQueueLength].FirstValue,
data.CurrentDiskQueueLength,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.readBytesTotal,
prometheus.CounterValue,
disk[DiskReadBytesPerSec].FirstValue,
data.DiskReadBytesPerSec,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.readsTotal,
prometheus.CounterValue,
disk[DiskReadsPerSec].FirstValue,
data.DiskReadsPerSec,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.writeBytesTotal,
prometheus.CounterValue,
disk[DiskWriteBytesPerSec].FirstValue,
data.DiskWriteBytesPerSec,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.writesTotal,
prometheus.CounterValue,
disk[DiskWritesPerSec].FirstValue,
data.DiskWritesPerSec,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.readTime,
prometheus.CounterValue,
disk[PercentDiskReadTime].FirstValue,
data.PercentDiskReadTime,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.writeTime,
prometheus.CounterValue,
disk[PercentDiskWriteTime].FirstValue,
data.PercentDiskWriteTime,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.idleTime,
prometheus.CounterValue,
disk[PercentIdleTime].FirstValue,
data.PercentIdleTime,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.splitIOs,
prometheus.CounterValue,
disk[SplitIOPerSec].FirstValue,
data.SplitIOPerSec,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.readLatency,
prometheus.CounterValue,
disk[AvgDiskSecPerRead].FirstValue*perfdata.TicksToSecondScaleFactor,
data.AvgDiskSecPerRead*pdh.TicksToSecondScaleFactor,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.writeLatency,
prometheus.CounterValue,
disk[AvgDiskSecPerWrite].FirstValue*perfdata.TicksToSecondScaleFactor,
data.AvgDiskSecPerWrite*pdh.TicksToSecondScaleFactor,
disk_number,
)
ch <- prometheus.MustNewConstMetric(
c.readWriteLatency,
prometheus.CounterValue,
disk[AvgDiskSecPerTransfer].FirstValue*perfdata.TicksToSecondScaleFactor,
data.AvgDiskSecPerTransfer*pdh.TicksToSecondScaleFactor,
disk_number,
)
}

33
internal/collector/physical_disk/types.go Normal file
View File

@@ -0,0 +1,33 @@
// Copyright 2024 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//go:build windows
package physical_disk
type perfDataCounterValues struct {
Name string
CurrentDiskQueueLength float64 `perfdata:"Current Disk Queue Length"`
DiskReadBytesPerSec float64 `perfdata:"Disk Read Bytes/sec"`
DiskReadsPerSec float64 `perfdata:"Disk Reads/sec"`
DiskWriteBytesPerSec float64 `perfdata:"Disk Write Bytes/sec"`
DiskWritesPerSec float64 `perfdata:"Disk Writes/sec"`
PercentDiskReadTime float64 `perfdata:"% Disk Read Time"`
PercentDiskWriteTime float64 `perfdata:"% Disk Write Time"`
PercentIdleTime float64 `perfdata:"% Idle Time"`
SplitIOPerSec float64 `perfdata:"Split IO/Sec"`
AvgDiskSecPerRead float64 `perfdata:"Avg. Disk sec/Read"`
AvgDiskSecPerWrite float64 `perfdata:"Avg. Disk sec/Write"`
AvgDiskSecPerTransfer float64 `perfdata:"Avg. Disk sec/Transfer"`
}