From 6120ea9be18ecf19c627d05253ef48c08b8e35f6 Mon Sep 17 00:00:00 2001
From: Souen Mazouin <souen.mazouin@cdiscount.com>
Date: Tue, 14 Dec 2021 14:33:04 +0100
Subject: [PATCH] fix: add missing metrics for IIS version >= 8

Allows the following metrics to be exposed again, they had disappeared after the migration to perflib :
- worker_request_errors_total
- worker_current_websocket_requests
- worker_websocket_connection_accepted_total
- worker_websocket_connection_rejected_total

Signed-off-by: Souen Mazouin <souen.mazouin@cdiscount.com>
---
 collector/iis.go | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/collector/iis.go b/collector/iis.go
index fc7c8e7d..a4fc4fad 100644
--- a/collector/iis.go
+++ b/collector/iis.go
@@ -4,11 +4,12 @@ package collector
 
 import (
 	"fmt"
+	"regexp"
+
 	"github.com/prometheus-community/windows_exporter/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sys/windows/registry"
 	"gopkg.in/alecthomas/kingpin.v2"
-	"regexp"
 )
 
 func init() {
@@ -411,7 +412,7 @@ func NewIISCollector() (Collector, error) {
 			nil,
 		),
 
-		// W3WP_W3SVC
+		// W3SVC_W3WP
 		Threads: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "worker_threads"),
 			"",
@@ -604,6 +605,37 @@ func NewIISCollector() (Collector, error) {
 			[]string{"app", "pid"},
 			nil,
 		),
+		// W3SVC_W3WP_IIS8
+		RequestErrorsTotal: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "worker_request_errors_total"),
+			"",
+			[]string{"app", "pid", "status_code"},
+			nil,
+		),
+		WebSocketRequestsActive: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "worker_current_websocket_requests"),
+			"",
+			[]string{"app", "pid"},
+			nil,
+		),
+		WebSocketConnectionAttempts: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "worker_websocket_connection_attempts_total"),
+			"",
+			[]string{"app", "pid"},
+			nil,
+		),
+		WebSocketConnectionsAccepted: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "worker_websocket_connection_accepted_total"),
+			"",
+			[]string{"app", "pid"},
+			nil,
+		),
+		WebSocketConnectionsRejected: prometheus.NewDesc(
+			prometheus.BuildFQName(Namespace, subsystem, "worker_websocket_connection_rejected_total"),
+			"",
+			[]string{"app", "pid"},
+			nil,
+		),
 
 		// Web Service Cache
 		ServiceCache_ActiveFlushedEntries: prometheus.NewDesc(
@@ -1543,7 +1575,7 @@ func (c *IISCollector) collectW3SVC_W3WP(ctx *ScrapeContext, ch chan<- prometheu
 
 		if c.iis_version.major >= 8 {
 			var W3SVC_W3WP_IIS8 []perflibW3SVC_W3WP_IIS8
-			if err := unmarshalObject(ctx.perfObjects["W3SVC_W3WP"], &W3SVC_W3WP); err != nil {
+			if err := unmarshalObject(ctx.perfObjects["W3SVC_W3WP"], &W3SVC_W3WP_IIS8); err != nil {
 				return nil, err
 			}