diff --git a/README.md b/README.md index 91a14e82..1e8a27e3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Name | Description | Enabled by default [cache](docs/collector.cache.md) | Cache metrics | [cpu](docs/collector.cpu.md) | CPU usage | ✓ [cpu_info](docs/collector.cpu_info.md) | CPU Information | -[cs](docs/collector.cs.md) | "Computer System" metrics (system properties, num cpus/total memory) | +[cs](docs/collector.cs.md) | "Computer System" metrics (system properties, num cpus/total memory) | [container](docs/collector.container.md) | Container metrics | [diskdrive](docs/collector.diskdrive.md) | Diskdrive metrics | [dfsr](docs/collector.dfsr.md) | DFSR metrics | @@ -24,25 +24,18 @@ Name | Description | Enabled by default [fsrmquota](docs/collector.fsrmquota.md) | Microsoft File Server Resource Manager (FSRM) Quotas collector | [hyperv](docs/collector.hyperv.md) | Hyper-V hosts | [iis](docs/collector.iis.md) | IIS sites and applications | -[license](docs/collector.license.md) | Windows license status | +[license](docs/collector.license.md) | Windows license status | [logical_disk](docs/collector.logical_disk.md) | Logical disks, disk I/O | ✓ [logon](docs/collector.logon.md) | User logon sessions | [memory](docs/collector.memory.md) | Memory usage metrics | ✓ [mscluster](docs/collector.mscluster.md) | MSCluster metrics | [msmq](docs/collector.msmq.md) | MSMQ queues | [mssql](docs/collector.mssql.md) | [SQL Server Performance Objects](https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/use-sql-server-objects#SQLServerPOs) metrics | -[netframework_clrexceptions](docs/collector.netframework_clrexceptions.md) | .NET Framework CLR Exceptions | -[netframework_clrinterop](docs/collector.netframework_clrinterop.md) | .NET Framework Interop Metrics | -[netframework_clrjit](docs/collector.netframework_clrjit.md) | .NET Framework JIT metrics | -[netframework_clrloading](docs/collector.netframework_clrloading.md) | .NET Framework CLR Loading metrics | -[netframework_clrlocksandthreads](docs/collector.netframework_clrlocksandthreads.md) | .NET Framework locks and metrics threads | -[netframework_clrmemory](docs/collector.netframework_clrmemory.md) | .NET Framework Memory metrics | -[netframework_clrremoting](docs/collector.netframework_clrremoting.md) | .NET Framework Remoting metrics | -[netframework_clrsecurity](docs/collector.netframework_clrsecurity.md) | .NET Framework Security Check metrics | +[netframework](docs/collector.netframework.md) | .NET Framework metrics | [net](docs/collector.net.md) | Network interface I/O | ✓ [os](docs/collector.os.md) | OS metrics (memory, processes, users) | ✓ [physical_disk](docs/collector.physical_disk.md) | physical disk metrics | ✓ -[printer](docs/collector.printer.md) | Printer metrics | +[printer](docs/collector.printer.md) | Printer metrics | [process](docs/collector.process.md) | Per-process metrics | [remote_fx](docs/collector.remote_fx.md) | RemoteFX protocol (RDP) metrics | [scheduled_task](docs/collector.scheduled_task.md) | Scheduled Tasks metrics | @@ -99,9 +92,9 @@ The latest release can be downloaded from the [releases page](https://github.com Each release provides a .msi installer. The installer will setup the windows_exporter as a Windows service, as well as create an exception in the Windows Firewall. -If the installer is run without any parameters, the exporter will run with default settings for enabled collectors, ports, etc. +If the installer is run without any parameters, the exporter will run with default settings for enabled collectors, ports, etc. -The installer provides a configuration file to customize the exporter. +The installer provides a configuration file to customize the exporter. The configuration file * is located in the same directory as the exporter executable. @@ -163,7 +156,7 @@ msiexec /i ENABLED_COLLECTORS=os,service --% EXTRA_FLAGS="--c ## Docker Implementation -The windows_exporter can be run as a Docker container. The Docker image is available on +The windows_exporter can be run as a Docker container. The Docker image is available on * [Docker Hub](https://hub.docker.com/r/prometheuscommunity/windows-exporter): `docker.io/prometheuscommunity/windows-exporter` * [GitHub Container Registry](https://github.com/prometheus-community/windows_exporter/pkgs/container/windows-exporter): `ghcr.io/prometheus-community/windows-exporter` diff --git a/docs/README.md b/docs/README.md index 6d4af6b7..c27faed8 100644 --- a/docs/README.md +++ b/docs/README.md @@ -25,14 +25,7 @@ This directory contains documentation of the collectors in the windows_exporter, - [`msmq`](collector.msmq.md) - [`mssql`](collector.mssql.md) - [`net`](collector.net.md) -- [`netframework_clrexceptions`](collector.netframework_clrexceptions.md) -- [`netframework_clrinterop`](collector.netframework_clrinterop.md) -- [`netframework_clrjit`](collector.netframework_clrjit.md) -- [`netframework_clrloading`](collector.netframework_clrloading.md) -- [`netframework_clrlocksandthreads`](collector.netframework_clrlocksandthreads.md) -- [`netframework_clrmemory`](collector.netframework_clrmemory.md) -- [`netframework_clrremoting`](collector.netframework_clrremoting.md) -- [`netframework_clrsecurity`](collector.netframework_clrsecurity.md) +- [`netframework`](collector.netframework.md) - [`nps`](collector.nps.md) - [`os`](collector.os.md) - [`physical_disk`](collector.physical_disk.md) diff --git a/docs/collector.netframework.md b/docs/collector.netframework.md new file mode 100644 index 00000000..4ef4a368 --- /dev/null +++ b/docs/collector.netframework.md @@ -0,0 +1,113 @@ +# netframework collector + +The netframework collector exposes metrics about dotnet framework. + +| | | +|-------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **Metric name prefix** | `netframework_clrexceptions` | +| **Classes** | `Win32_PerfRawData_NETFramework_NETCLRExceptions`, `Win32_PerfRawData_NETFramework_NETCLRInterop`, `Win32_PerfRawData_NETFramework_NETCLRJit`, `Win32_PerfRawData_NETFramework_NETCLRLoading`, `Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads`, `Win32_PerfRawData_NETFramework_NETCLRMemory`, `Win32_PerfRawData_NETFramework_NETCLRRemoting`, `Win32_PerfRawData_NETFramework_NETCLRSecurity` | +| **Enabled by default?** | No | + +## Flags + +None + +## Metrics + +### CLR Exceptions + +| Name | Description | Type | Labels | +|-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrexceptions_exceptions_thrown_total` | Displays the total number of exceptions thrown since the application started. This includes both .NET exceptions and unmanaged exceptions that are converted into .NET exceptions. | counter | `process` | +| `windows_netframework_clrexceptions_exceptions_filters_total` | Displays the total number of .NET exception filters executed. An exception filter evaluates regardless of whether an exception is handled. | counter | `process` | +| `windows_netframework_clrexceptions_exceptions_finallys_total` | Displays the total number of finally blocks executed. Only the finally blocks executed for an exception are counted; finally blocks on normal code paths are not counted by this counter. | counter | `process` | +| `windows_netframework_clrexceptions_throw_to_catch_depth_total` | Displays the total number of stack frames traversed, from the frame that threw the exception to the frame that handled the exception. | counter | `process` | + +### CLR Interop + +| Name | Description | Type | Labels | +|---------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrinterop_com_callable_wrappers_total` | Displays the current number of COM callable wrappers (CCWs). A CCW is a proxy for a managed object being referenced from an unmanaged COM client. | counter | `process` | +| `windows_netframework_clrinterop_interop_marshalling_total` | Displays the total number of times arguments and return values have been marshaled from managed to unmanaged code, and vice versa, since the application started. | counter | `process` | +| `windows_netframework_clrinterop_interop_stubs_created_total` | Displays the current number of stubs created by the common language runtime. Stubs are responsible for marshaling arguments and return values from managed to unmanaged code, and vice versa, during a COM interop call or a platform invoke call. | counter | `process` | + +### CLR JIT + +| Name | Description | Type | Labels | +|-----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrjit_jit_methods_total` | Displays the total number of methods JIT-compiled since the application started. This counter does not include pre-JIT-compiled methods. | counter | `process` | +| `windows_netframework_clrjit_jit_time_percent` | Displays the percentage of time spent in JIT compilation. This counter is updated at the end of every JIT compilation phase. A JIT compilation phase occurs when a method and its dependencies are compiled. | gauge | `process` | +| `windows_netframework_clrjit_jit_standard_failures_total` | Displays the peak number of methods the JIT compiler has failed to compile since the application started. This failure can occur if the MSIL cannot be verified or if there is an internal error in the JIT compiler. | counter | `process` | +| `windows_netframework_clrjit_jit_il_bytes_total` | Displays the total number of Microsoft intermediate language (MSIL) bytes compiled by the just-in-time (JIT) compiler since the application started | counter | `process` | + +### CLR Loading + +| Name | Description | Type | Labels | +|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrloading_loader_heap_size_bytes` | Displays the current size, in bytes, of the memory committed by the class loader across all application domains. Committed memory is the physical space reserved in the disk paging file. | gauge | `process` | +| `windows_netframework_clrloading_appdomains_loaded_current` | Displays the current number of application domains loaded in this application. | gauge | `process` | +| `windows_netframework_clrloading_assemblies_loaded_current` | Displays the current number of assemblies loaded across all application domains in the currently running application. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once. | gauge | `process` | +| `windows_netframework_clrloading_classes_loaded_current` | Displays the current number of classes loaded in all assemblies. | gauge | `process` | +| `windows_netframework_clrloading_appdomains_loaded_total` | Displays the peak number of application domains loaded since the application started. | counter | `process` | +| `windows_netframework_clrloading_appdomains_unloaded_total` | Displays the total number of application domains unloaded since the application started. If an application domain is loaded and unloaded multiple times, this counter increments each time the application domain is unloaded. | counter | `process` | +| `windows_netframework_clrloading_assemblies_loaded_total` | Displays the total number of assemblies loaded since the application started. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once. | counter | `process` | +| `windows_netframework_clrloading_classes_loaded_total` | Displays the cumulative number of classes loaded in all assemblies since the application started. | counter | `process` | +| `windows_netframework_clrloading_class_load_failures_total` | Displays the peak number of classes that have failed to load since the application started. | counter | `process` | + +### CLR Locks and Threads + +| Name | Description | Type | Labels | +|----------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrlocksandthreads_current_queue_length` | Displays the total number of threads that are currently waiting to acquire a managed lock in the application. | gauge | `process` | +| `windows_netframework_clrlocksandthreads_current_logical_threads` | Displays the number of current managed thread objects in the application. This counter maintains the count of both running and stopped threads. | gauge | `process` | +| `windows_netframework_clrlocksandthreads_physical_threads_current` | Displays the number of native operating system threads created and owned by the common language runtime to act as underlying threads for managed thread objects. This counter's value does not include the threads used by the runtime in its internal operations; it is a subset of the threads in the operating system process. | gauge | `process` | +| `windows_netframework_clrlocksandthreads_recognized_threads_current` | Displays the number of threads that are currently recognized by the runtime. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once. | gauge | `process` | +| `windows_netframework_clrlocksandthreads_recognized_threads_total` | Displays the total number of threads that have been recognized by the runtime since the application started. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once. | counter | `process` | +| `windows_netframework_clrlocksandthreads_queue_length_total` | Displays the total number of threads that waited to acquire a managed lock since the application started. | counter | `process` | +| `windows_netframework_clrlocksandthreads_contentions_total` | Displays the total number of times that threads in the runtime have attempted to acquire a managed lock unsuccessfully. | counter | `process` | + +### CLR Memory + +| Name | Description | Type | Labels | +|----------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrmemory_allocated_bytes_total` | Displays the total number of bytes allocated on the garbage collection heap. | counter | `process` | +| `windows_netframework_clrmemory_finalization_survivors` | Displays the number of garbage-collected objects that survive a collection because they are waiting to be finalized. | gauge | `process` | +| `windows_netframework_clrmemory_heap_size_bytes` | Displays the maximum bytes that can be allocated; it does not indicate the current number of bytes allocated. | gauge | `process` | +| `windows_netframework_clrmemory_promoted_bytes` | Displays the bytes that were promoted from the generation to the next one during the last GC. Memory is promoted when it survives a garbage collection. | gauge | `process` | +| `windows_netframework_clrmemory_number_gc_handles` | Displays the current number of garbage collection handles in use. Garbage collection handles are handles to resources external to the common language runtime and the managed environment. | gauge | `process` | +| `windows_netframework_clrmemory_collections_total` | Displays the number of times the generation objects are garbage collected since the application started. | counter | `process` | +| `windows_netframework_clrmemory_induced_gc_total` | Displays the peak number of times garbage collection was performed because of an explicit call to GC.Collect. | counter | `process` | +| `windows_netframework_clrmemory_number_pinned_objects` | Displays the number of pinned objects encountered in the last garbage collection. | gauge | `process` | +| `windows_netframework_clrmemory_number_sink_blocksinuse` | Displays the current number of synchronization blocks in use. Synchronization blocks are per-object data structures allocated for storing synchronization information. They hold weak references to managed objects and must be scanned by the garbage collector. | gauge | `process` | +| `windows_netframework_clrmemory_committed_bytes` | Displays the amount of virtual memory, in bytes, currently committed by the garbage collector. Committed memory is the physical memory for which space has been reserved in the disk paging file. | gauge | `process` | +| `windows_netframework_clrmemory_reserved_bytes` | Displays the amount of virtual memory, in bytes, currently reserved by the garbage collector. Reserved memory is the virtual memory space reserved for the application when no disk or main memory pages have been used. | gauge | `process` | +| `windows_netframework_clrmemory_gc_time_percent` | Displays the percentage of time that was spent performing a garbage collection in the last sample. | gauge | `process` | + +### CLR Remoting + +| Name | Description | Type | Labels | +|-----------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrremoting_channels_total` | Displays the total number of remoting channels registered across all application domains since application started. | counter | `process` | +| `windows_netframework_clrremoting_context_bound_classes_loaded` | Displays the current number of context-bound classes that are loaded. | gauge | `process` | +| `windows_netframework_clrremoting_context_bound_objects_total` | Displays the total number of context-bound objects allocated. | counter | `process` | +| `windows_netframework_clrremoting_context_proxies_total` | Displays the total number of remoting proxy objects in this process since it started. | counter | `process` | +| `windows_netframework_clrremoting_contexts` | Displays the current number of remoting contexts in the application. | gauge | `process` | +| `windows_netframework_clrremoting_remote_calls_total` | Displays the total number of remote procedure calls invoked since the application started. | counter | `process` | + +### CLR Security + +| Name | Description | Type | Labels | +|-----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|---------|-----------| +| `windows_netframework_clrsecurity_link_time_checks_total` | Displays the total number of link-time code access security checks since the application started. | counter | `process` | +| `windows_netframework_clrsecurity_rt_checks_time_percent` | Displays the percentage of time spent performing runtime code access security checks in the last sample. | gauge | `process` | +| `windows_netframework_clrsecurity_stack_walk_depth` | Displays the depth of the stack during that last runtime code access security check. | gauge | `process` | +| `windows_netframework_clrsecurity_runtime_checks_total` | Displays the total number of runtime code access security checks performed since the application started. | counter | `process` | + +### Example metric +_This collector does not yet have explained examples, we would appreciate your help adding them!_ + +## Useful queries +_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ + +## Alerting examples +_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrexceptions.md b/docs/collector.netframework_clrexceptions.md deleted file mode 100644 index 8696cc7a..00000000 --- a/docs/collector.netframework_clrexceptions.md +++ /dev/null @@ -1,31 +0,0 @@ -# netframework_clrexceptions collector - -The netframework_clrexceptions collector exposes metrics about CLR exceptions in the dotnet framework. - -||| --|- -Metric name prefix | `netframework_clrexceptions` -Classes | `Win32_PerfRawData_NETFramework_NETCLRExceptions` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrexceptions_exceptions_thrown_total` | Displays the total number of exceptions thrown since the application started. This includes both .NET exceptions and unmanaged exceptions that are converted into .NET exceptions. | counter | `process` -`windows_netframework_clrexceptions_exceptions_filters_total` | Displays the total number of .NET exception filters executed. An exception filter evaluates regardless of whether an exception is handled. | counter | `process` -`windows_netframework_clrexceptions_exceptions_finallys_total` | Displays the total number of finally blocks executed. Only the finally blocks executed for an exception are counted; finally blocks on normal code paths are not counted by this counter. | counter | `process` -`windows_netframework_clrexceptions_throw_to_catch_depth_total` | Displays the total number of stack frames traversed, from the frame that threw the exception to the frame that handled the exception. | counter | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrinterop.md b/docs/collector.netframework_clrinterop.md deleted file mode 100644 index 0e54bcc2..00000000 --- a/docs/collector.netframework_clrinterop.md +++ /dev/null @@ -1,30 +0,0 @@ -# netframework_clrinterop collector - -The netframework_clrinterop collector exposes metrics about interop between the dotnet framework and outside components. - -||| --|- -Metric name prefix | `netframework_clrinterop` -Classes | `Win32_PerfRawData_NETFramework_NETCLRInterop` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrinterop_com_callable_wrappers_total` | Displays the current number of COM callable wrappers (CCWs). A CCW is a proxy for a managed object being referenced from an unmanaged COM client. | counter | `process` -`windows_netframework_clrinterop_interop_marshalling_total` | Displays the total number of times arguments and return values have been marshaled from managed to unmanaged code, and vice versa, since the application started. | counter | `process` -`windows_netframework_clrinterop_interop_stubs_created_total` | Displays the current number of stubs created by the common language runtime. Stubs are responsible for marshaling arguments and return values from managed to unmanaged code, and vice versa, during a COM interop call or a platform invoke call. | counter | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrjit.md b/docs/collector.netframework_clrjit.md deleted file mode 100644 index eeb06acb..00000000 --- a/docs/collector.netframework_clrjit.md +++ /dev/null @@ -1,31 +0,0 @@ -# netframework_clrjit collector - -The netframework_clrjit collector exposes metrics about the dotnet Just-in-Time compiler. - -||| --|- -Metric name prefix | `netframework_clrjit` -Classes | `Win32_PerfRawData_NETFramework_NETCLRJit` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrjit_jit_methods_total` | Displays the total number of methods JIT-compiled since the application started. This counter does not include pre-JIT-compiled methods. | counter | `process` -`windows_netframework_clrjit_jit_time_percent` | Displays the percentage of time spent in JIT compilation. This counter is updated at the end of every JIT compilation phase. A JIT compilation phase occurs when a method and its dependencies are compiled. | gauge | `process` -`windows_netframework_clrjit_jit_standard_failures_total` | Displays the peak number of methods the JIT compiler has failed to compile since the application started. This failure can occur if the MSIL cannot be verified or if there is an internal error in the JIT compiler. | counter | `process` -`windows_netframework_clrjit_jit_il_bytes_total` | Displays the total number of Microsoft intermediate language (MSIL) bytes compiled by the just-in-time (JIT) compiler since the application started | counter | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrloading.md b/docs/collector.netframework_clrloading.md deleted file mode 100644 index 412e0f71..00000000 --- a/docs/collector.netframework_clrloading.md +++ /dev/null @@ -1,36 +0,0 @@ -# netframework_clrloading collector - -The netframework_clrloading collector exposes metrics about the dotnet loader. - -||| --|- -Metric name prefix | `netframework_clrloading` -Classes | `Win32_PerfRawData_NETFramework_NETCLRLoading` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrloading_loader_heap_size_bytes` | Displays the current size, in bytes, of the memory committed by the class loader across all application domains. Committed memory is the physical space reserved in the disk paging file. | gauge | `process` -`windows_netframework_clrloading_appdomains_loaded_current` | Displays the current number of application domains loaded in this application. | gauge | `process` -`windows_netframework_clrloading_assemblies_loaded_current` | Displays the current number of assemblies loaded across all application domains in the currently running application. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once. | gauge | `process` -`windows_netframework_clrloading_classes_loaded_current` | Displays the current number of classes loaded in all assemblies. | gauge | `process` -`windows_netframework_clrloading_appdomains_loaded_total` | Displays the peak number of application domains loaded since the application started. | counter | `process` -`windows_netframework_clrloading_appdomains_unloaded_total` | Displays the total number of application domains unloaded since the application started. If an application domain is loaded and unloaded multiple times, this counter increments each time the application domain is unloaded. | counter | `process` -`windows_netframework_clrloading_assemblies_loaded_total` | Displays the total number of assemblies loaded since the application started. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once. | counter | `process` -`windows_netframework_clrloading_classes_loaded_total` | Displays the cumulative number of classes loaded in all assemblies since the application started. | counter | `process` -`windows_netframework_clrloading_class_load_failures_total` | Displays the peak number of classes that have failed to load since the application started. | counter | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrlocksandthreads.md b/docs/collector.netframework_clrlocksandthreads.md deleted file mode 100644 index 8a6ec553..00000000 --- a/docs/collector.netframework_clrlocksandthreads.md +++ /dev/null @@ -1,34 +0,0 @@ -# netframework_clrlocksandthreads collector - -The netframework_clrlocksandthreads collector exposes metrics about locks and threads in dotnet applications. - -||| --|- -Metric name prefix | `netframework_clrlocksandthreads` -Classes | `Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrlocksandthreads_current_queue_length` | Displays the total number of threads that are currently waiting to acquire a managed lock in the application. | gauge | `process` -`windows_netframework_clrlocksandthreads_current_logical_threads` | Displays the number of current managed thread objects in the application. This counter maintains the count of both running and stopped threads. | gauge | `process` -`windows_netframework_clrlocksandthreads_physical_threads_current` | Displays the number of native operating system threads created and owned by the common language runtime to act as underlying threads for managed thread objects. This counter's value does not include the threads used by the runtime in its internal operations; it is a subset of the threads in the operating system process. | gauge | `process` -`windows_netframework_clrlocksandthreads_recognized_threads_current` | Displays the number of threads that are currently recognized by the runtime. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once. | gauge | `process` -`windows_netframework_clrlocksandthreads_recognized_threads_total` | Displays the total number of threads that have been recognized by the runtime since the application started. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once. | counter | `process` -`windows_netframework_clrlocksandthreads_queue_length_total` | Displays the total number of threads that waited to acquire a managed lock since the application started. | counter | `process` -`windows_netframework_clrlocksandthreads_contentions_total` | Displays the total number of times that threads in the runtime have attempted to acquire a managed lock unsuccessfully. | counter | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrmemory.md b/docs/collector.netframework_clrmemory.md deleted file mode 100644 index daf85db0..00000000 --- a/docs/collector.netframework_clrmemory.md +++ /dev/null @@ -1,39 +0,0 @@ -# netframework_clrmemory collector - -The netframework_clrmemory collector exposes metrics about memory in dotnet applications. - -||| --|- -Metric name prefix | `netframework_clrmemory` -Classes | `Win32_PerfRawData_NETFramework_NETCLRMemory` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrmemory_allocated_bytes_total` | Displays the total number of bytes allocated on the garbage collection heap. | counter | `process` -`windows_netframework_clrmemory_finalization_survivors` | Displays the number of garbage-collected objects that survive a collection because they are waiting to be finalized. | gauge | `process` -`windows_netframework_clrmemory_heap_size_bytes` | Displays the maximum bytes that can be allocated; it does not indicate the current number of bytes allocated. | gauge | `process` -`windows_netframework_clrmemory_promoted_bytes` | Displays the bytes that were promoted from the generation to the next one during the last GC. Memory is promoted when it survives a garbage collection. | gauge | `process` -`windows_netframework_clrmemory_number_gc_handles` | Displays the current number of garbage collection handles in use. Garbage collection handles are handles to resources external to the common language runtime and the managed environment. | gauge | `process` -`windows_netframework_clrmemory_collections_total` | Displays the number of times the generation objects are garbage collected since the application started. | counter | `process` -`windows_netframework_clrmemory_induced_gc_total` | Displays the peak number of times garbage collection was performed because of an explicit call to GC.Collect. | counter | `process` -`windows_netframework_clrmemory_number_pinned_objects` | Displays the number of pinned objects encountered in the last garbage collection. | gauge | `process` -`windows_netframework_clrmemory_number_sink_blocksinuse` | Displays the current number of synchronization blocks in use. Synchronization blocks are per-object data structures allocated for storing synchronization information. They hold weak references to managed objects and must be scanned by the garbage collector. | gauge | `process` -`windows_netframework_clrmemory_committed_bytes` | Displays the amount of virtual memory, in bytes, currently committed by the garbage collector. Committed memory is the physical memory for which space has been reserved in the disk paging file. | gauge | `process` -`windows_netframework_clrmemory_reserved_bytes` | Displays the amount of virtual memory, in bytes, currently reserved by the garbage collector. Reserved memory is the virtual memory space reserved for the application when no disk or main memory pages have been used. | gauge | `process` -`windows_netframework_clrmemory_gc_time_percent` | Displays the percentage of time that was spent performing a garbage collection in the last sample. | gauge | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrremoting.md b/docs/collector.netframework_clrremoting.md deleted file mode 100644 index 0051deb5..00000000 --- a/docs/collector.netframework_clrremoting.md +++ /dev/null @@ -1,33 +0,0 @@ -# netframework_clrremoting collector - -The netframework_clrremoting collector exposes metrics about dotnet remoting. - -||| --|- -Metric name prefix | `netframework_clrremoting` -Classes | `Win32_PerfRawData_NETFramework_NETCLRRemoting` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrremoting_channels_total` | Displays the total number of remoting channels registered across all application domains since application started. | counter | `process` -`windows_netframework_clrremoting_context_bound_classes_loaded` | Displays the current number of context-bound classes that are loaded. | gauge | `process` -`windows_netframework_clrremoting_context_bound_objects_total` | Displays the total number of context-bound objects allocated. | counter | `process` -`windows_netframework_clrremoting_context_proxies_total` | Displays the total number of remoting proxy objects in this process since it started. | counter | `process` -`windows_netframework_clrremoting_contexts` | Displays the current number of remoting contexts in the application. | gauge | `process` -`windows_netframework_clrremoting_remote_calls_total` | Displays the total number of remote procedure calls invoked since the application started. | counter | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/docs/collector.netframework_clrsecurity.md b/docs/collector.netframework_clrsecurity.md deleted file mode 100644 index 44741652..00000000 --- a/docs/collector.netframework_clrsecurity.md +++ /dev/null @@ -1,31 +0,0 @@ -# netframework_clrsecurity collector - -The netframework_clrsecurity collector exposes metrics about security checks in dotnet applications - -||| --|- -Metric name prefix | `netframework_clrsecurity` -Classes | `Win32_PerfRawData_NETFramework_NETCLRSecurity` -Enabled by default? | No - -## Flags - -None - -## Metrics - -Name | Description | Type | Labels ------|-------------|------|------- -`windows_netframework_clrsecurity_link_time_checks_total` | Displays the total number of link-time code access security checks since the application started. | counter | `process` -`windows_netframework_clrsecurity_rt_checks_time_percent` | Displays the percentage of time spent performing runtime code access security checks in the last sample. | gauge | `process` -`windows_netframework_clrsecurity_stack_walk_depth` | Displays the depth of the stack during that last runtime code access security check. | gauge | `process` -`windows_netframework_clrsecurity_runtime_checks_total` | Displays the total number of runtime code access security checks performed since the application started. | counter | `process` - -### Example metric -_This collector does not yet have explained examples, we would appreciate your help adding them!_ - -## Useful queries -_This collector does not yet have any useful queries added, we would appreciate your help adding them!_ - -## Alerting examples -_This collector does not yet have alerting examples, we would appreciate your help adding them!_ diff --git a/pkg/collector/collector.go b/pkg/collector/collector.go index 88cb7356..6eb6121f 100644 --- a/pkg/collector/collector.go +++ b/pkg/collector/collector.go @@ -34,14 +34,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" @@ -108,14 +101,7 @@ func NewWithConfig(config Config) *MetricCollectors { collectors[msmq.Name] = msmq.New(&config.Msmq) collectors[mssql.Name] = mssql.New(&config.Mssql) collectors[net.Name] = net.New(&config.Net) - collectors[netframework_clrexceptions.Name] = netframework_clrexceptions.New(&config.NetframeworkClrexceptions) - collectors[netframework_clrinterop.Name] = netframework_clrinterop.New(&config.NetframeworkClrinterop) - collectors[netframework_clrjit.Name] = netframework_clrjit.New(&config.NetframeworkClrjit) - collectors[netframework_clrloading.Name] = netframework_clrloading.New(&config.NetframeworkClrloading) - collectors[netframework_clrlocksandthreads.Name] = netframework_clrlocksandthreads.New(&config.NetframeworkClrlocksandthreads) - collectors[netframework_clrmemory.Name] = netframework_clrmemory.New(&config.NetframeworkClrmemory) - collectors[netframework_clrremoting.Name] = netframework_clrremoting.New(&config.NetframeworkClrremoting) - collectors[netframework_clrsecurity.Name] = netframework_clrsecurity.New(&config.NetframeworkClrsecurity) + collectors[netframework.Name] = netframework.New(&config.NetFramework) collectors[nps.Name] = nps.New(&config.Nps) collectors[os.Name] = os.New(&config.Os) collectors[perfdata.Name] = perfdata.New(&config.PerfData) diff --git a/pkg/collector/config.go b/pkg/collector/config.go index 239f178d..54337815 100644 --- a/pkg/collector/config.go +++ b/pkg/collector/config.go @@ -25,14 +25,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" @@ -57,116 +50,102 @@ import ( ) type Config struct { - AD ad.Config `yaml:"ad"` - ADCS adcs.Config `yaml:"adcs"` - ADFS adfs.Config `yaml:"adfs"` - Cache cache.Config `yaml:"cache"` - Container container.Config `yaml:"container"` - CPU cpu.Config `yaml:"cpu"` - CPUInfo cpu_info.Config `yaml:"cpu_info"` - Cs cs.Config `yaml:"cs"` - DFSR dfsr.Config `yaml:"dfsr"` - Dhcp dhcp.Config `yaml:"dhcp"` - DiskDrive diskdrive.Config `yaml:"diskdrive"` //nolint:tagliatelle - DNS dns.Config `yaml:"dns"` - Exchange exchange.Config `yaml:"exchange"` - Fsrmquota fsrmquota.Config `yaml:"fsrmquota"` - Hyperv hyperv.Config `yaml:"hyperv"` - IIS iis.Config `yaml:"iis"` - License license.Config `yaml:"license"` - LogicalDisk logical_disk.Config `yaml:"logical_disk"` - Logon logon.Config `yaml:"logon"` - Memory memory.Config `yaml:"memory"` - Mscluster mscluster.Config `yaml:"mscluster"` - Msmq msmq.Config `yaml:"msmq"` - Mssql mssql.Config `yaml:"mssql"` - Net net.Config `yaml:"net"` - NetframeworkClrexceptions netframework_clrexceptions.Config `yaml:"netframework_clrexceptions"` - NetframeworkClrinterop netframework_clrinterop.Config `yaml:"netframework_clrinterop"` - NetframeworkClrjit netframework_clrjit.Config `yaml:"netframework_clrjit"` - NetframeworkClrloading netframework_clrloading.Config `yaml:"netframework_clrloading"` - NetframeworkClrlocksandthreads netframework_clrlocksandthreads.Config `yaml:"netframework_clrlocksandthreads"` - NetframeworkClrmemory netframework_clrmemory.Config `yaml:"netframework_clrmemory"` - NetframeworkClrremoting netframework_clrremoting.Config `yaml:"netframework_clrremoting"` - NetframeworkClrsecurity netframework_clrsecurity.Config `yaml:"netframework_clrsecurity"` - Nps nps.Config `yaml:"nps"` - Os os.Config `yaml:"os"` - PerfData perfdata.Config `yaml:"perf_data"` - PhysicalDisk physical_disk.Config `yaml:"physical_disk"` - Printer printer.Config `yaml:"printer"` - Process process.Config `yaml:"process"` - RemoteFx remote_fx.Config `yaml:"remote_fx"` - ScheduledTask scheduled_task.Config `yaml:"scheduled_task"` - Service service.Config `yaml:"service"` - SMB smb.Config `yaml:"smb"` - SMBClient smbclient.Config `yaml:"smbclient"` //nolint:tagliatelle - SMTP smtp.Config `yaml:"smtp"` - System system.Config `yaml:"system"` - TeradiciPcoip teradici_pcoip.Config `yaml:"teradici_pcoip"` - TCP tcp.Config `yaml:"tcp"` - TerminalServices terminal_services.Config `yaml:"terminal_services"` - Textfile textfile.Config `yaml:"textfile"` - Thermalzone thermalzone.Config `yaml:"thermalzone"` - Time time.Config `yaml:"time"` - Vmware vmware.Config `yaml:"vmware"` - VmwareBlast vmware_blast.Config `yaml:"vmware_blast"` + AD ad.Config `yaml:"ad"` + ADCS adcs.Config `yaml:"adcs"` + ADFS adfs.Config `yaml:"adfs"` + Cache cache.Config `yaml:"cache"` + Container container.Config `yaml:"container"` + CPU cpu.Config `yaml:"cpu"` + CPUInfo cpu_info.Config `yaml:"cpu_info"` + Cs cs.Config `yaml:"cs"` + DFSR dfsr.Config `yaml:"dfsr"` + Dhcp dhcp.Config `yaml:"dhcp"` + DiskDrive diskdrive.Config `yaml:"diskdrive"` //nolint:tagliatelle + DNS dns.Config `yaml:"dns"` + Exchange exchange.Config `yaml:"exchange"` + Fsrmquota fsrmquota.Config `yaml:"fsrmquota"` + Hyperv hyperv.Config `yaml:"hyperv"` + IIS iis.Config `yaml:"iis"` + License license.Config `yaml:"license"` + LogicalDisk logical_disk.Config `yaml:"logical_disk"` + Logon logon.Config `yaml:"logon"` + Memory memory.Config `yaml:"memory"` + Mscluster mscluster.Config `yaml:"mscluster"` + Msmq msmq.Config `yaml:"msmq"` + Mssql mssql.Config `yaml:"mssql"` + Net net.Config `yaml:"net"` + NetFramework netframework.Config `yaml:"net_framework"` + Nps nps.Config `yaml:"nps"` + Os os.Config `yaml:"os"` + PerfData perfdata.Config `yaml:"perf_data"` + PhysicalDisk physical_disk.Config `yaml:"physical_disk"` + Printer printer.Config `yaml:"printer"` + Process process.Config `yaml:"process"` + RemoteFx remote_fx.Config `yaml:"remote_fx"` + ScheduledTask scheduled_task.Config `yaml:"scheduled_task"` + Service service.Config `yaml:"service"` + SMB smb.Config `yaml:"smb"` + SMBClient smbclient.Config `yaml:"smbclient"` //nolint:tagliatelle + SMTP smtp.Config `yaml:"smtp"` + System system.Config `yaml:"system"` + TeradiciPcoip teradici_pcoip.Config `yaml:"teradici_pcoip"` + TCP tcp.Config `yaml:"tcp"` + TerminalServices terminal_services.Config `yaml:"terminal_services"` + Textfile textfile.Config `yaml:"textfile"` + Thermalzone thermalzone.Config `yaml:"thermalzone"` + Time time.Config `yaml:"time"` + Vmware vmware.Config `yaml:"vmware"` + VmwareBlast vmware_blast.Config `yaml:"vmware_blast"` } // ConfigDefaults Is an interface to be used by the external libraries. It holds all ConfigDefaults form all collectors // //goland:noinspection GoUnusedGlobalVariable var ConfigDefaults = Config{ - AD: ad.ConfigDefaults, - ADCS: adcs.ConfigDefaults, - ADFS: adfs.ConfigDefaults, - Cache: cache.ConfigDefaults, - Container: container.ConfigDefaults, - CPU: cpu.ConfigDefaults, - CPUInfo: cpu_info.ConfigDefaults, - Cs: cs.ConfigDefaults, - DFSR: dfsr.ConfigDefaults, - Dhcp: dhcp.ConfigDefaults, - DiskDrive: diskdrive.ConfigDefaults, - DNS: dns.ConfigDefaults, - Exchange: exchange.ConfigDefaults, - Fsrmquota: fsrmquota.ConfigDefaults, - Hyperv: hyperv.ConfigDefaults, - IIS: iis.ConfigDefaults, - License: license.ConfigDefaults, - LogicalDisk: logical_disk.ConfigDefaults, - Logon: logon.ConfigDefaults, - Memory: memory.ConfigDefaults, - Mscluster: mscluster.ConfigDefaults, - Msmq: msmq.ConfigDefaults, - Mssql: mssql.ConfigDefaults, - Net: net.ConfigDefaults, - NetframeworkClrexceptions: netframework_clrexceptions.ConfigDefaults, - NetframeworkClrinterop: netframework_clrinterop.ConfigDefaults, - NetframeworkClrjit: netframework_clrjit.ConfigDefaults, - NetframeworkClrloading: netframework_clrloading.ConfigDefaults, - NetframeworkClrlocksandthreads: netframework_clrlocksandthreads.ConfigDefaults, - NetframeworkClrmemory: netframework_clrmemory.ConfigDefaults, - NetframeworkClrremoting: netframework_clrremoting.ConfigDefaults, - NetframeworkClrsecurity: netframework_clrsecurity.ConfigDefaults, - Nps: nps.ConfigDefaults, - Os: os.ConfigDefaults, - PerfData: perfdata.ConfigDefaults, - PhysicalDisk: physical_disk.ConfigDefaults, - Printer: printer.ConfigDefaults, - Process: process.ConfigDefaults, - RemoteFx: remote_fx.ConfigDefaults, - ScheduledTask: scheduled_task.ConfigDefaults, - Service: service.ConfigDefaults, - SMB: smb.ConfigDefaults, - SMBClient: smbclient.ConfigDefaults, - SMTP: smtp.ConfigDefaults, - System: system.ConfigDefaults, - TeradiciPcoip: teradici_pcoip.ConfigDefaults, - TCP: tcp.ConfigDefaults, - TerminalServices: terminal_services.ConfigDefaults, - Textfile: textfile.ConfigDefaults, - Thermalzone: thermalzone.ConfigDefaults, - Time: time.ConfigDefaults, - Vmware: vmware.ConfigDefaults, - VmwareBlast: vmware_blast.ConfigDefaults, + AD: ad.ConfigDefaults, + ADCS: adcs.ConfigDefaults, + ADFS: adfs.ConfigDefaults, + Cache: cache.ConfigDefaults, + Container: container.ConfigDefaults, + CPU: cpu.ConfigDefaults, + CPUInfo: cpu_info.ConfigDefaults, + Cs: cs.ConfigDefaults, + DFSR: dfsr.ConfigDefaults, + Dhcp: dhcp.ConfigDefaults, + DiskDrive: diskdrive.ConfigDefaults, + DNS: dns.ConfigDefaults, + Exchange: exchange.ConfigDefaults, + Fsrmquota: fsrmquota.ConfigDefaults, + Hyperv: hyperv.ConfigDefaults, + IIS: iis.ConfigDefaults, + License: license.ConfigDefaults, + LogicalDisk: logical_disk.ConfigDefaults, + Logon: logon.ConfigDefaults, + Memory: memory.ConfigDefaults, + Mscluster: mscluster.ConfigDefaults, + Msmq: msmq.ConfigDefaults, + Mssql: mssql.ConfigDefaults, + Net: net.ConfigDefaults, + NetFramework: netframework.ConfigDefaults, + Nps: nps.ConfigDefaults, + Os: os.ConfigDefaults, + PerfData: perfdata.ConfigDefaults, + PhysicalDisk: physical_disk.ConfigDefaults, + Printer: printer.ConfigDefaults, + Process: process.ConfigDefaults, + RemoteFx: remote_fx.ConfigDefaults, + ScheduledTask: scheduled_task.ConfigDefaults, + Service: service.ConfigDefaults, + SMB: smb.ConfigDefaults, + SMBClient: smbclient.ConfigDefaults, + SMTP: smtp.ConfigDefaults, + System: system.ConfigDefaults, + TeradiciPcoip: teradici_pcoip.ConfigDefaults, + TCP: tcp.ConfigDefaults, + TerminalServices: terminal_services.ConfigDefaults, + Textfile: textfile.ConfigDefaults, + Thermalzone: thermalzone.ConfigDefaults, + Time: time.ConfigDefaults, + Vmware: vmware.ConfigDefaults, + VmwareBlast: vmware_blast.ConfigDefaults, } diff --git a/pkg/collector/map.go b/pkg/collector/map.go index 8635ffa3..72f208e1 100644 --- 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 { diff --git a/pkg/collector/mscluster/mscluster.go b/pkg/collector/mscluster/mscluster.go index 69eedab7..f0966ca7 100644 --- a/pkg/collector/mscluster/mscluster.go +++ b/pkg/collector/mscluster/mscluster.go @@ -298,9 +298,5 @@ func (c *Collector) Collect(_ *types.ScrapeContext, _ *slog.Logger, ch chan<- pr } } - if len(errs) > 0 { - return errors.Join(errs...) - } - - return nil + return errors.Join(errs...) } diff --git a/pkg/collector/netframework/netframework.go b/pkg/collector/netframework/netframework.go new file mode 100644 index 00000000..4b5ca7b5 --- /dev/null +++ b/pkg/collector/netframework/netframework.go @@ -0,0 +1,245 @@ +//go:build windows + +package netframework + +import ( + "errors" + "fmt" + "log/slog" + "slices" + + "github.com/alecthomas/kingpin/v2" + "github.com/prometheus-community/windows_exporter/pkg/types" + "github.com/prometheus/client_golang/prometheus" + "github.com/yusufpapurcu/wmi" +) + +const Name = "netframework" + +type Config struct { + CollectorsEnabled []string `yaml:"collectors_enabled"` +} + +var ConfigDefaults = Config{ + CollectorsEnabled: []string{ + collectorClrExceptions, + collectorClrInterop, + collectorClrJIT, + collectorClrLoading, + collectorClrLocksAndThreads, + collectorClrMemory, + collectorClrRemoting, + collectorClrSecurity, + }, +} + +const ( + collectorClrExceptions = "clrexceptions" + collectorClrInterop = "clrinterop" + collectorClrJIT = "clrjit" + collectorClrLoading = "clrloading" + collectorClrLocksAndThreads = "clrlocksandthreads" + collectorClrMemory = "clrmemory" + collectorClrRemoting = "clrremoting" + collectorClrSecurity = "clrsecurity" +) + +// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRExceptions metrics. +type Collector struct { + config Config + wmiClient *wmi.Client + + // clrexceptions + numberOfExceptionsThrown *prometheus.Desc + numberOfFilters *prometheus.Desc + numberOfFinally *prometheus.Desc + throwToCatchDepth *prometheus.Desc + + // clrinterop + numberOfCCWs *prometheus.Desc + numberOfMarshalling *prometheus.Desc + numberOfStubs *prometheus.Desc + + // clrjit + numberOfMethodsJitted *prometheus.Desc + timeInJit *prometheus.Desc + standardJitFailures *prometheus.Desc + totalNumberOfILBytesJitted *prometheus.Desc + + // clrloading + bytesInLoaderHeap *prometheus.Desc + currentAppDomains *prometheus.Desc + currentAssemblies *prometheus.Desc + currentClassesLoaded *prometheus.Desc + totalAppDomains *prometheus.Desc + totalAppDomainsUnloaded *prometheus.Desc + totalAssemblies *prometheus.Desc + totalClassesLoaded *prometheus.Desc + totalNumberOfLoadFailures *prometheus.Desc + + // clrlocksandthreads + currentQueueLength *prometheus.Desc + numberOfCurrentLogicalThreads *prometheus.Desc + numberOfCurrentPhysicalThreads *prometheus.Desc + numberOfCurrentRecognizedThreads *prometheus.Desc + numberOfTotalRecognizedThreads *prometheus.Desc + queueLengthPeak *prometheus.Desc + totalNumberOfContentions *prometheus.Desc + + // clrmemory + allocatedBytes *prometheus.Desc + finalizationSurvivors *prometheus.Desc + heapSize *prometheus.Desc + promotedBytes *prometheus.Desc + numberGCHandles *prometheus.Desc + numberCollections *prometheus.Desc + numberInducedGC *prometheus.Desc + numberOfPinnedObjects *prometheus.Desc + numberOfSinkBlocksInUse *prometheus.Desc + numberTotalCommittedBytes *prometheus.Desc + numberTotalReservedBytes *prometheus.Desc + timeInGC *prometheus.Desc + + // clrremoting + channels *prometheus.Desc + contextBoundClassesLoaded *prometheus.Desc + contextBoundObjects *prometheus.Desc + contextProxies *prometheus.Desc + contexts *prometheus.Desc + totalRemoteCalls *prometheus.Desc + + // clrsecurity + numberLinkTimeChecks *prometheus.Desc + timeInRTChecks *prometheus.Desc + stackWalkDepth *prometheus.Desc + totalRuntimeChecks *prometheus.Desc +} + +func New(config *Config) *Collector { + if config == nil { + config = &ConfigDefaults + } + + c := &Collector{ + config: *config, + } + + return c +} + +func NewWithFlags(_ *kingpin.Application) *Collector { + return &Collector{} +} + +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 { + return nil +} + +func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { + if wmiClient == nil || wmiClient.SWbemServicesClient == nil { + return errors.New("wmiClient or SWbemServicesClient is nil") + } + + c.wmiClient = wmiClient + + if slices.Contains(c.config.CollectorsEnabled, collectorClrExceptions) { + c.buildClrExceptions() + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrInterop) { + c.buildClrInterop() + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrJIT) { + c.buildClrJIT() + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrLoading) { + c.buildClrLoading() + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrLocksAndThreads) { + c.buildClrLocksAndThreads() + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrMemory) { + c.buildClrMemory() + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrRemoting) { + c.buildClrRemoting() + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrSecurity) { + c.buildClrSecurity() + } + + return nil +} + +// 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 { + var ( + err error + errs []error + ) + + if slices.Contains(c.config.CollectorsEnabled, collectorClrExceptions) { + if err = c.collectClrExceptions(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrExceptions, err)) + } + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrInterop) { + if err = c.collectClrInterop(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrInterop, err)) + } + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrJIT) { + if err = c.collectClrJIT(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrJIT, err)) + } + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrLoading) { + if err = c.collectClrLoading(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrLoading, err)) + } + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrLocksAndThreads) { + if err = c.collectClrLocksAndThreads(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrLocksAndThreads, err)) + } + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrMemory) { + if err = c.collectClrMemory(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrMemory, err)) + } + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrRemoting) { + if err = c.collectClrRemoting(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrRemoting, err)) + } + } + + if slices.Contains(c.config.CollectorsEnabled, collectorClrSecurity) { + if err = c.collectClrSecurity(ch); err != nil { + errs = append(errs, fmt.Errorf("failed to collect %s metrics: %w", collectorClrSecurity, err)) + } + } + + return errors.Join(errs...) +} diff --git a/pkg/collector/netframework_clrexceptions/netframework_clrexceptions.go b/pkg/collector/netframework/netframework_clrexceptions.go similarity index 59% rename from pkg/collector/netframework_clrexceptions/netframework_clrexceptions.go rename to pkg/collector/netframework/netframework_clrexceptions.go index 51575320..d096450c 100644 --- a/pkg/collector/netframework_clrexceptions/netframework_clrexceptions.go +++ b/pkg/collector/netframework/netframework_clrexceptions.go @@ -1,68 +1,13 @@ //go:build windows -package netframework_clrexceptions +package netframework import ( - "errors" - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrexceptions" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRExceptions metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - numberOfExceptionsThrown *prometheus.Desc - numberOfFilters *prometheus.Desc - numberOfFinally *prometheus.Desc - throwToCatchDepth *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { - if wmiClient == nil || wmiClient.SWbemServicesClient == nil { - return errors.New("wmiClient or SWbemServicesClient is nil") - } - - c.wmiClient = wmiClient +func (c *Collector) buildClrExceptions() { c.numberOfExceptionsThrown = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "exceptions_thrown_total"), "Displays the total number of exceptions thrown since the application started. This includes both .NET exceptions and unmanaged exceptions that are converted into .NET exceptions.", @@ -87,23 +32,6 @@ func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrexceptions metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRExceptions struct { @@ -116,7 +44,7 @@ type Win32_PerfRawData_NETFramework_NETCLRExceptions struct { ThrowToCatchDepthPersec uint32 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrExceptions(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRExceptions if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRExceptions", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrinterop/netframework_clrinterop.go b/pkg/collector/netframework/netframework_clrinterop.go similarity index 55% rename from pkg/collector/netframework_clrinterop/netframework_clrinterop.go rename to pkg/collector/netframework/netframework_clrinterop.go index 0e049f24..6fe15754 100644 --- a/pkg/collector/netframework_clrinterop/netframework_clrinterop.go +++ b/pkg/collector/netframework/netframework_clrinterop.go @@ -1,67 +1,13 @@ //go:build windows -package netframework_clrinterop +package netframework import ( - "errors" - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrinterop" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRInterop metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - numberOfCCWs *prometheus.Desc - numberOfMarshalling *prometheus.Desc - numberOfStubs *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { - if wmiClient == nil || wmiClient.SWbemServicesClient == nil { - return errors.New("wmiClient or SWbemServicesClient is nil") - } - - c.wmiClient = wmiClient +func (c *Collector) buildClrInterop() { c.numberOfCCWs = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "com_callable_wrappers_total"), "Displays the current number of COM callable wrappers (CCWs). A CCW is a proxy for a managed object being referenced from an unmanaged COM client.", @@ -80,23 +26,6 @@ func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrinterop metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRInterop struct { @@ -109,7 +38,7 @@ type Win32_PerfRawData_NETFramework_NETCLRInterop struct { NumberofTLBimportsPersec uint32 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrInterop(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRInterop if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRInterop", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrjit/netframework_clrjit.go b/pkg/collector/netframework/netframework_clrjit.go similarity index 63% rename from pkg/collector/netframework_clrjit/netframework_clrjit.go rename to pkg/collector/netframework/netframework_clrjit.go index 6d92670e..f781d6ad 100644 --- a/pkg/collector/netframework_clrjit/netframework_clrjit.go +++ b/pkg/collector/netframework/netframework_clrjit.go @@ -1,62 +1,13 @@ //go:build windows -package netframework_clrjit +package netframework import ( - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrjit" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRJit metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - numberOfMethodsJitted *prometheus.Desc - timeInJit *prometheus.Desc - standardJitFailures *prometheus.Desc - totalNumberOfILBytesJitted *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, _ *wmi.Client) error { +func (c *Collector) buildClrJIT() { c.numberOfMethodsJitted = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "jit_methods_total"), "Displays the total number of methods JIT-compiled since the application started. This counter does not include pre-JIT-compiled methods.", @@ -81,23 +32,6 @@ func (c *Collector) Build(_ *slog.Logger, _ *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrjit metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRJit struct { @@ -112,7 +46,7 @@ type Win32_PerfRawData_NETFramework_NETCLRJit struct { TotalNumberofILBytesJitted uint32 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrJIT(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRJit if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRJit", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrloading/netframework_clrloading.go b/pkg/collector/netframework/netframework_clrloading.go similarity index 72% rename from pkg/collector/netframework_clrloading/netframework_clrloading.go rename to pkg/collector/netframework/netframework_clrloading.go index 2ee2a9b6..4019d086 100644 --- a/pkg/collector/netframework_clrloading/netframework_clrloading.go +++ b/pkg/collector/netframework/netframework_clrloading.go @@ -1,74 +1,13 @@ //go:build windows -package netframework_clrloading +package netframework import ( - "errors" - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrloading" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRLoading metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - bytesInLoaderHeap *prometheus.Desc - currentAppDomains *prometheus.Desc - currentAssemblies *prometheus.Desc - currentClassesLoaded *prometheus.Desc - totalAppDomains *prometheus.Desc - totalAppDomainsUnloaded *prometheus.Desc - totalAssemblies *prometheus.Desc - totalClassesLoaded *prometheus.Desc - totalNumberOfLoadFailures *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { - if wmiClient == nil || wmiClient.SWbemServicesClient == nil { - return errors.New("wmiClient or SWbemServicesClient is nil") - } - - c.wmiClient = wmiClient - +func (c *Collector) buildClrLoading() { c.bytesInLoaderHeap = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "loader_heap_size_bytes"), "Displays the current size, in bytes, of the memory committed by the class loader across all application domains. Committed memory is the physical space reserved in the disk paging file.", @@ -123,23 +62,6 @@ func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrloading metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRLoading struct { @@ -163,7 +85,7 @@ type Win32_PerfRawData_NETFramework_NETCLRLoading struct { TotalNumberofLoadFailures uint32 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrLoading(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRLoading if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRLoading", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrlocksandthreads/netframework_clrlocksandthreads.go b/pkg/collector/netframework/netframework_clrlocksandthreads.go similarity index 69% rename from pkg/collector/netframework_clrlocksandthreads/netframework_clrlocksandthreads.go rename to pkg/collector/netframework/netframework_clrlocksandthreads.go index c12ed09f..3c20504d 100644 --- a/pkg/collector/netframework_clrlocksandthreads/netframework_clrlocksandthreads.go +++ b/pkg/collector/netframework/netframework_clrlocksandthreads.go @@ -1,72 +1,13 @@ //go:build windows -package netframework_clrlocksandthreads +package netframework import ( - "errors" - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrlocksandthreads" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - currentQueueLength *prometheus.Desc - numberOfCurrentLogicalThreads *prometheus.Desc - numberOfCurrentPhysicalThreads *prometheus.Desc - numberOfCurrentRecognizedThreads *prometheus.Desc - numberOfTotalRecognizedThreads *prometheus.Desc - queueLengthPeak *prometheus.Desc - totalNumberOfContentions *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { - if wmiClient == nil || wmiClient.SWbemServicesClient == nil { - return errors.New("wmiClient or SWbemServicesClient is nil") - } - - c.wmiClient = wmiClient - +func (c *Collector) buildClrLocksAndThreads() { c.currentQueueLength = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "current_queue_length"), "Displays the total number of threads that are currently waiting to acquire a managed lock in the application.", @@ -109,23 +50,6 @@ func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrlocksandthreads metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads struct { @@ -143,7 +67,7 @@ type Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads struct { TotalNumberofContentions uint32 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrLocksAndThreads(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrmemory/netframework_clrmemory.go b/pkg/collector/netframework/netframework_clrmemory.go similarity index 79% rename from pkg/collector/netframework_clrmemory/netframework_clrmemory.go rename to pkg/collector/netframework/netframework_clrmemory.go index d5ddf8c1..ffaf066c 100644 --- a/pkg/collector/netframework_clrmemory/netframework_clrmemory.go +++ b/pkg/collector/netframework/netframework_clrmemory.go @@ -1,77 +1,13 @@ //go:build windows -package netframework_clrmemory +package netframework import ( - "errors" - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrmemory" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRMemory metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - allocatedBytes *prometheus.Desc - finalizationSurvivors *prometheus.Desc - heapSize *prometheus.Desc - promotedBytes *prometheus.Desc - numberGCHandles *prometheus.Desc - numberCollections *prometheus.Desc - numberInducedGC *prometheus.Desc - numberOfPinnedObjects *prometheus.Desc - numberOfSinkBlocksInUse *prometheus.Desc - numberTotalCommittedBytes *prometheus.Desc - numberTotalReservedBytes *prometheus.Desc - timeInGC *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { - if wmiClient == nil || wmiClient.SWbemServicesClient == nil { - return errors.New("wmiClient or SWbemServicesClient is nil") - } - - c.wmiClient = wmiClient - +func (c *Collector) buildClrMemory() { c.allocatedBytes = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "allocated_bytes_total"), "Displays the total number of bytes allocated on the garbage collection heap.", @@ -144,23 +80,6 @@ func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrmemory metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRMemory struct { @@ -197,7 +116,7 @@ type Win32_PerfRawData_NETFramework_NETCLRMemory struct { PromotedMemoryfromGen1 uint64 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrMemory(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRMemory if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRMemory", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrremoting/netframework_clrremoting.go b/pkg/collector/netframework/netframework_clrremoting.go similarity index 62% rename from pkg/collector/netframework_clrremoting/netframework_clrremoting.go rename to pkg/collector/netframework/netframework_clrremoting.go index 13eb0089..0322f9fe 100644 --- a/pkg/collector/netframework_clrremoting/netframework_clrremoting.go +++ b/pkg/collector/netframework/netframework_clrremoting.go @@ -1,71 +1,13 @@ //go:build windows -package netframework_clrremoting +package netframework import ( - "errors" - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrremoting" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRRemoting metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - channels *prometheus.Desc - contextBoundClassesLoaded *prometheus.Desc - contextBoundObjects *prometheus.Desc - contextProxies *prometheus.Desc - contexts *prometheus.Desc - totalRemoteCalls *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { - if wmiClient == nil || wmiClient.SWbemServicesClient == nil { - return errors.New("wmiClient or SWbemServicesClient is nil") - } - - c.wmiClient = wmiClient - +func (c *Collector) buildClrRemoting() { c.channels = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "channels_total"), "Displays the total number of remoting channels registered across all application domains since application started.", @@ -102,23 +44,6 @@ func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrremoting metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRRemoting struct { @@ -133,7 +58,7 @@ type Win32_PerfRawData_NETFramework_NETCLRRemoting struct { TotalRemoteCalls uint32 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrRemoting(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRRemoting if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRRemoting", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrsecurity/netframework_clrsecurity.go b/pkg/collector/netframework/netframework_clrsecurity.go similarity index 57% rename from pkg/collector/netframework_clrsecurity/netframework_clrsecurity.go rename to pkg/collector/netframework/netframework_clrsecurity.go index 24f1ab23..370b84f6 100644 --- a/pkg/collector/netframework_clrsecurity/netframework_clrsecurity.go +++ b/pkg/collector/netframework/netframework_clrsecurity.go @@ -1,68 +1,13 @@ //go:build windows -package netframework_clrsecurity +package netframework import ( - "errors" - "log/slog" - - "github.com/alecthomas/kingpin/v2" "github.com/prometheus-community/windows_exporter/pkg/types" "github.com/prometheus/client_golang/prometheus" - "github.com/yusufpapurcu/wmi" ) -const Name = "netframework_clrsecurity" - -type Config struct{} - -var ConfigDefaults = Config{} - -// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRSecurity metrics. -type Collector struct { - config Config - wmiClient *wmi.Client - - numberLinkTimeChecks *prometheus.Desc - timeInRTChecks *prometheus.Desc - stackWalkDepth *prometheus.Desc - totalRuntimeChecks *prometheus.Desc -} - -func New(config *Config) *Collector { - if config == nil { - config = &ConfigDefaults - } - - c := &Collector{ - config: *config, - } - - return c -} - -func NewWithFlags(_ *kingpin.Application) *Collector { - return &Collector{} -} - -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 { - return nil -} - -func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { - if wmiClient == nil || wmiClient.SWbemServicesClient == nil { - return errors.New("wmiClient or SWbemServicesClient is nil") - } - - c.wmiClient = wmiClient +func (c *Collector) buildClrSecurity() { c.numberLinkTimeChecks = prometheus.NewDesc( prometheus.BuildFQName(types.Namespace, Name, "link_time_checks_total"), "Displays the total number of link-time code access security checks since the application started.", @@ -87,23 +32,6 @@ func (c *Collector) Build(_ *slog.Logger, wmiClient *wmi.Client) error { []string{"process"}, nil, ) - - return nil -} - -// Collect sends the metric values for each metric -// to the provided prometheus Metric channel. -func (c *Collector) Collect(_ *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error { - logger = logger.With(slog.String("collector", Name)) - if err := c.collect(ch); err != nil { - logger.Error("failed collecting win32_perfrawdata_netframework_netclrsecurity metrics", - slog.Any("err", err), - ) - - return err - } - - return nil } type Win32_PerfRawData_NETFramework_NETCLRSecurity struct { @@ -117,7 +45,7 @@ type Win32_PerfRawData_NETFramework_NETCLRSecurity struct { TotalRuntimeChecks uint32 } -func (c *Collector) collect(ch chan<- prometheus.Metric) error { +func (c *Collector) collectClrSecurity(ch chan<- prometheus.Metric) error { var dst []Win32_PerfRawData_NETFramework_NETCLRSecurity if err := c.wmiClient.Query("SELECT * FROM Win32_PerfRawData_NETFramework_NETCLRSecurity", &dst); err != nil { return err diff --git a/pkg/collector/netframework_clrexceptions/netframework_clrexceptions_test.go b/pkg/collector/netframework/netframework_test.go similarity index 58% rename from pkg/collector/netframework_clrexceptions/netframework_clrexceptions_test.go rename to pkg/collector/netframework/netframework_test.go index 23940d7a..8002b578 100644 --- a/pkg/collector/netframework_clrexceptions/netframework_clrexceptions_test.go +++ b/pkg/collector/netframework/netframework_test.go @@ -1,13 +1,13 @@ -package netframework_clrexceptions_test +package netframework_test import ( "testing" - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrexceptions" + "github.com/prometheus-community/windows_exporter/pkg/collector/netframework" "github.com/prometheus-community/windows_exporter/pkg/testutils" ) func BenchmarkCollector(b *testing.B) { // No context name required as Collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrexceptions.Name, netframework_clrexceptions.NewWithFlags) + testutils.FuncBenchmarkCollector(b, netframework.Name, netframework.NewWithFlags) } diff --git a/pkg/collector/netframework_clrinterop/netframework_clrinterop_test.go b/pkg/collector/netframework_clrinterop/netframework_clrinterop_test.go deleted file mode 100644 index a165be19..00000000 --- a/pkg/collector/netframework_clrinterop/netframework_clrinterop_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package netframework_clrinterop_test - -import ( - "testing" - - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrinterop" - "github.com/prometheus-community/windows_exporter/pkg/testutils" -) - -func BenchmarkCollector(b *testing.B) { - // No context name required as collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrinterop.Name, netframework_clrinterop.NewWithFlags) -} diff --git a/pkg/collector/netframework_clrjit/netframework_clrjit_test.go b/pkg/collector/netframework_clrjit/netframework_clrjit_test.go deleted file mode 100644 index 04f243ef..00000000 --- a/pkg/collector/netframework_clrjit/netframework_clrjit_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package netframework_clrjit_test - -import ( - "testing" - - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrjit" - "github.com/prometheus-community/windows_exporter/pkg/testutils" -) - -func BenchmarkCollector(b *testing.B) { - // No context name required as collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrjit.Name, netframework_clrjit.NewWithFlags) -} diff --git a/pkg/collector/netframework_clrloading/netframework_clrloading_test.go b/pkg/collector/netframework_clrloading/netframework_clrloading_test.go deleted file mode 100644 index 91a22347..00000000 --- a/pkg/collector/netframework_clrloading/netframework_clrloading_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package netframework_clrloading_test - -import ( - "testing" - - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrloading" - "github.com/prometheus-community/windows_exporter/pkg/testutils" -) - -func BenchmarkCollector(b *testing.B) { - // No context name required as collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrloading.Name, netframework_clrloading.NewWithFlags) -} diff --git a/pkg/collector/netframework_clrlocksandthreads/netframework_clrlocksandthreads_test.go b/pkg/collector/netframework_clrlocksandthreads/netframework_clrlocksandthreads_test.go deleted file mode 100644 index c3167a64..00000000 --- a/pkg/collector/netframework_clrlocksandthreads/netframework_clrlocksandthreads_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package netframework_clrlocksandthreads_test - -import ( - "testing" - - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrlocksandthreads" - "github.com/prometheus-community/windows_exporter/pkg/testutils" -) - -func BenchmarkCollector(b *testing.B) { - // No context name required as collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrlocksandthreads.Name, netframework_clrlocksandthreads.NewWithFlags) -} diff --git a/pkg/collector/netframework_clrmemory/netframework_clrmemory_test.go b/pkg/collector/netframework_clrmemory/netframework_clrmemory_test.go deleted file mode 100644 index c771c642..00000000 --- a/pkg/collector/netframework_clrmemory/netframework_clrmemory_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package netframework_clrmemory_test - -import ( - "testing" - - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrmemory" - "github.com/prometheus-community/windows_exporter/pkg/testutils" -) - -func BenchmarkCollector(b *testing.B) { - // No context name required as collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrmemory.Name, netframework_clrmemory.NewWithFlags) -} diff --git a/pkg/collector/netframework_clrremoting/netframework_clrremoting_test.go b/pkg/collector/netframework_clrremoting/netframework_clrremoting_test.go deleted file mode 100644 index 749b46c6..00000000 --- a/pkg/collector/netframework_clrremoting/netframework_clrremoting_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package netframework_clrremoting_test - -import ( - "testing" - - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrremoting" - "github.com/prometheus-community/windows_exporter/pkg/testutils" -) - -func BenchmarkCollector(b *testing.B) { - // No context name required as collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrremoting.Name, netframework_clrremoting.NewWithFlags) -} diff --git a/pkg/collector/netframework_clrsecurity/netframework_clrsecurity_test.go b/pkg/collector/netframework_clrsecurity/netframework_clrsecurity_test.go deleted file mode 100644 index 822ba7a0..00000000 --- a/pkg/collector/netframework_clrsecurity/netframework_clrsecurity_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package netframework_clrsecurity_test - -import ( - "testing" - - "github.com/prometheus-community/windows_exporter/pkg/collector/netframework_clrsecurity" - "github.com/prometheus-community/windows_exporter/pkg/testutils" -) - -func BenchmarkCollector(b *testing.B) { - // No context name required as collector source is WMI - testutils.FuncBenchmarkCollector(b, netframework_clrsecurity.Name, netframework_clrsecurity.NewWithFlags) -}