sendnrw/windows_exporter
2
0
Fork 0
mirror of https://github.com/prometheus-community/windows_exporter.git synced 2026-03-04 01:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Remove registry based perfdata collector (#1742)

Browse Source 
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
Jan-Otto Kröpke
2024-11-17 21:51:12 +01:00
committed by GitHub
parent 6206b695c6
commit e6a15d4ec4
213 changed files with 8079 additions and 12405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/collector/smbclient/const.go
View File

@@ -1,3 +1,5 @@
//go:build windows
package smbclient
const (

33
internal/collector/smbclient/smbclient.go
View File

@@ -10,7 +10,6 @@ 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/perfdata/perftypes"
"github.com/prometheus-community/windows_exporter/internal/types"
"github.com/prometheus/client_golang/prometheus"
)
@@ -26,7 +25,7 @@ var ConfigDefaults = Config{}
type Collector struct {
config Config
perfDataCollector perfdata.Collector
perfDataCollector *perfdata.Collector
readBytesTotal *prometheus.Desc
readBytesTransmittedViaSMBDirectTotal *prometheus.Desc
@@ -72,18 +71,14 @@ func (c *Collector) GetName() string {
return Name
}
func (c *Collector) GetPerfCounter(_ *slog.Logger) ([]string, error) {
return []string{}, nil
}
func (c *Collector) Close(_ *slog.Logger) error {
func (c *Collector) Close() error {
return nil
}
func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
var err error
c.perfDataCollector, err = perfdata.NewCollector(perfdata.V2, "SMB Client Shares", nil, []string{
c.perfDataCollector, err = perfdata.NewCollector("SMB Client Shares", nil, []string{
AvgDataQueueLength,
AvgReadQueueLength,
AvgSecPerRead,
@@ -209,15 +204,7 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
}
// Collect collects smb client metrics and sends them to prometheus.
func (c *Collector) Collect(_ *types.ScrapeContext, _ *slog.Logger, ch chan<- prometheus.Metric) error {
if err := c.collectClientShares(ch); err != nil {
return err
}
return nil
}
func (c *Collector) collectClientShares(ch chan<- prometheus.Metric) error {
func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
perfData, err := c.perfDataCollector.Collect()
if err != nil {
return fmt.Errorf("failed to collect SMB Client Shares metrics: %w", err)
@@ -232,7 +219,7 @@ func (c *Collector) collectClientShares(ch chan<- prometheus.Metric) error {
ch <- prometheus.MustNewConstMetric(
c.requestQueueSecsTotal,
prometheus.CounterValue,
data[AvgDataQueueLength].FirstValue*perftypes.TicksToSecondScaleFactor,
data[AvgDataQueueLength].FirstValue*perfdata.TicksToSecondScaleFactor,
serverValue, shareValue,
)
@@ -240,28 +227,28 @@ func (c *Collector) collectClientShares(ch chan<- prometheus.Metric) error {
ch <- prometheus.MustNewConstMetric(
c.readRequestQueueSecsTotal,
prometheus.CounterValue,
data[AvgReadQueueLength].FirstValue*perftypes.TicksToSecondScaleFactor,
data[AvgReadQueueLength].FirstValue*perfdata.TicksToSecondScaleFactor,
serverValue, shareValue,
)
ch <- prometheus.MustNewConstMetric(
c.readSecsTotal,
prometheus.CounterValue,
data[AvgSecPerRead].FirstValue*perftypes.TicksToSecondScaleFactor,
data[AvgSecPerRead].FirstValue*perfdata.TicksToSecondScaleFactor,
serverValue, shareValue,
)
ch <- prometheus.MustNewConstMetric(
c.writeSecsTotal,
prometheus.CounterValue,
data[AvgSecPerWrite].FirstValue*perftypes.TicksToSecondScaleFactor,
data[AvgSecPerWrite].FirstValue*perfdata.TicksToSecondScaleFactor,
serverValue, shareValue,
)
ch <- prometheus.MustNewConstMetric(
c.requestSecs,
prometheus.CounterValue,
data[AvgSecPerDataRequest].FirstValue*perftypes.TicksToSecondScaleFactor,
data[AvgSecPerDataRequest].FirstValue*perfdata.TicksToSecondScaleFactor,
serverValue, shareValue,
)
@@ -269,7 +256,7 @@ func (c *Collector) collectClientShares(ch chan<- prometheus.Metric) error {
ch <- prometheus.MustNewConstMetric(
c.writeRequestQueueSecsTotal,
prometheus.CounterValue,
data[AvgWriteQueueLength].FirstValue*perftypes.TicksToSecondScaleFactor,
data[AvgWriteQueueLength].FirstValue*perfdata.TicksToSecondScaleFactor,
serverValue, shareValue,
)

4
internal/collector/smbclient/smbclient_test.go
View File

@@ -1,10 +1,12 @@
//go:build windows
package smbclient_test
import (
"testing"
"github.com/prometheus-community/windows_exporter/internal/collector/smbclient"
"github.com/prometheus-community/windows_exporter/internal/testutils"
"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
)
func BenchmarkCollector(b *testing.B) {