From 0f7f8f258334f406b626e6581755f8ae70e65883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 20 Jul 2025 08:15:50 +0200 Subject: [PATCH] [0.30] iis: missing metrics if app-include is set. (#2103) (#2141) --- internal/collector/iis/iis_w3svc_w3wp.go | 4 ---- internal/collector/iis/iis_web_service_cache.go | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/internal/collector/iis/iis_w3svc_w3wp.go b/internal/collector/iis/iis_w3svc_w3wp.go index c40e391c..ffbdac21 100644 --- a/internal/collector/iis/iis_w3svc_w3wp.go +++ b/internal/collector/iis/iis_w3svc_w3wp.go @@ -505,10 +505,6 @@ func (c *Collector) collectW3SVCW3WPv7(ch chan<- prometheus.Metric) error { deduplicateIISNames(c.perfDataObjectW3SVCW3WP) for _, data := range c.perfDataObjectW3SVCW3WP { - if c.config.AppExclude.MatchString(data.Name) || !c.config.AppInclude.MatchString(data.Name) { - continue - } - // Extract the apppool name from the format _ pid := workerProcessNameExtractor.ReplaceAllString(data.Name, "$1") diff --git a/internal/collector/iis/iis_web_service_cache.go b/internal/collector/iis/iis_web_service_cache.go index b662eb50..d369fad4 100644 --- a/internal/collector/iis/iis_web_service_cache.go +++ b/internal/collector/iis/iis_web_service_cache.go @@ -62,8 +62,6 @@ type collectorWebServiceCache struct { } type perfDataCounterServiceCache struct { - Name string - ServiceCacheActiveFlushedEntries float64 `perfdata:"Active Flushed Entries"` ServiceCacheCurrentFileCacheMemoryUsage float64 `perfdata:"Current File Cache Memory Usage"` ServiceCacheMaximumFileCacheMemoryUsage float64 `perfdata:"Maximum File Cache Memory Usage"` @@ -100,10 +98,6 @@ type perfDataCounterServiceCache struct { ServiceCacheOutputCacheFlushesTotal float64 `perfdata:"Output Cache Total Flushes"` } -func (p perfDataCounterServiceCache) GetName() string { - return p.Name -} - func (c *Collector) buildWebServiceCache() error { var err error @@ -291,13 +285,7 @@ func (c *Collector) collectWebServiceCache(ch chan<- prometheus.Metric) error { return fmt.Errorf("failed to collect Web Service Cache metrics: %w", err) } - deduplicateIISNames(c.perfDataObjectServiceCache) - for _, data := range c.perfDataObjectServiceCache { - if c.config.SiteExclude.MatchString(data.Name) || !c.config.SiteInclude.MatchString(data.Name) { - continue - } - ch <- prometheus.MustNewConstMetric( c.serviceCacheActiveFlushedEntries, prometheus.GaugeValue,