Merge pull request #1065 from shivsepra/patch-1

Update collector.mssql.md

.github/workflows/ci.yml

@@ -106,7 +106,7 @@ jobs:
         with:
           check_filenames: true
           # When using this Action in other repos, the --skip option below can be removed
-          skip: ./.git
+          skip: ./.git,go.mod,go.sum
           ignore_words_list: calle
 
   build:

collector/hyperv.go

@@ -53,6 +53,11 @@ type HyperVCollector struct {
 	LogicalProcessors *prometheus.Desc
 	VirtualProcessors *prometheus.Desc
 
+	// Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor
+	HostLPGuestRunTimePercent      *prometheus.Desc
+	HostLPHypervisorRunTimePercent *prometheus.Desc
+	HostLPTotalRunTimePercent      *prometheus.Desc
+
 	// Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor
 	HostGuestRunTime      *prometheus.Desc
 	HostHypervisorRunTime *prometheus.Desc
@@ -309,6 +314,27 @@ func NewHyperVCollector() (Collector, error) {
 
 		//
 
+		HostLPGuestRunTimePercent: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("host_lp"), "guest_run_time_percent"),
+			"The percentage of time spent by the processor in guest code",
+			[]string{"core"},
+			nil,
+		),
+		HostLPHypervisorRunTimePercent: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("host_lp"), "hypervisor_run_time_percent"),
+			"The percentage of time spent by the processor in hypervisor code",
+			[]string{"core"},
+			nil,
+		),
+		HostLPTotalRunTimePercent: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, buildSubsystemName("host_lp"), "total_run_time_percent"),
+			"The percentage of time spent by the processor in guest and hypervisor code",
+			[]string{"core"},
+			nil,
+		),
+
+		//
+
 		HostGuestRunTime: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, buildSubsystemName("host_cpu"), "guest_run_time"),
 			"The time spent by the virtual processor in guest code",
@@ -694,6 +720,11 @@ func (c *HyperVCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metri
 		return err
 	}
 
+	if desc, err := c.collectHostLPUsage(ch); err != nil {
+		log.Error("failed collecting hyperV host logical processors metrics:", desc, err)
+		return err
+	}
+
 	if desc, err := c.collectHostCpuUsage(ch); err != nil {
 		log.Error("failed collecting hyperV host CPU metrics:", desc, err)
 		return err
@@ -999,6 +1030,59 @@ func (c *HyperVCollector) collectVmProcessor(ch chan<- prometheus.Metric) (*prom
 	return nil, nil
 }
 
+// Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor ...
+type Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor struct {
+	Name                     string
+	PercentGuestRunTime      uint64
+	PercentHypervisorRunTime uint64
+	PercentTotalRunTime      uint
+}
+
+func (c *HyperVCollector) collectHostLPUsage(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+	var dst []Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor
+	q := queryAll(&dst)
+	if err := wmi.Query(q, &dst); err != nil {
+		return nil, err
+	}
+
+	for _, obj := range dst {
+		if strings.Contains(obj.Name, "_Total") {
+			continue
+		}
+		// The name format is Hv LP <core id>
+		parts := strings.Split(obj.Name, " ")
+		if len(parts) != 3 {
+			log.Warnf("Unexpected format of Name in collectHostLPUsage: %q", obj.Name)
+			continue
+		}
+		coreId := parts[2]
+
+		ch <- prometheus.MustNewConstMetric(
+			c.HostLPGuestRunTimePercent,
+			prometheus.GaugeValue,
+			float64(obj.PercentGuestRunTime),
+			coreId,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.HostLPHypervisorRunTimePercent,
+			prometheus.GaugeValue,
+			float64(obj.PercentHypervisorRunTime),
+			coreId,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.HostLPTotalRunTimePercent,
+			prometheus.GaugeValue,
+			float64(obj.PercentTotalRunTime),
+			coreId,
+		)
+
+	}
+
+	return nil, nil
+}
+
 // Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor ...
 type Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor struct {
 	Name                     string

collector/iis.go

@@ -69,6 +69,7 @@ type IISCollector struct {
 	CurrentConnections                  *prometheus.Desc
 	CurrentISAPIExtensionRequests       *prometheus.Desc
 	CurrentNonAnonymousUsers            *prometheus.Desc
+	ServiceUptime                       *prometheus.Desc
 	TotalBytesReceived                  *prometheus.Desc
 	TotalBytesSent                      *prometheus.Desc
 	TotalAnonymousUsers                 *prometheus.Desc
@@ -242,6 +243,12 @@ func NewIISCollector() (Collector, error) {
 			[]string{"site"},
 			nil,
 		),
+		ServiceUptime: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "service_uptime"),
+			"Number of seconds the WebService is up (WebService.ServiceUptime)",
+			[]string{"site"},
+			nil,
+		),
 		TotalBytesReceived: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "received_bytes_total"),
 			"Number of data bytes that have been received by the Web service (WebService.TotalBytesReceived)",
@@ -416,25 +423,25 @@ func NewIISCollector() (Collector, error) {
 		// W3SVC_W3WP
 		Threads: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_threads"),
-			"",
+			"Number of threads actively processing requests in the worker process",
 			[]string{"app", "pid", "state"},
 			nil,
 		),
 		MaximumThreads: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_max_threads"),
-			"",
+			"Maximum number of threads to which the thread pool can grow as needed",
 			[]string{"app", "pid"},
 			nil,
 		),
 		RequestsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_requests_total"),
-			"",
+			"Total number of HTTP requests served by the worker process",
 			[]string{"app", "pid"},
 			nil,
 		),
 		RequestsActive: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_current_requests"),
-			"",
+			"Current number of requests being processed by the worker process",
 			[]string{"app", "pid"},
 			nil,
 		),
@@ -446,121 +453,121 @@ func NewIISCollector() (Collector, error) {
 		),
 		CurrentFileCacheMemoryUsage: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_memory_bytes"),
-			"",
+			"Current number of bytes used by user-mode file cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		MaximumFileCacheMemoryUsage: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_max_memory_bytes"),
-			"",
+			"Maximum number of bytes used by user-mode file cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		FileCacheFlushesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_flushes_total"),
-			"",
+			"Total number of files removed from the user-mode cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		FileCacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_queries_total"),
-			"",
+			"Total file cache queries (hits + misses)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		FileCacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_hits_total"),
-			"",
+			"Total number of successful lookups in the user-mode file cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		FilesCached: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_items"),
-			"",
+			"Current number of files whose contents are present in user-mode cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		FilesCachedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_items_total"),
-			"",
+			"Total number of files whose contents were ever added to the user-mode cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		FilesFlushedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_file_cache_items_flushed_total"),
-			"",
+			"Total number of file handles that have been removed from the user-mode cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		URICacheFlushesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_uri_cache_flushes_total"),
-			"",
+			"Total number of URI cache flushes (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		URICacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_uri_cache_queries_total"),
-			"",
+			"Total number of uri cache queries (hits + misses)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		URICacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_uri_cache_hits_total"),
-			"",
+			"Total number of successful lookups in the user-mode URI cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		URIsCached: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_uri_cache_items"),
-			"",
+			"Number of URI information blocks currently in the user-mode cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		URIsCachedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_uri_cache_items_total"),
-			"",
+			"Total number of URI information blocks added to the user-mode cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		URIsFlushedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_uri_cache_items_flushed_total"),
-			"",
+			"The number of URI information blocks that have been removed from the user-mode cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		MetadataCached: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_metadata_cache_items"),
-			"",
+			"Number of metadata information blocks currently present in user-mode cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		MetadataCacheFlushes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_metadata_cache_flushes_total"),
-			"",
+			"Total number of user-mode metadata cache flushes (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		MetadataCacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_metadata_cache_queries_total"),
-			"",
+			"Total metadata cache queries (hits + misses)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		MetadataCacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_metadata_cache_hits_total"),
-			"",
+			"Total number of successful lookups in the user-mode metadata cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		MetadataCachedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_metadata_cache_items_cached_total"),
-			"",
+			"Total number of metadata information blocks added to the user-mode cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		MetadataFlushedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_metadata_cache_items_flushed_total"),
-			"",
+			"Total number of metadata information blocks removed from the user-mode cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
@@ -572,44 +579,44 @@ func NewIISCollector() (Collector, error) {
 		),
 		OutputCacheItems: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_output_cache_items"),
-			"",
+			"Number of items current present in output cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		OutputCacheMemoryUsage: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_output_cache_memory_bytes"),
-			"",
+			"Current number of bytes used by output cache",
 			[]string{"app", "pid"},
 			nil,
 		),
 		OutputCacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_output_queries_total"),
-			"",
+			"Total number of output cache queries (hits + misses)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		OutputCacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_output_cache_hits_total"),
-			"",
+			"Total number of successful lookups in output cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		OutputCacheFlushedItemsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_output_cache_items_flushed_total"),
-			"",
+			"Total number of items flushed from output cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		OutputCacheFlushesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_output_cache_flushes_total"),
-			"",
+			"Total number of flushes of output cache (since service startup)",
 			[]string{"app", "pid"},
 			nil,
 		),
 		// W3SVC_W3WP_IIS8
 		RequestErrorsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_request_errors_total"),
-			"",
+			"Total number of requests that returned an error",
 			[]string{"app", "pid", "status_code"},
 			nil,
 		),
@@ -641,127 +648,127 @@ func NewIISCollector() (Collector, error) {
 		// Web Service Cache
 		ServiceCache_ActiveFlushedEntries: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_cache_active_flushed_entries"),
-			"Number of file handles cached in user-mode that will be closed when all current transfers complete.",
+			"Number of file handles cached that will be closed when all current transfers complete.",
 			nil,
 			nil,
 		),
 		ServiceCache_CurrentFileCacheMemoryUsage: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_memory_bytes"),
-			"",
+			"Current number of bytes used by file cache",
 			nil,
 			nil,
 		),
 		ServiceCache_MaximumFileCacheMemoryUsage: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_max_memory_bytes"),
-			"",
+			"Maximum number of bytes used by file cache",
 			nil,
 			nil,
 		),
 		ServiceCache_FileCacheFlushesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_flushes_total"),
-			"",
+			"Total number of file cache flushes (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_FileCacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_queries_total"),
-			"",
+			"Total number of file cache queries (hits + misses)",
 			nil,
 			nil,
 		),
 		ServiceCache_FileCacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_hits_total"),
-			"",
+			"Total number of successful lookups in the user-mode file cache",
 			nil,
 			nil,
 		),
 		ServiceCache_FilesCached: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_items"),
-			"",
+			"Current number of files whose contents are present in cache",
 			nil,
 			nil,
 		),
 		ServiceCache_FilesCachedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_items_total"),
-			"",
+			"Total number of files whose contents were ever added to the cache (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_FilesFlushedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_file_cache_items_flushed_total"),
-			"",
+			"Total number of file handles that have been removed from the cache (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_URICacheFlushesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_uri_cache_flushes_total"),
-			"",
+			"Total number of URI cache flushes (since service startup)",
 			[]string{"mode"},
 			nil,
 		),
 		ServiceCache_URICacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_uri_cache_queries_total"),
-			"",
+			"Total number of uri cache queries (hits + misses)",
 			[]string{"mode"},
 			nil,
 		),
 		ServiceCache_URICacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_uri_cache_hits_total"),
-			"",
+			"Total number of successful lookups in the URI cache (since service startup)",
 			[]string{"mode"},
 			nil,
 		),
 		ServiceCache_URIsCached: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_uri_cache_items"),
-			"",
+			"Number of URI information blocks currently in the cache",
 			[]string{"mode"},
 			nil,
 		),
 		ServiceCache_URIsCachedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_uri_cache_items_total"),
-			"",
+			"Total number of URI information blocks added to the cache (since service startup)",
 			[]string{"mode"},
 			nil,
 		),
 		ServiceCache_URIsFlushedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_uri_cache_items_flushed_total"),
-			"",
+			"The number of URI information blocks that have been removed from the cache (since service startup)",
 			[]string{"mode"},
 			nil,
 		),
 		ServiceCache_MetadataCached: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_metadata_cache_items"),
-			"",
+			"Number of metadata information blocks currently present in cache",
 			nil,
 			nil,
 		),
 		ServiceCache_MetadataCacheFlushes: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_metadata_cache_flushes_total"),
-			"",
+			"Total number of metadata cache flushes (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_MetadataCacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_metadata_cache_queries_total"),
-			"",
+			"Total metadata cache queries (hits + misses)",
 			nil,
 			nil,
 		),
 		ServiceCache_MetadataCacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_metadata_cache_hits_total"),
-			"",
+			"Total number of successful lookups in the metadata cache (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_MetadataCachedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_metadata_cache_items_cached_total"),
-			"",
+			"Total number of metadata information blocks added to the cache (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_MetadataFlushedTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_metadata_cache_items_flushed_total"),
-			"",
+			"Total number of metadata information blocks removed from the cache (since service startup)",
 			nil,
 			nil,
 		),
@@ -773,37 +780,37 @@ func NewIISCollector() (Collector, error) {
 		),
 		ServiceCache_OutputCacheItems: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_output_cache_items"),
-			"",
+			"Number of items current present in output cache",
 			nil,
 			nil,
 		),
 		ServiceCache_OutputCacheMemoryUsage: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_output_cache_memory_bytes"),
-			"",
+			"Current number of bytes used by output cache",
 			nil,
 			nil,
 		),
 		ServiceCache_OutputCacheQueriesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_output_cache_queries_total"),
-			"",
+			"Total output cache queries (hits + misses)",
 			nil,
 			nil,
 		),
 		ServiceCache_OutputCacheHitsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_output_cache_hits_total"),
-			"",
+			"Total number of successful lookups in output cache (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_OutputCacheFlushedItemsTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_output_cache_items_flushed_total"),
-			"",
+			"Total number of items flushed from output cache (since service startup)",
 			nil,
 			nil,
 		),
 		ServiceCache_OutputCacheFlushesTotal: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "server_output_cache_flushes_total"),
-			"",
+			"Total number of flushes of output cache (since service startup)",
 			nil,
 			nil,
 		),
@@ -845,6 +852,7 @@ type perflibWebService struct {
 	CurrentConnections            float64 `perflib:"Current Connections"`
 	CurrentISAPIExtensionRequests float64 `perflib:"Current ISAPI Extension Requests"`
 	CurrentNonAnonymousUsers      float64 `perflib:"Current NonAnonymous Users"`
+	ServiceUptime                 float64 `perflib:"Service Uptime"`
 
 	TotalBytesReceived                  float64 `perflib:"Total Bytes Received"`
 	TotalBytesSent                      float64 `perflib:"Total Bytes Sent"`
@@ -925,6 +933,12 @@ func (c *IISCollector) collectWebService(ctx *ScrapeContext, ch chan<- prometheu
 			app.CurrentNonAnonymousUsers,
 			app.Name,
 		)
+		ch <- prometheus.MustNewConstMetric(
+			c.ServiceUptime,
+			prometheus.GaugeValue,
+			app.ServiceUptime,
+			app.Name,
+		)
 		ch <- prometheus.MustNewConstMetric(
 			c.TotalBytesReceived,
 			prometheus.CounterValue,

collector/netframework_clrmemory.go

@@ -124,26 +124,31 @@ func (c *NETFramework_NETCLRMemoryCollector) Collect(ctx *ScrapeContext, ch chan
 type Win32_PerfRawData_NETFramework_NETCLRMemory struct {
 	Name string
 
-	AllocatedBytesPersec               uint64
-	FinalizationSurvivors              uint64
-	Frequency_PerfTime                 uint64
-	Gen0heapsize                       uint64
-	Gen0PromotedBytesPerSec            uint64
-	Gen1heapsize                       uint64
-	Gen1PromotedBytesPerSec            uint64
-	Gen2heapsize                       uint64
-	LargeObjectHeapsize                uint64
-	NumberBytesinallHeaps              uint64
-	NumberGCHandles                    uint64
-	NumberGen0Collections              uint64
-	NumberGen1Collections              uint64
-	NumberGen2Collections              uint64
-	NumberInducedGC                    uint64
-	NumberofPinnedObjects              uint64
-	NumberofSinkBlocksinuse            uint64
-	NumberTotalcommittedBytes          uint64
-	NumberTotalreservedBytes           uint64
-	PercentTimeinGC                    uint32
+	AllocatedBytesPersec      uint64
+	FinalizationSurvivors     uint64
+	Frequency_PerfTime        uint64
+	Gen0heapsize              uint64
+	Gen0PromotedBytesPerSec   uint64
+	Gen1heapsize              uint64
+	Gen1PromotedBytesPerSec   uint64
+	Gen2heapsize              uint64
+	LargeObjectHeapsize       uint64
+	NumberBytesinallHeaps     uint64
+	NumberGCHandles           uint64
+	NumberGen0Collections     uint64
+	NumberGen1Collections     uint64
+	NumberGen2Collections     uint64
+	NumberInducedGC           uint64
+	NumberofPinnedObjects     uint64
+	NumberofSinkBlocksinuse   uint64
+	NumberTotalcommittedBytes uint64
+	NumberTotalreservedBytes  uint64
+	// PercentTimeinGC has countertype=PERF_RAW_FRACTION.
+	// Formula: (100 * CounterValue) / BaseValue
+	// By docs https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/scripting-articles/ms974615(v=msdn.10)#perf_raw_fraction
+	PercentTimeinGC uint32
+	// BaseValue is just a "magic" number used to make the calculation come out right.
+	PercentTimeinGC_base               uint32
 	ProcessID                          uint64
 	PromotedFinalizationMemoryfromGen0 uint64
 	PromotedMemoryfromGen0             uint64
@@ -294,7 +299,7 @@ func (c *NETFramework_NETCLRMemoryCollector) collect(ch chan<- prometheus.Metric
 		ch <- prometheus.MustNewConstMetric(
 			c.TimeinGC,
 			prometheus.GaugeValue,
-			float64(process.PercentTimeinGC)/float64(process.Frequency_PerfTime),
+			float64(100*process.PercentTimeinGC)/float64(process.PercentTimeinGC_base),
 			process.Name,
 		)
 	}

collector/os.go

@@ -52,7 +52,7 @@ func NewOSCollector() (Collector, error) {
 		OSInformation: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "info"),
 			"OperatingSystem.Caption, OperatingSystem.Version",
-			[]string{"product", "version"},
+			[]string{"product", "version", "major_version", "minor_version", "build_number"},
 			nil,
 		),
 		PagingLimitBytes: prometheus.NewDesc(
@@ -236,6 +236,9 @@ func (c *OSCollector) collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) (
 		1.0,
 		fmt.Sprintf("Microsoft %s", pn), // Caption
 		fmt.Sprintf("%d.%d.%s", nwgi.VersionMajor, nwgi.VersionMinor, bn), // Version
+		fmt.Sprintf("%d", nwgi.VersionMajor),                              // Major Version
+		fmt.Sprintf("%d", nwgi.VersionMinor),                              // Minor Version
+		bn,                                                                // Build number
 	)
 
 	ch <- prometheus.MustNewConstMetric(

collector/service.go

@@ -6,6 +6,7 @@ package collector
 import (
 	"fmt"
 	"strings"
+	"syscall"
 
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus-community/windows_exporter/log"
@@ -234,30 +235,43 @@ func (c *serviceCollector) collectAPI(ch chan<- prometheus.Metric) error {
 	}
 	defer svcmgrConnection.Disconnect() //nolint:errcheck
 
-	// List All Services from the Services Manager
+	// List All Services from the Services Manager.
 	serviceList, err := svcmgrConnection.ListServices()
 	if err != nil {
 		return err
 	}
 
-	// Iterate through the Services List
+	// Iterate through the Services List.
 	for _, service := range serviceList {
-		// Retrieve handle for each service
-		serviceHandle, err := svcmgrConnection.OpenService(service)
-		if err != nil {
-			continue
-		}
-		defer serviceHandle.Close()
-
-		// Get Service Configuration
-		serviceConfig, err := serviceHandle.Config()
+		// Get UTF16 service name.
+		serviceName, err := syscall.UTF16PtrFromString(service)
 		if err != nil {
+			log.Warnf("Service %s get name error:  %#v", service, err)
 			continue
 		}
 
-		// Get Service Current Status
-		serviceStatus, err := serviceHandle.Query()
+		// Open connection for service handler.
+		serviceHandle, err := windows.OpenService(svcmgrConnection.Handle, serviceName, windows.GENERIC_READ)
 		if err != nil {
+			log.Warnf("Open service %s error:  %#v", service, err)
+			continue
+		}
+
+		// Create handle for each service.
+		serviceManager := &mgr.Service{Name: service, Handle: serviceHandle}
+		defer serviceManager.Close()
+
+		// Get Service Configuration.
+		serviceConfig, err := serviceManager.Config()
+		if err != nil {
+			log.Warnf("Get ervice %s config error:  %#v", service, err)
+			continue
+		}
+
+		// Get Service Current Status.
+		serviceStatus, err := serviceManager.Query()
+		if err != nil {
+			log.Warnf("Get service %s status error:  %#v", service, err)
 			continue
 		}
 

config/config.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/log"
 	"gopkg.in/alecthomas/kingpin.v2"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 type getFlagger interface {

config/flatten_test.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"reflect"
 	"testing"
 )

docs/collector.exchange.md

@@ -16,7 +16,7 @@ Enabled by default? | No
 Lists the Perflib Objects that are queried for data along with the perlfib object id
 
 ### `--collectors.exchange.enabled`
-Comma-separated list of collectors to use, for example: `--collectors.exchange.enabled=AvailabilityService,OutlookWebAccess`. Matching is case-sensetive. Depending on the exchange installation not all performance counters are available. Use `--collectors.exchange.list` to obtain a list of supported collectors.
+Comma-separated list of collectors to use, for example: `--collectors.exchange.enabled=AvailabilityService,OutlookWebAccess`. Matching is case-sensitive. Depending on the exchange installation not all performance counters are available. Use `--collectors.exchange.list` to obtain a list of supported collectors.
 
 ## Metrics
 Name          | Description

docs/collector.hyperv.md

@@ -5,7 +5,7 @@ The hyperv collector exposes metrics about the Hyper-V hypervisor
 |||
 -|-
 Metric name prefix  | `hyperv`
-Classes             | `Win32_PerfRawData_VmmsVirtualMachineStats_HyperVVirtualMachineHealthSummary`<br/>`Win32_PerfRawData_VidPerfProvider_HyperVVMVidPartition`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorRootPartition`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorVirtualProcessor`<br/>`Win32_PerfRawData_NvspSwitchStats_HyperVVirtualSwitch`<br/>`Win32_PerfRawData_EthernetPerfProvider_HyperVLegacyNetworkAdapter`<br/>`Win32_PerfRawData_Counters_HyperVVirtualStorageDevice`<br/>`Win32_PerfRawData_NvspNicStats_HyperVVirtualNetworkAdapter`
+Classes             | `Win32_PerfRawData_VmmsVirtualMachineStats_HyperVVirtualMachineHealthSummary`<br/>`Win32_PerfRawData_VidPerfProvider_HyperVVMVidPartition`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorRootPartition`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorLogicalProcessor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorRootVirtualProcessor`<br/>`Win32_PerfRawData_HvStats_HyperVHypervisorVirtualProcessor`<br/>`Win32_PerfRawData_NvspSwitchStats_HyperVVirtualSwitch`<br/>`Win32_PerfRawData_EthernetPerfProvider_HyperVLegacyNetworkAdapter`<br/>`Win32_PerfRawData_Counters_HyperVVirtualStorageDevice`<br/>`Win32_PerfRawData_NvspNicStats_HyperVVirtualNetworkAdapter`
 Enabled by default? | No
 
 ## Flags
@@ -44,6 +44,9 @@ Name | Description | Type | Labels
 `windows_hyperv_root_partition_virtual_tlb_pages` | _Not yet documented_ | counter | None
 `windows_hyperv_hypervisor_virtual_processors` | _Not yet documented_ | counter | None
 `windows_hyperv_hypervisor_logical_processors` | _Not yet documented_ | counter | None
+`windows_hyperv_host_lp_guest_run_time_percent` | _Not yet documented_ | counter | `core`
+`windows_hyperv_host_lp_hypervisor_run_time_percent` | _Not yet documented_ | counter | `core`
+`windows_hyperv_host_lp_total_run_time_percent` | _Not yet documented_ | counter | `core`
 `windows_hyperv_host_cpu_guest_run_time` | _Not yet documented_ | counter | `core`
 `windows_hyperv_host_cpu_hypervisor_run_time` | _Not yet documented_ | counter | `core`
 `windows_hyperv_host_cpu_remote_run_time` | _Not yet documented_ | counter | `core`
@@ -118,6 +121,10 @@ Percent of physical CPU resources by the hosts themselves (on all monitored host
 ```
 (sum by (instance)(rate(windows_hyperv_host_cpu_total_run_time{}[1m]))) / sum by (instance)(windows_cs_logical_processors{}) / 100000
 ```
+Percent of physical CPU resources by the hypervisor (on all monitored hosts)
+```
+(sum by (instance)(rate(windows_hyperv_host_lp_total_run_time_percent{}[1m]))) / sum by (instance)(windows_hyperv_hypervisor_logical_processors{}) / 100000
+```
 
 ## Alerting examples
 _This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.iis.md

@@ -30,105 +30,106 @@ If given, an application needs to *not* match the blacklist regexp in order for
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`windows_iis_current_anonymous_users` | _Not yet documented_ | counter | `site`
+`windows_iis_current_anonymous_users` | The number of users who currently have an anonymous request pending with the web service | counter | `site`
 `windows_iis_current_blocked_async_io_requests` | _Not yet documented_ | counter | `site`
-`windows_iis_current_cgi_requests` | _Not yet documented_ | counter | `site`
-`windows_iis_current_connections` | _Not yet documented_ | counter | `site`
-`windows_iis_current_isapi_extension_requests` | _Not yet documented_ | counter | `site`
-`windows_iis_current_non_anonymous_users` | _Not yet documented_ | counter | `site`
-`windows_iis_received_bytes_total` | _Not yet documented_ | counter | `site`
-`windows_iis_sent_bytes_total` | _Not yet documented_ | counter | `site`
-`windows_iis_anonymous_users_total` | _Not yet documented_ | counter | `site`
+`windows_iis_current_cgi_requests` | The number of CGI requests that are being processed simultaneously by the web service | counter | `site`
+`windows_iis_current_connections` |  The number of active connections to the web service | counter | `site`
+`windows_iis_current_isapi_extension_requests` | The number of [ISAPI extension](https://docs.microsoft.com/en-us/previous-versions/iis/6.0-sdk/ms525172(v=vs.90)) requests that are being processed simultaneously by the web service | counter | `site`
+`windows_iis_current_non_anonymous_users` | The number of users who currently have a nonanonymous request pending with the web service | counter | `site`
+`windows_iis_service_uptime` | The uptime for the web service or a Web site (seconds) | gauge | `site`
+`windows_iis_received_bytes_total` | The total bytes of data that have been received by the web service since the service started | counter | `site`
+`windows_iis_sent_bytes_total` | The number of data bytes that have been sent by the web service since the service started | counter | `site`
+`windows_iis_anonymous_users_total` | The number of users who have established an anonymous request since the web service started | counter | `site`
 `windows_iis_blocked_async_io_requests_total` | _Not yet documented_ | counter | `site`
-`windows_iis_cgi_requests_total` | _Not yet documented_ | counter | `site`
-`windows_iis_connection_attempts_all_instances_total` | _Not yet documented_ | counter | `site`
-`windows_iis_requests_total` | _Not yet documented_ | counter | `site`, `method`
-`windows_iis_files_received_total` | _Not yet documented_ | counter | `site`
-`windows_iis_files_sent_total` | _Not yet documented_ | counter | `site`
-`windows_iis_ipapi_extension_requests_total` | _Not yet documented_ | counter | `site`
-`windows_iis_locked_errors_total` | _Not yet documented_ | counter | `site`
-`windows_iis_logon_attempts_total` | _Not yet documented_ | counter | `site`
-`windows_iis_non_anonymous_users_total` | _Not yet documented_ | counter | `site`
-`windows_iis_not_found_errors_total` | _Not yet documented_ | counter | `site`
+`windows_iis_cgi_requests_total` | The number of all CGI requests that have been made since the web service started | counter | `site`
+`windows_iis_connection_attempts_all_instances_total` | The number of connections to the web service that have been attempted since the service started | counter | `site`
+`windows_iis_requests_total` | The number of requests that have been made since the web service was started | counter | `site`, `method`
+`windows_iis_files_received_total` | The total number of files that have been received by the FTP service since the service started | counter | `site`
+`windows_iis_files_sent_total` | The total number of files that have been sent by the FTP service since the service started | counter | `site`
+`windows_iis_ipapi_extension_requests_total` | The number of ISAPI extension requests that have been made since the web service started | counter | `site`
+`windows_iis_locked_errors_total` | The number of requests that have been made since the service started that could not be satisfied by the server because the requested document was locked. Usually reported as HTTP error 423 | counter | `site`
+`windows_iis_logon_attempts_total` | The number of attempts to log on to the web service that have occurred since the service started | counter | `site`
+`windows_iis_non_anonymous_users_total` | The number of users who have made nonanonymous requests to the web service since the service started | counter | `site`
+`windows_iis_not_found_errors_total` | The number of requests that have been made since the service started that were not satisfied by the server because the requested document was not found. Usually reported as HTTP error 404 | counter | `site`
 `windows_iis_rejected_async_io_requests_total` | _Not yet documented_ | counter | `site`
-`windows_iis_current_application_pool_state` | _Not yet documented_ | counter | `app`, `state`
-`windows_iis_current_application_pool_start_time` | _Not yet documented_ | counter | `app`
-`windows_iis_current_worker_processes` | _Not yet documented_ | counter | `app`
-`windows_iis_maximum_worker_processes` | _Not yet documented_ | counter | `app`
-`windows_iis_recent_worker_process_failures` | _Not yet documented_ | counter | `app`
-`windows_iis_time_since_last_worker_process_failure` | _Not yet documented_ | counter | `app`
-`windows_iis_total_application_pool_recycles` | _Not yet documented_ | counter | `app`
-`windows_iis_total_application_pool_start_time` | _Not yet documented_ | counter | `app`
-`windows_iis_total_worker_processes_created` | _Not yet documented_ | counter | `app`
-`windows_iis_total_worker_process_failures` | _Not yet documented_ | counter | `app`
-`windows_iis_total_worker_process_ping_failures` | _Not yet documented_ | counter | `app`
-`windows_iis_total_worker_process_shutdown_failures` | _Not yet documented_ | counter | `app`
-`windows_iis_total_worker_process_startup_failures` | _Not yet documented_ | counter | `app`
-`windows_iis_worker_cache_active_flushed_entries` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_max_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_items_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_file_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_items_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_items_cached_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
+`windows_iis_current_application_pool_state` | The current status of the application pool (1 - Uninitialized, 2 - Initialized, 3 - Running, 4 - Disabling, 5 - Disabled, 6 - Shutdown Pending, 7 - Delete Pending) | counter | `app`, `state`
+`windows_iis_current_application_pool_start_time` | The unix timestamp for the application pool start time | counter | `app`
+`windows_iis_current_worker_processes` | The current number of worker processes that are running in the application pool | counter | `app`
+`windows_iis_maximum_worker_processes` | The maximum number of worker processes that have been created for the application pool since Windows Process Activation Service (WAS) started | counter | `app`
+`windows_iis_recent_worker_process_failures` | The number of times that worker processes for the application pool failed during the rapid-fail protection interval | counter | `app`
+`windows_iis_time_since_last_worker_process_failure` | The length of time, in seconds, since the last worker process failure occurred for the application pool | counter | `app`
+`windows_iis_total_application_pool_recycles` | The number of times that the application pool has been recycled since Windows Process Activation Service (WAS) started | counter | `app`
+`windows_iis_total_application_pool_start_time` | The unix timestamp for the application pool of when the Windows Process Activation Service (WAS) started | counter | `app`
+`windows_iis_total_worker_processes_created` | The number of worker processes created for the application pool since Windows Process Activation Service (WAS) started | counter | `app`
+`windows_iis_total_worker_process_failures` | The number of times that worker processes have crashed since the application pool was started | counter | `app`
+`windows_iis_total_worker_process_ping_failures` | The number of times that Windows Process Activation Service (WAS) did not receive a response to ping messages sent to a worker process | counter | `app`
+`windows_iis_total_worker_process_shutdown_failures` | The number of times that Windows Process Activation Service (WAS) failed to shut down a worker process | counter | `app`
+`windows_iis_total_worker_process_startup_failures` | The number of times that Windows Process Activation Service (WAS) failed to start a worker process | counter | `app`
+`windows_iis_worker_cache_active_flushed_entries` | Number of file handles cached that will be closed when all current transfers complete | counter | `app`, `pid`
+`windows_iis_worker_file_cache_memory_bytes` | Current number of bytes used by file cache | counter | `app`, `pid`
+`windows_iis_worker_file_cache_max_memory_bytes` | Maximum number of bytes used by file cache | counter | `app`, `pid`
+`windows_iis_worker_file_cache_flushes_total` | Total number of file cache flushes (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_file_cache_queries_total` | Total file cache queries (hits + misses) | counter | `app`, `pid`
+`windows_iis_worker_file_cache_hits_total` | Total number of successful lookups in the user-mode file cache | counter | `app`, `pid`
+`windows_iis_worker_file_cache_items` | Current number of files whose contents are present in user-mode cache | counter | `app`, `pid`
+`windows_iis_worker_file_cache_items_total` | Total number of files whose contents were ever added to the user-mode cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_file_cache_items_flushed_total` | Total number of file handles that have been removed from the user-mode cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_flushes_total` | Total number of URI cache flushes (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_queries_total` | Total number of uri cache queries (hits + misses) | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_hits_total` | Total number of successful lookups in the user-mode URI cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_items` | Number of URI information blocks currently in the user-mode cache | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_items_total` | Total number of URI information blocks added to the user-mode cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_uri_cache_items_flushed_total` | The number of URI information blocks that have been removed from the user-mode cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_items` | Number of metadata information blocks currently present in user-mode cache | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_flushes_total` | Total number of user-mode metadata cache flushes (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_queries_total` | Total metadata cache queries (hits + misses) | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_hits_total` | Total number of successful lookups in the user-mode metadata cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_items_cached_total` | Total number of metadata information blocks added to the user-mode cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_metadata_cache_items_flushed_total` | Total number of metadata information blocks removed from the user-mode cache (since service startup) | counter | `app`, `pid`
 `windows_iis_worker_output_cache_active_flushed_items` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_output_cache_items` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_output_cache_memory_bytes` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_output_queries_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_output_cache_hits_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_output_cache_items_flushed_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_output_cache_flushes_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_threads` | _Not yet documented_ | counter | `app`, `pid`, `state`
-`windows_iis_worker_max_threads` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_requests_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_current_requests` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_worker_request_errors_total` | _Not yet documented_ | counter | `app`, `pid`, `status_code`
+`windows_iis_worker_output_cache_items` | Number of items current present in output cache | counter | `app`, `pid`
+`windows_iis_worker_output_cache_memory_bytes` | Current number of bytes used by output cache | counter | `app`, `pid`
+`windows_iis_worker_output_queries_total` | Total number of output cache queries (hits + misses) | counter | `app`, `pid`
+`windows_iis_worker_output_cache_hits_total` | Total number of successful lookups in output cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_output_cache_items_flushed_total` | Total number of items flushed from output cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_output_cache_flushes_total` | Total number of flushes of output cache (since service startup) | counter | `app`, `pid`
+`windows_iis_worker_threads` | Number of threads actively processing requests in the worker process | counter | `app`, `pid`, `state`
+`windows_iis_worker_max_threads` | Maximum number of threads to which the thread pool can grow as needed | counter | `app`, `pid`
+`windows_iis_worker_requests_total` | Total number of HTTP requests served by the worker process | counter | `app`, `pid`
+`windows_iis_worker_current_requests` | Current number of requests being processed by the worker process | counter | `app`, `pid`
+`windows_iis_worker_request_errors_total` | Total number of requests that returned an error | counter | `app`, `pid`, `status_code`
 `windows_iis_worker_current_websocket_requests` | _Not yet documented_ | counter | `app`, `pid`
 `windows_iis_worker_websocket_connection_attempts_total` | _Not yet documented_ | counter | `app`, `pid`
 `windows_iis_worker_websocket_connection_accepted_total` | _Not yet documented_ | counter | `app`, `pid`
 `windows_iis_worker_websocket_connection_rejected_total` | _Not yet documented_ | counter | `app`, `pid`
-`windows_iis_server_cache_active_flushed_entries` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_memory_bytes` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_max_memory_bytes` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_flushes_total` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_queries_total` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_hits_total` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_items` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_items_total` | _Not yet documented_ | counter | None
-`windows_iis_server_file_cache_items_flushed_total` | _Not yet documented_ | counter | None
-`windows_iis_server_uri_cache_flushes_total` | _Not yet documented_ | counter | `mode`
-`windows_iis_server_uri_cache_queries_total` | _Not yet documented_ | counter | `mode`
-`windows_iis_server_uri_cache_hits_total` | _Not yet documented_ | counter | `mode`
-`windows_iis_server_uri_cache_items` | _Not yet documented_ | counter | `mode`
-`windows_iis_server_uri_cache_items_total` | _Not yet documented_ | counter | `mode`
-`windows_iis_server_uri_cache_items_flushed_total` | _Not yet documented_ | counter | `mode`
-`windows_iis_server_metadata_cache_items` | _Not yet documented_ | counter | None
-`windows_iis_server_metadata_cache_flushes_total` | _Not yet documented_ | counter | None
-`windows_iis_server_metadata_cache_queries_total` | _Not yet documented_ | counter | None
-`windows_iis_server_metadata_cache_hits_total` | _Not yet documented_ | counter | None
-`windows_iis_server_metadata_cache_items_cached_total` | _Not yet documented_ | counter | None
-`windows_iis_server_metadata_cache_items_flushed_total` | _Not yet documented_ | counter | None
+`windows_iis_server_cache_active_flushed_entries` | Number of file handles cached that will be closed when all current transfers complete | counter | None
+`windows_iis_server_file_cache_memory_bytes` | Current number of bytes used by file cache | counter | None
+`windows_iis_server_file_cache_max_memory_bytes` | Maximum number of bytes used by file cache | counter | None
+`windows_iis_server_file_cache_flushes_total` | Total number of file cache flushes (since service startup) | counter | None
+`windows_iis_server_file_cache_queries_total` | Total number of file cache queries (hits + misses) | counter | None
+`windows_iis_server_file_cache_hits_total` | Total number of successful lookups in the file cache | counter | None
+`windows_iis_server_file_cache_items` | Current number of files whose contents are present in cache | counter | None
+`windows_iis_server_file_cache_items_total` | Total number of files whose contents were ever added to the cache (since service startup) | counter | None
+`windows_iis_server_file_cache_items_flushed_total` | Total number of file handles that have been removed from the cache (since service startup) | counter | None
+`windows_iis_server_uri_cache_flushes_total` | Total number of URI cache flushes (since service startup) | counter | `mode`
+`windows_iis_server_uri_cache_queries_total` | Total number of uri cache queries (hits + misses) | counter | `mode`
+`windows_iis_server_uri_cache_hits_total` | Total number of successful lookups in the URI cache (since service startup) | counter | `mode`
+`windows_iis_server_uri_cache_items` | Number of URI information blocks currently in the cache | counter | `mode`
+`windows_iis_server_uri_cache_items_total` | Total number of URI information blocks added to the cache (since service startup) | counter | `mode`
+`windows_iis_server_uri_cache_items_flushed_total` | The number of URI information blocks that have been removed from the cache (since service startup) | counter | `mode`
+`windows_iis_server_metadata_cache_items` | Number of metadata information blocks currently present in cache | counter | None
+`windows_iis_server_metadata_cache_flushes_total` | Total number of metadata cache flushes (since service startup) | counter | None
+`windows_iis_server_metadata_cache_queries_total` | Total metadata cache queries (hits + misses) | counter | None
+`windows_iis_server_metadata_cache_hits_total` | Total number of successful lookups in the metadata cache (since service startup) | counter | None
+`windows_iis_server_metadata_cache_items_cached_total` | Total number of metadata information blocks added to the cache (since service startup) | counter | None
+`windows_iis_server_metadata_cache_items_flushed_total` | Total number of metadata information blocks removed from the cache (since service startup) | counter | None
 `windows_iis_server_output_cache_active_flushed_items` | _Not yet documented_ | counter | None
-`windows_iis_server_output_cache_items` | _Not yet documented_ | counter | None
-`windows_iis_server_output_cache_memory_bytes` | _Not yet documented_ | counter | None
-`windows_iis_server_output_cache_queries_total` | _Not yet documented_ | counter | None
-`windows_iis_server_output_cache_hits_total` | _Not yet documented_ | counter | None
-`windows_iis_server_output_cache_items_flushed_total` | _Not yet documented_ | counter | None
-`windows_iis_server_output_cache_flushes_total` | _Not yet documented_ | counter | None
+`windows_iis_server_output_cache_items` | Number of items current present in output cache | counter | None
+`windows_iis_server_output_cache_memory_bytes` | Current number of bytes used by output cache | counter | None
+`windows_iis_server_output_cache_queries_total` | Total output cache queries (hits + misses) | counter | None
+`windows_iis_server_output_cache_hits_total` | Total number of successful lookups in output cache (since service startup) | counter | None
+`windows_iis_server_output_cache_items_flushed_total` | Total number of items flushed from output cache (since service startup) | counter | None
+`windows_iis_server_output_cache_flushes_total` | Total number of flushes of output cache (since service startup) | counter | None
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.logon.md

@@ -8,6 +8,8 @@ Metric name prefix  | `logon`
 Classes             | [`Win32_LogonSession`](https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/win32-logonsession)
 Enabled by default? | No
 
+> :warning: **On some deployments, this collector seems to have some memory/timeout issues**: See [#583](https://github.com/prometheus-community/windows_exporter/issues/583)
+
 ## Flags
 
 None

docs/collector.mssql.md

@@ -268,8 +268,8 @@ When you read the counter in perfmon you will get the the percentage pages found
 This collector retrieves the two internal values separately. In order to calculate the Buffer Cache Hit Ratio in PromQL.
 
 ```
-windows_mssql_bufman_buffer_cache_hits{instance="host:9182", exported_instance="MSSQLSERVER"} /
-windows_mssql_bufman_buffer_cache_lookups{instance="host:9182", exported_instance="MSSQLSERVER"}
+windows_mssql_bufman_buffer_cache_hits{instance="host:9182", mssql_instance="MSSQLSERVER"} /
+windows_mssql_bufman_buffer_cache_lookups{instance="host:9182", mssql_instance="MSSQLSERVER"}
 ```
 
 This principal can be used for following metrics too:

docs/collector.os.md

@@ -16,7 +16,7 @@ None
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
-`windows_os_info` | Contains full product name & version in labels | gauge | `product`, `version`
+`windows_os_info` | Contains full product name & version in labels. Note that the `major_version` for Windows 11 is "10"; a build number greater than 22000 represents Windows 11. | gauge | `product`, `version`, `major_version`, `minor_version`, `build_number`
 `windows_os_paging_limit_bytes` | Total number of bytes that can be stored in the operating system paging files. 0 (zero) indicates that there are no paging files | gauge | None
 `windows_os_paging_free_bytes` | Number of bytes that can be mapped into the operating system paging files without causing any other pages to be swapped out | gauge | None
 `windows_os_physical_memory_free_bytes` | Bytes of physical memory currently unused and available | gauge | None

exporter.go

@@ -4,6 +4,10 @@
 package main
 
 import (
+	//Its important that we do these first so that we can register with the windows service control ASAP to avoid timeouts
+	"github.com/prometheus-community/windows_exporter/initiate"
+	"github.com/prometheus-community/windows_exporter/log"
+
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -16,12 +20,10 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/sys/windows/svc"
-
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus-community/windows_exporter/collector"
 	"github.com/prometheus-community/windows_exporter/config"
-	"github.com/prometheus-community/windows_exporter/log"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -50,7 +52,6 @@ type prometheusVersion struct {
 const (
 	defaultCollectors            = "cpu,cs,logical_disk,net,os,service,system,textfile"
 	defaultCollectorsPlaceholder = "[defaults]"
-	serviceName                  = "windows_exporter"
 )
 
 var (
@@ -289,7 +290,6 @@ func main() {
 			"Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads.",
 		).Default("0.5").Float64()
 	)
-
 	log.AddFlags(kingpin.CommandLine)
 	kingpin.Version(version.Print("windows_exporter"))
 	kingpin.HelpFlag.Short('h')
@@ -297,7 +297,7 @@ func main() {
 	// Load values from configuration file(s). Executable flags must first be parsed, in order
 	// to load the specified file(s).
 	kingpin.Parse()
-
+	log.Debug("Logging has Started")
 	if *configFile != "" {
 		resolver, err := config.NewResolver(*configFile)
 		if err != nil {
@@ -327,21 +327,6 @@ func main() {
 
 	initWbem()
 
-	isService, err := svc.IsWindowsService()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	stopCh := make(chan bool)
-	if isService {
-		go func() {
-			err = svc.Run(serviceName, &windowsExporterService{stopCh: stopCh})
-			if err != nil {
-				log.Errorf("Failed to start service: %v", err)
-			}
-		}()
-	}
-
 	collectors, err := loadCollectors(*enabledCollectors)
 	if err != nil {
 		log.Fatalf("Couldn't load collectors: %s", err)
@@ -421,7 +406,7 @@ func main() {
 	}()
 
 	for {
-		if <-stopCh {
+		if <-initiate.StopCh {
 			log.Info("Shutting down windows_exporter")
 			break
 		}
@@ -463,33 +448,6 @@ func withConcurrencyLimit(n int, next http.HandlerFunc) http.HandlerFunc {
 	}
 }
 
-type windowsExporterService struct {
-	stopCh chan<- bool
-}
-
-func (s *windowsExporterService) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
-	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown
-	changes <- svc.Status{State: svc.StartPending}
-	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
-loop:
-	for {
-		select {
-		case c := <-r:
-			switch c.Cmd {
-			case svc.Interrogate:
-				changes <- c.CurrentStatus
-			case svc.Stop, svc.Shutdown:
-				s.stopCh <- true
-				break loop
-			default:
-				log.Error(fmt.Sprintf("unexpected control request #%d", c))
-			}
-		}
-	}
-	changes <- svc.Status{State: svc.StopPending}
-	return
-}
-
 type metricsHandler struct {
 	timeoutMargin    float64
 	collectorFactory func(timeout time.Duration, requestedCollectors []string) (error, *windowsCollector)

go.mod

@@ -3,18 +3,18 @@ module github.com/prometheus-community/windows_exporter
 go 1.13
 
 require (
-	github.com/Microsoft/hcsshim v0.9.3
+	github.com/Microsoft/hcsshim v0.9.4
 	github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/go-kit/log v0.2.1
 	github.com/go-ole/go-ole v1.2.6
 	github.com/leoluk/perflib_exporter v0.1.1-0.20211204221052-9e3696429c20
-	github.com/prometheus/client_golang v1.12.2
+	github.com/prometheus/client_golang v1.13.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.37.0
 	github.com/prometheus/exporter-toolkit v0.7.1
-	github.com/sirupsen/logrus v1.8.1
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
+	github.com/sirupsen/logrus v1.9.0
+	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -63,8 +63,8 @@ github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2
 github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
 github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
 github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
-github.com/Microsoft/hcsshim v0.9.3 h1:k371PzBuRrz2b+ebGuI2nVgVhgsVX60jMfSw80NECxo=
-github.com/Microsoft/hcsshim v0.9.3/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
+github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5+I=
+github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc=
 github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -370,8 +370,9 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -561,8 +562,8 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34=
-github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU=
+github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -594,8 +595,9 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -613,8 +615,9 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -642,8 +645,9 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
@@ -805,6 +809,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -880,8 +885,10 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -955,7 +962,6 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -1048,8 +1054,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -1080,8 +1087,9 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=

initiate/initiate.go

@@ -0,0 +1,60 @@
+//This package allows us to initiate Time Sensitive components (Like registering the windows service) as early as possible in the startup process
+package initiate
+
+import (
+	"fmt"
+
+	"github.com/prometheus-community/windows_exporter/log"
+	"golang.org/x/sys/windows/svc"
+)
+
+const (
+	serviceName = "windows_exporter"
+)
+
+type windowsExporterService struct {
+	stopCh chan<- bool
+}
+
+func (s *windowsExporterService) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
+	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown
+	changes <- svc.Status{State: svc.StartPending}
+	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
+loop:
+	for {
+		select {
+		case c := <-r:
+			switch c.Cmd {
+			case svc.Interrogate:
+				changes <- c.CurrentStatus
+			case svc.Stop, svc.Shutdown:
+				log.Debug("Service Stop Received")
+				s.stopCh <- true
+				break loop
+			default:
+				log.Error(fmt.Sprintf("unexpected control request #%d", c))
+			}
+		}
+	}
+	changes <- svc.Status{State: svc.StopPending}
+	return
+}
+
+var StopCh = make(chan bool)
+
+func init() {
+	log.Debug("Checking if We are a service")
+	isService, err := svc.IsWindowsService()
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Debug("Attempting to start exporter service")
+	if isService {
+		go func() {
+			err = svc.Run(serviceName, &windowsExporterService{stopCh: StopCh})
+			if err != nil {
+				log.Errorf("Failed to start service: %v", err)
+			}
+		}()
+	}
+}