exchange: fix The specified counter could not be found (#1994) (#2038)

jkroepke · web-flow · commit 62b796e6f605 · 2025-05-17T14:12:43.000+02:00
diff --git a/docs/collector.exchange.md b/docs/collector.exchange.md
@@ -43,7 +43,7 @@ Comma-separated list of collectors to use, for example: `--collectors.exchange.e
 | `windows_exchange_transport_queues_messages_submitted_total`                | Messages Submitted Total                                                                                    |
 | `windows_exchange_transport_queues_messages_delayed_total`                  | Messages Delayed Total                                                                                      |
 | `windows_exchange_transport_queues_messages_completed_delivery_total`       | Messages Completed Delivery Total                                                                           |
-| `windows_exchange_transport_queues_shadow_queue_length`                     | Shadow Queue Length                                                                                         |
+| `windows_exchange_transport_queues_aggregate_shadow_queue_length`           | The current number of messages in shadow queues                                                             |
 | `windows_exchange_transport_queues_submission_queue_length`                 | Submission Queue Length                                                                                     |
 | `windows_exchange_transport_queues_delay_queue_length`                      | Delay Queue Length                                                                                          |
 | `windows_exchange_transport_queues_items_completed_delivery_total`          | Items Completed Delivery Total                                                                              |
@@ -54,7 +54,7 @@ Comma-separated list of collectors to use, for example: `--collectors.exchange.e
 | `windows_exchange_http_proxy_avg_auth_latency`                              | Average time spent authenticating CAS requests over the last 200 samples                                    |
 | `windows_exchange_http_proxy_outstanding_proxy_requests`                    | Number of concurrent outstanding proxy requests                                                             |
 | `windows_exchange_http_proxy_requests_total`                                | Number of proxy requests processed each second                                                              |
-| `windows_exchange_avail_service_requests_per_sec`                           | Number of requests serviced per second                                                                      |
+| `windows_exchange_availability_service_requests_per_sec`                    | Number of requests serviced per second                                                                      |
 | `windows_exchange_owa_current_unique_users`                                 | Number of unique users currently logged on to Outlook Web App                                               |
 | `windows_exchange_owa_requests_total`                                       | Number of requests handled by Outlook Web App per second                                                    |
 | `windows_exchange_autodiscover_requests_total`                              | Number of autodiscover service requests processed each second                                               |
@@ -77,4 +77,3 @@ _This collector does not yet have any useful queries added, we would appreciate
 
 ## Alerting examples
 _This collector does not yet have alerting examples, we would appreciate your help adding them!_
-
diff --git a/internal/collector/exchange/exchange_autodiscover.go b/internal/collector/exchange/exchange_autodiscover.go
@@ -37,7 +37,7 @@ type perfDataCounterValuesAutoDiscover struct {
 func (c *Collector) buildAutoDiscover() error {
 	var err error
 
-	c.perfDataCollectorAutoDiscover, err = pdh.NewCollector[perfDataCounterValuesAutoDiscover](pdh.CounterTypeRaw, "MSExchange Autodiscover", pdh.InstancesAll)
+	c.perfDataCollectorAutoDiscover, err = pdh.NewCollector[perfDataCounterValuesAutoDiscover](pdh.CounterTypeRaw, "MSExchangeAutodiscover", nil)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange Autodiscover collector: %w", err)
 	}
diff --git a/internal/collector/exchange/exchange_availability_service.go b/internal/collector/exchange/exchange_availability_service.go
@@ -31,7 +31,7 @@ type collectorAvailabilityService struct {
 }
 
 type perfDataCounterValuesAvailabilityService struct {
-	RequestsPerSec float64 `perfdata:"Requests/sec"`
+	AvailabilityRequestsPerSec float64 `perfdata:"Availability Requests (sec)"`
 }
 
 func (c *Collector) buildAvailabilityService() error {
@@ -43,7 +43,7 @@ func (c *Collector) buildAvailabilityService() error {
 	}
 
 	c.availabilityRequestsSec = prometheus.NewDesc(
-		prometheus.BuildFQName(types.Namespace, Name, "avail_service_requests_per_sec"),
+		prometheus.BuildFQName(types.Namespace, Name, "availability_service_requests_per_sec"),
 		"Number of requests serviced per second",
 		nil,
 		nil,
@@ -62,7 +62,7 @@ func (c *Collector) collectAvailabilityService(ch chan<- prometheus.Metric) erro
 		ch <- prometheus.MustNewConstMetric(
 			c.availabilityRequestsSec,
 			prometheus.CounterValue,
-			data.RequestsPerSec,
+			data.AvailabilityRequestsPerSec,
 		)
 	}
 
diff --git a/internal/collector/exchange/exchange_transport_queues.go b/internal/collector/exchange/exchange_transport_queues.go
@@ -39,7 +39,7 @@ type collectorTransportQueues struct {
 	messagesSubmittedTotal                  *prometheus.Desc
 	messagesDelayedTotal                    *prometheus.Desc
 	messagesCompletedDeliveryTotal          *prometheus.Desc
-	shadowQueueLength                       *prometheus.Desc
+	aggregateShadowQueueLength              *prometheus.Desc
 	submissionQueueLength                   *prometheus.Desc
 	delayQueueLength                        *prometheus.Desc
 	itemsCompletedDeliveryTotal             *prometheus.Desc
@@ -63,7 +63,7 @@ type perfDataCounterValuesTransportQueues struct {
 	MessagesSubmittedTotal                  float64 `perfdata:"Messages Submitted Total"`
 	MessagesDelayedTotal                    float64 `perfdata:"Messages Delayed Total"`
 	MessagesCompletedDeliveryTotal          float64 `perfdata:"Messages Completed Delivery Total"`
-	ShadowQueueLength                       float64 `perfdata:"Shadow Queue Length"`
+	AggregateShadowQueueLength              float64 `perfdata:"Aggregate Shadow Queue Length"`
 	SubmissionQueueLength                   float64 `perfdata:"Submission Queue Length"`
 	DelayQueueLength                        float64 `perfdata:"Delay Queue Length"`
 	ItemsCompletedDeliveryTotal             float64 `perfdata:"Items Completed Delivery Total"`
@@ -152,9 +152,9 @@ func (c *Collector) buildTransportQueues() error {
 		[]string{"name"},
 		nil,
 	)
-	c.shadowQueueLength = prometheus.NewDesc(
-		prometheus.BuildFQName(types.Namespace, Name, "transport_queues_shadow_queue_length"),
-		"Shadow Queue Length",
+	c.aggregateShadowQueueLength = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "transport_queues_aggregate_shadow_queue_length"),
+		"The current number of messages in shadow queues.",
 		[]string{"name"},
 		nil,
 	)
@@ -280,9 +280,9 @@ func (c *Collector) collectTransportQueues(ch chan<- prometheus.Metric) error {
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.shadowQueueLength,
+			c.aggregateShadowQueueLength,
 			prometheus.GaugeValue,
-			data.ShadowQueueLength,
+			data.AggregateShadowQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ type perfDataCounterValuesAutoDiscover struct {`
`37`	`37`	`func (c *Collector) buildAutoDiscover() error {`
`38`	`38`	`var err error`
`39`	`39`
`40`		`- c.perfDataCollectorAutoDiscover, err = pdh.NewCollector[perfDataCounterValuesAutoDiscover](pdh.CounterTypeRaw, "MSExchange Autodiscover", pdh.InstancesAll)`
	`40`	`+ c.perfDataCollectorAutoDiscover, err = pdh.NewCollector[perfDataCounterValuesAutoDiscover](pdh.CounterTypeRaw, "MSExchangeAutodiscover", nil)`
`41`	`41`	`if err != nil {`
`42`	`42`	`return fmt.Errorf("failed to create MSExchange Autodiscover collector: %w", err)`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ type collectorAvailabilityService struct {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`type perfDataCounterValuesAvailabilityService struct {`
`34`		- RequestsPerSec float64 `perfdata:"Requests/sec"`
	`34`	+ AvailabilityRequestsPerSec float64 `perfdata:"Availability Requests (sec)"`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (c *Collector) buildAvailabilityService() error {`
`@@ -43,7 +43,7 @@ func (c *Collector) buildAvailabilityService() error {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`c.availabilityRequestsSec = prometheus.NewDesc(`
`46`		`- prometheus.BuildFQName(types.Namespace, Name, "avail_service_requests_per_sec"),`
	`46`	`+ prometheus.BuildFQName(types.Namespace, Name, "availability_service_requests_per_sec"),`
`47`	`47`	`"Number of requests serviced per second",`
`48`	`48`	`nil,`
`49`	`49`	`nil,`
`@@ -62,7 +62,7 @@ func (c *Collector) collectAvailabilityService(ch chan<- prometheus.Metric) erro`
`62`	`62`	`ch <- prometheus.MustNewConstMetric(`
`63`	`63`	`c.availabilityRequestsSec,`
`64`	`64`	`prometheus.CounterValue,`
`65`		`- data.RequestsPerSec,`
	`65`	`+ data.AvailabilityRequestsPerSec,`
`66`	`66`	`)`
`67`	`67`	`}`
`68`	`68`