netframework: merge multiple collector into one (Click here for more information) (#1633)

2026-02-16 01:36:37 +00:00 · 2024-09-20 10:02:57 +02:00
parent 41ff5729df
commit 2635e5d8eb
32 changed files with 536 additions and 1192 deletions
--- a/pkg/collector/map.go
+++ b/pkg/collector/map.go
@@ -29,14 +29,7 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/msmq"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/mssql"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/net"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrexceptions"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrinterop"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrjit"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrloading"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrlocksandthreads"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrmemory"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrremoting"
-	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrsecurity"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/netframework"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/nps"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/os"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/perfdata"
@@ -67,59 +60,52 @@ func NewBuilderWithFlags[C Collector](fn BuilderWithFlags[C]) BuilderWithFlags[C
 }

 var BuildersWithFlags = map[string]BuilderWithFlags[Collector]{
-	ad.Name:                              NewBuilderWithFlags(ad.NewWithFlags),
-	adcs.Name:                            NewBuilderWithFlags(adcs.NewWithFlags),
-	adfs.Name:                            NewBuilderWithFlags(adfs.NewWithFlags),
-	cache.Name:                           NewBuilderWithFlags(cache.NewWithFlags),
-	container.Name:                       NewBuilderWithFlags(container.NewWithFlags),
-	cpu.Name:                             NewBuilderWithFlags(cpu.NewWithFlags),
-	cpu_info.Name:                        NewBuilderWithFlags(cpu_info.NewWithFlags),
-	cs.Name:                              NewBuilderWithFlags(cs.NewWithFlags),
-	dfsr.Name:                            NewBuilderWithFlags(dfsr.NewWithFlags),
-	dhcp.Name:                            NewBuilderWithFlags(dhcp.NewWithFlags),
-	diskdrive.Name:                       NewBuilderWithFlags(diskdrive.NewWithFlags),
-	dns.Name:                             NewBuilderWithFlags(dns.NewWithFlags),
-	exchange.Name:                        NewBuilderWithFlags(exchange.NewWithFlags),
-	fsrmquota.Name:                       NewBuilderWithFlags(fsrmquota.NewWithFlags),
-	hyperv.Name:                          NewBuilderWithFlags(hyperv.NewWithFlags),
-	iis.Name:                             NewBuilderWithFlags(iis.NewWithFlags),
-	license.Name:                         NewBuilderWithFlags(license.NewWithFlags),
-	logical_disk.Name:                    NewBuilderWithFlags(logical_disk.NewWithFlags),
-	logon.Name:                           NewBuilderWithFlags(logon.NewWithFlags),
-	memory.Name:                          NewBuilderWithFlags(memory.NewWithFlags),
-	mscluster.Name:                       NewBuilderWithFlags(mscluster.NewWithFlags),
-	msmq.Name:                            NewBuilderWithFlags(msmq.NewWithFlags),
-	mssql.Name:                           NewBuilderWithFlags(mssql.NewWithFlags),
-	net.Name:                             NewBuilderWithFlags(net.NewWithFlags),
-	netframework_clrexceptions.Name:      NewBuilderWithFlags(netframework_clrexceptions.NewWithFlags),
-	netframework_clrinterop.Name:         NewBuilderWithFlags(netframework_clrinterop.NewWithFlags),
-	netframework_clrjit.Name:             NewBuilderWithFlags(netframework_clrjit.NewWithFlags),
-	netframework_clrloading.Name:         NewBuilderWithFlags(netframework_clrloading.NewWithFlags),
-	netframework_clrlocksandthreads.Name: NewBuilderWithFlags(netframework_clrlocksandthreads.NewWithFlags),
-	netframework_clrmemory.Name:          NewBuilderWithFlags(netframework_clrmemory.NewWithFlags),
-	netframework_clrremoting.Name:        NewBuilderWithFlags(netframework_clrremoting.NewWithFlags),
-	netframework_clrsecurity.Name:        NewBuilderWithFlags(netframework_clrsecurity.NewWithFlags),
-	nps.Name:                             NewBuilderWithFlags(nps.NewWithFlags),
-	os.Name:                              NewBuilderWithFlags(os.NewWithFlags),
-	perfdata.Name:                        NewBuilderWithFlags(perfdata.NewWithFlags),
-	physical_disk.Name:                   NewBuilderWithFlags(physical_disk.NewWithFlags),
-	printer.Name:                         NewBuilderWithFlags(printer.NewWithFlags),
-	process.Name:                         NewBuilderWithFlags(process.NewWithFlags),
-	remote_fx.Name:                       NewBuilderWithFlags(remote_fx.NewWithFlags),
-	scheduled_task.Name:                  NewBuilderWithFlags(scheduled_task.NewWithFlags),
-	service.Name:                         NewBuilderWithFlags(service.NewWithFlags),
-	smb.Name:                             NewBuilderWithFlags(smb.NewWithFlags),
-	smbclient.Name:                       NewBuilderWithFlags(smbclient.NewWithFlags),
-	smtp.Name:                            NewBuilderWithFlags(smtp.NewWithFlags),
-	system.Name:                          NewBuilderWithFlags(system.NewWithFlags),
-	teradici_pcoip.Name:                  NewBuilderWithFlags(teradici_pcoip.NewWithFlags),
-	tcp.Name:                             NewBuilderWithFlags(tcp.NewWithFlags),
-	terminal_services.Name:               NewBuilderWithFlags(terminal_services.NewWithFlags),
-	textfile.Name:                        NewBuilderWithFlags(textfile.NewWithFlags),
-	thermalzone.Name:                     NewBuilderWithFlags(thermalzone.NewWithFlags),
-	time.Name:                            NewBuilderWithFlags(time.NewWithFlags),
-	vmware.Name:                          NewBuilderWithFlags(vmware.NewWithFlags),
-	vmware_blast.Name:                    NewBuilderWithFlags(vmware_blast.NewWithFlags),
+	ad.Name:                NewBuilderWithFlags(ad.NewWithFlags),
+	adcs.Name:              NewBuilderWithFlags(adcs.NewWithFlags),
+	adfs.Name:              NewBuilderWithFlags(adfs.NewWithFlags),
+	cache.Name:             NewBuilderWithFlags(cache.NewWithFlags),
+	container.Name:         NewBuilderWithFlags(container.NewWithFlags),
+	cpu.Name:               NewBuilderWithFlags(cpu.NewWithFlags),
+	cpu_info.Name:          NewBuilderWithFlags(cpu_info.NewWithFlags),
+	cs.Name:                NewBuilderWithFlags(cs.NewWithFlags),
+	dfsr.Name:              NewBuilderWithFlags(dfsr.NewWithFlags),
+	dhcp.Name:              NewBuilderWithFlags(dhcp.NewWithFlags),
+	diskdrive.Name:         NewBuilderWithFlags(diskdrive.NewWithFlags),
+	dns.Name:               NewBuilderWithFlags(dns.NewWithFlags),
+	exchange.Name:          NewBuilderWithFlags(exchange.NewWithFlags),
+	fsrmquota.Name:         NewBuilderWithFlags(fsrmquota.NewWithFlags),
+	hyperv.Name:            NewBuilderWithFlags(hyperv.NewWithFlags),
+	iis.Name:               NewBuilderWithFlags(iis.NewWithFlags),
+	license.Name:           NewBuilderWithFlags(license.NewWithFlags),
+	logical_disk.Name:      NewBuilderWithFlags(logical_disk.NewWithFlags),
+	logon.Name:             NewBuilderWithFlags(logon.NewWithFlags),
+	memory.Name:            NewBuilderWithFlags(memory.NewWithFlags),
+	mscluster.Name:         NewBuilderWithFlags(mscluster.NewWithFlags),
+	msmq.Name:              NewBuilderWithFlags(msmq.NewWithFlags),
+	mssql.Name:             NewBuilderWithFlags(mssql.NewWithFlags),
+	net.Name:               NewBuilderWithFlags(net.NewWithFlags),
+	netframework.Name:      NewBuilderWithFlags(netframework.NewWithFlags),
+	nps.Name:               NewBuilderWithFlags(nps.NewWithFlags),
+	os.Name:                NewBuilderWithFlags(os.NewWithFlags),
+	perfdata.Name:          NewBuilderWithFlags(perfdata.NewWithFlags),
+	physical_disk.Name:     NewBuilderWithFlags(physical_disk.NewWithFlags),
+	printer.Name:           NewBuilderWithFlags(printer.NewWithFlags),
+	process.Name:           NewBuilderWithFlags(process.NewWithFlags),
+	remote_fx.Name:         NewBuilderWithFlags(remote_fx.NewWithFlags),
+	scheduled_task.Name:    NewBuilderWithFlags(scheduled_task.NewWithFlags),
+	service.Name:           NewBuilderWithFlags(service.NewWithFlags),
+	smb.Name:               NewBuilderWithFlags(smb.NewWithFlags),
+	smbclient.Name:         NewBuilderWithFlags(smbclient.NewWithFlags),
+	smtp.Name:              NewBuilderWithFlags(smtp.NewWithFlags),
+	system.Name:            NewBuilderWithFlags(system.NewWithFlags),
+	teradici_pcoip.Name:    NewBuilderWithFlags(teradici_pcoip.NewWithFlags),
+	tcp.Name:               NewBuilderWithFlags(tcp.NewWithFlags),
+	terminal_services.Name: NewBuilderWithFlags(terminal_services.NewWithFlags),
+	textfile.Name:          NewBuilderWithFlags(textfile.NewWithFlags),
+	thermalzone.Name:       NewBuilderWithFlags(thermalzone.NewWithFlags),
+	time.Name:              NewBuilderWithFlags(time.NewWithFlags),
+	vmware.Name:            NewBuilderWithFlags(vmware.NewWithFlags),
+	vmware_blast.Name:      NewBuilderWithFlags(vmware_blast.NewWithFlags),
 }

 func Available() []string {