From 3b39b2b7b5b0ae733e78ab1704771113653229ce Mon Sep 17 00:00:00 2001 From: Zalgo Date: Sun, 11 Aug 2024 18:59:11 +0200 Subject: [PATCH] fixup! 816: pkg/collector: include OHWM collector --- pkg/collector/map.go | 118 +++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/pkg/collector/map.go b/pkg/collector/map.go index cbdbdedf5..64b74db4b 100644 --- a/pkg/collector/map.go +++ b/pkg/collector/map.go @@ -58,69 +58,67 @@ import ( "github.com/prometheus-community/windows_exporter/pkg/collector/time" "github.com/prometheus-community/windows_exporter/pkg/collector/vmware" "github.com/prometheus-community/windows_exporter/pkg/collector/vmware_blast" - "github.com/prometheus-community/windows_exporter/pkg/types" - "golang.org/x/exp/maps" ) -var BuildersWithFlags = map[string]types.CollectorBuilderWithFlags{ - ad.Name: ad.NewWithFlags, - adcs.Name: adcs.NewWithFlags, - adfs.Name: adfs.NewWithFlags, - cache.Name: cache.NewWithFlags, - container.Name: container.NewWithFlags, - cpu.Name: cpu.NewWithFlags, - cpu_info.Name: cpu_info.NewWithFlags, - cs.Name: cs.NewWithFlags, - dfsr.Name: dfsr.NewWithFlags, - dhcp.Name: dhcp.NewWithFlags, - diskdrive.Name: diskdrive.NewWithFlags, - dns.Name: dns.NewWithFlags, - exchange.Name: exchange.NewWithFlags, - fsrmquota.Name: fsrmquota.NewWithFlags, - hyperv.Name: hyperv.NewWithFlags, - iis.Name: iis.NewWithFlags, - license.Name: license.NewWithFlags, - logical_disk.Name: logical_disk.NewWithFlags, - logon.Name: logon.NewWithFlags, - memory.Name: memory.NewWithFlags, - mscluster_cluster.Name: mscluster_cluster.NewWithFlags, - mscluster_network.Name: mscluster_network.NewWithFlags, - mscluster_node.Name: mscluster_node.NewWithFlags, - mscluster_resource.Name: mscluster_resource.NewWithFlags, - mscluster_resourcegroup.Name: mscluster_resourcegroup.NewWithFlags, - msmq.Name: msmq.NewWithFlags, - mssql.Name: mssql.NewWithFlags, - net.Name: net.NewWithFlags, - netframework_clrexceptions.Name: netframework_clrexceptions.NewWithFlags, - netframework_clrinterop.Name: netframework_clrinterop.NewWithFlags, - netframework_clrjit.Name: netframework_clrjit.NewWithFlags, - netframework_clrloading.Name: netframework_clrloading.NewWithFlags, - netframework_clrlocksandthreads.Name: netframework_clrlocksandthreads.NewWithFlags, - netframework_clrmemory.Name: netframework_clrmemory.NewWithFlags, - netframework_clrremoting.Name: netframework_clrremoting.NewWithFlags, - netframework_clrsecurity.Name: netframework_clrsecurity.NewWithFlags, - nps.Name: nps.NewWithFlags, - ohwm.Name: ohwm.NewWithFlags, - os.Name: os.NewWithFlags, - physical_disk.Name: physical_disk.NewWithFlags, - printer.Name: printer.NewWithFlags, - process.Name: process.NewWithFlags, - remote_fx.Name: remote_fx.NewWithFlags, - scheduled_task.Name: scheduled_task.NewWithFlags, - service.Name: service.NewWithFlags, - smb.Name: smb.NewWithFlags, - smbclient.Name: smbclient.NewWithFlags, - smtp.Name: smtp.NewWithFlags, - system.Name: system.NewWithFlags, - teradici_pcoip.Name: teradici_pcoip.NewWithFlags, - tcp.Name: tcp.NewWithFlags, - terminal_services.Name: terminal_services.NewWithFlags, - textfile.Name: textfile.NewWithFlags, - thermalzone.Name: thermalzone.NewWithFlags, - time.Name: time.NewWithFlags, - vmware.Name: vmware.NewWithFlags, - vmware_blast.Name: vmware_blast.NewWithFlags, +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_cluster.Name: NewBuilderWithFlags(mscluster_cluster.NewWithFlags), + mscluster_network.Name: NewBuilderWithFlags(mscluster_network.NewWithFlags), + mscluster_node.Name: NewBuilderWithFlags(mscluster_node.NewWithFlags), + mscluster_resource.Name: NewBuilderWithFlags(mscluster_resource.NewWithFlags), + mscluster_resourcegroup.Name: NewBuilderWithFlags(mscluster_resourcegroup.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), + ohwm.Name: NewBuilderWithFlags(ohwm.NewWithFlags), + os.Name: NewBuilderWithFlags(os.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 {