sendnrw/windows_exporter
2
0
Fork 0
mirror of https://github.com/prometheus-community/windows_exporter.git synced 2026-03-07 11:06:36 +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/tcp/const.go
View File

@@ -1,3 +1,5 @@
//go:build windows
package tcp
// Win32_PerfRawData_Tcpip_TCPv4 docs

31
internal/collector/tcp/tcp.go
View File

@@ -13,7 +13,6 @@ import (
"github.com/prometheus-community/windows_exporter/internal/headers/iphlpapi"
"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"
"golang.org/x/sys/windows"
@@ -36,8 +35,8 @@ var ConfigDefaults = Config{
type Collector struct {
config Config
perfDataCollector4 perfdata.Collector
perfDataCollector6 perfdata.Collector
perfDataCollector4 *perfdata.Collector
perfDataCollector6 *perfdata.Collector
connectionFailures *prometheus.Desc
connectionsActive *prometheus.Desc
@@ -93,11 +92,7 @@ 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 {
if slices.Contains(c.config.CollectorsEnabled, "metrics") {
c.perfDataCollector4.Close()
c.perfDataCollector6.Close()
@@ -121,12 +116,12 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
var err error
c.perfDataCollector4, err = perfdata.NewCollector(perfdata.V2, "TCPv4", nil, counters)
c.perfDataCollector4, err = perfdata.NewCollector("TCPv4", nil, counters)
if err != nil {
return fmt.Errorf("failed to create TCPv4 collector: %w", err)
}
c.perfDataCollector6, err = perfdata.NewCollector(perfdata.V2, "TCPv6", nil, counters)
c.perfDataCollector6, err = perfdata.NewCollector("TCPv6", nil, counters)
if err != nil {
return fmt.Errorf("failed to create TCPv6 collector: %w", err)
}
@@ -196,7 +191,7 @@ 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(_ *types.ScrapeContext, _ *slog.Logger, ch chan<- prometheus.Metric) error {
func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
errs := make([]error, 0, 2)
if slices.Contains(c.config.CollectorsEnabled, "metrics") {
@@ -220,19 +215,27 @@ func (c *Collector) collect(ch chan<- prometheus.Metric) error {
return fmt.Errorf("failed to collect TCPv4 metrics: %w", err)
}
c.writeTCPCounters(ch, data[perftypes.EmptyInstance], []string{"ipv4"})
if _, ok := data[perfdata.EmptyInstance]; !ok {
return errors.New("no data for TCPv4")
}
c.writeTCPCounters(ch, data[perfdata.EmptyInstance], []string{"ipv4"})
data, err = c.perfDataCollector6.Collect()
if err != nil {
return fmt.Errorf("failed to collect TCPv6 metrics: %w", err)
}
c.writeTCPCounters(ch, data[perftypes.EmptyInstance], []string{"ipv6"})
if _, ok := data[perfdata.EmptyInstance]; !ok {
return errors.New("no data for TCPv6")
}
c.writeTCPCounters(ch, data[perfdata.EmptyInstance], []string{"ipv6"})
return nil
}
func (c *Collector) writeTCPCounters(ch chan<- prometheus.Metric, metrics map[string]perftypes.CounterValues, labels []string) {
func (c *Collector) writeTCPCounters(ch chan<- prometheus.Metric, metrics map[string]perfdata.CounterValues, labels []string) {
ch <- prometheus.MustNewConstMetric(
c.connectionFailures,
prometheus.CounterValue,

4
internal/collector/tcp/tcp_test.go
View File

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