mirror of
https://github.com/prometheus-community/windows_exporter.git
synced 2026-03-05 01:56:35 +00:00
iis: missing metrics if app-include is set. (#2103)
This commit is contained in:
@@ -507,10 +507,6 @@ func (c *Collector) collectW3SVCW3WPv7(ch chan<- prometheus.Metric) error {
|
|||||||
deduplicateIISNames(c.perfDataObjectW3SVCW3WP)
|
deduplicateIISNames(c.perfDataObjectW3SVCW3WP)
|
||||||
|
|
||||||
for _, data := range 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>_<NAME>
|
// Extract the apppool name from the format <PID>_<NAME>
|
||||||
pid := workerProcessNameExtractor.ReplaceAllString(data.Name, "$1")
|
pid := workerProcessNameExtractor.ReplaceAllString(data.Name, "$1")
|
||||||
|
|
||||||
|
|||||||
@@ -64,8 +64,6 @@ type collectorWebServiceCache struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type perfDataCounterServiceCache struct {
|
type perfDataCounterServiceCache struct {
|
||||||
Name string
|
|
||||||
|
|
||||||
ServiceCacheActiveFlushedEntries float64 `perfdata:"Active Flushed Entries"`
|
ServiceCacheActiveFlushedEntries float64 `perfdata:"Active Flushed Entries"`
|
||||||
ServiceCacheCurrentFileCacheMemoryUsage float64 `perfdata:"Current File Cache Memory Usage"`
|
ServiceCacheCurrentFileCacheMemoryUsage float64 `perfdata:"Current File Cache Memory Usage"`
|
||||||
ServiceCacheMaximumFileCacheMemoryUsage float64 `perfdata:"Maximum File Cache Memory Usage"`
|
ServiceCacheMaximumFileCacheMemoryUsage float64 `perfdata:"Maximum File Cache Memory Usage"`
|
||||||
@@ -102,10 +100,6 @@ type perfDataCounterServiceCache struct {
|
|||||||
ServiceCacheOutputCacheFlushesTotal float64 `perfdata:"Output Cache Total Flushes"`
|
ServiceCacheOutputCacheFlushesTotal float64 `perfdata:"Output Cache Total Flushes"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p perfDataCounterServiceCache) GetName() string {
|
|
||||||
return p.Name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Collector) buildWebServiceCache() error {
|
func (c *Collector) buildWebServiceCache() error {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
@@ -293,13 +287,7 @@ func (c *Collector) collectWebServiceCache(ch chan<- prometheus.Metric) error {
|
|||||||
return fmt.Errorf("failed to collect Web Service Cache metrics: %w", err)
|
return fmt.Errorf("failed to collect Web Service Cache metrics: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
deduplicateIISNames(c.perfDataObjectServiceCache)
|
|
||||||
|
|
||||||
for _, data := range c.perfDataObjectServiceCache {
|
for _, data := range c.perfDataObjectServiceCache {
|
||||||
if c.config.SiteExclude.MatchString(data.Name) || !c.config.SiteInclude.MatchString(data.Name) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
ch <- prometheus.MustNewConstMetric(
|
ch <- prometheus.MustNewConstMetric(
|
||||||
c.serviceCacheActiveFlushedEntries,
|
c.serviceCacheActiveFlushedEntries,
|
||||||
prometheus.GaugeValue,
|
prometheus.GaugeValue,
|
||||||
|
|||||||
Reference in New Issue
Block a user