Merge pull request #256 from martinlindhe/mssql-clean-instance-names

Strip special chars from instance names

README.md

@@ -76,7 +76,10 @@ The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182
 
     .\wmi_exporter.exe --collectors.enabled "process" --collector.process.processes-where "Name LIKE 'firefox%'"
 
-When there are multiple processes with the same name, WMI represents those after the first instance as `process-name#index`. So to get them all, rather than just the first one, the query needs to be a wildcard search.
+When there are multiple processes with the same name, WMI represents those after the first instance as `process-name#index`. So to get them all, rather than just the first one, the query needs to be a wildcard search using a `%` character.
+
+Please note that in Windows batch scripts (and when using the `cmd` command prompt), the `%` character is reserved, so it has to be escaped with another `%`. For example, the wildcard syntax for searching for all firefox processes is `firefox%%`.
+
 
 ## License
 

collector/ad.go

@@ -3,6 +3,8 @@
 package collector
 
 import (
+	"errors"
+
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
@@ -616,6 +618,9 @@ func (c *ADCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, er
 	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.AddressBookOperationsTotal,

collector/cs.go

@@ -4,6 +4,8 @@
 package collector
 
 import (
+	"errors"
+
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
@@ -60,6 +62,9 @@ func (c *CSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, er
 	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.LogicalProcessors,

collector/dns.go

@@ -4,6 +4,8 @@
 package collector
 
 import (
+	"errors"
+
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
@@ -237,6 +239,9 @@ func (c *DNSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, e
 	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ZoneTransferRequestsReceived,

collector/iis.go

@@ -7,6 +7,7 @@
 package collector
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 
@@ -1738,216 +1739,218 @@ func (c *IISCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, e
 		return nil, err
 	}
 
-	if len(dst_cache) > 0 {
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_ActiveFlushedEntries,
-			prometheus.GaugeValue,
-			float64(dst_cache[0].ActiveFlushedEntries),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_FileCacheMemoryUsage,
-			prometheus.GaugeValue,
-			float64(dst_cache[0].CurrentFileCacheMemoryUsage),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_MaximumFileCacheMemoryUsage,
-			prometheus.CounterValue,
-			float64(dst_cache[0].MaximumFileCacheMemoryUsage),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_FileCacheFlushesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalFlushedFiles),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_FileCacheQueriesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].FileCacheHits+dst_cache[0].FileCacheMisses),
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_FileCacheHitsTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].FileCacheHits),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_FilesCached,
-			prometheus.GaugeValue,
-			float64(dst_cache[0].CurrentFilesCached),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_FilesCachedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalFilesCached),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_FilesFlushedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalFlushedFiles),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URICacheFlushesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalFlushedURIs),
-			"user",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URICacheFlushesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].KernelTotalFlushedURIs),
-			"kernel",
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URICacheQueriesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].URICacheHits+dst_cache[0].URICacheMisses),
-			"user",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URICacheQueriesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].KernelURICacheHits+dst_cache[0].KernelURICacheMisses),
-			"kernel",
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URICacheHitsTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].URICacheHits),
-			"user",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URICacheHitsTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].KernelURICacheHits),
-			"kernel",
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URIsCached,
-			prometheus.GaugeValue,
-			float64(dst_cache[0].CurrentURIsCached),
-			"user",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URIsCached,
-			prometheus.GaugeValue,
-			float64(dst_cache[0].KernelCurrentURIsCached),
-			"kernel",
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URIsCachedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalURIsCached),
-			"user",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URIsCachedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].KernelTotalURIsCached),
-			"kernel",
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URIsFlushedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalFlushedURIs),
-			"user",
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_URIsFlushedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].KernelTotalFlushedURIs),
-			"kernel",
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_MetadataCached,
-			prometheus.GaugeValue,
-			float64(dst_cache[0].CurrentMetadataCached),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_MetadataCacheFlushes,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalFlushedMetadata),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_MetadataCacheQueriesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].MetadataCacheHits+dst_cache[0].MetadataCacheMisses),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_MetadataCacheHitsTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].MetadataCacheHits),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_MetadataCachedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalMetadataCached),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_MetadataFlushedTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].TotalFlushedMetadata),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_OutputCacheActiveFlushedItems,
-			prometheus.CounterValue,
-			float64(dst_cache[0].OutputCacheCurrentFlushedItems),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_OutputCacheItems,
-			prometheus.CounterValue,
-			float64(dst_cache[0].OutputCacheCurrentItems),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_OutputCacheMemoryUsage,
-			prometheus.CounterValue,
-			float64(dst_cache[0].OutputCacheCurrentMemoryUsage),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_OutputCacheQueriesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].OutputCacheTotalHits+dst_cache[0].OutputCacheTotalMisses),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_OutputCacheHitsTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].OutputCacheTotalHits),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_OutputCacheFlushedItemsTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].OutputCacheTotalFlushedItems),
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.ServiceCache_OutputCacheFlushesTotal,
-			prometheus.CounterValue,
-			float64(dst_cache[0].OutputCacheTotalFlushes),
-		)
+	if len(dst_cache) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
 	}
 
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_ActiveFlushedEntries,
+		prometheus.GaugeValue,
+		float64(dst_cache[0].ActiveFlushedEntries),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_FileCacheMemoryUsage,
+		prometheus.GaugeValue,
+		float64(dst_cache[0].CurrentFileCacheMemoryUsage),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_MaximumFileCacheMemoryUsage,
+		prometheus.CounterValue,
+		float64(dst_cache[0].MaximumFileCacheMemoryUsage),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_FileCacheFlushesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalFlushedFiles),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_FileCacheQueriesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].FileCacheHits+dst_cache[0].FileCacheMisses),
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_FileCacheHitsTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].FileCacheHits),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_FilesCached,
+		prometheus.GaugeValue,
+		float64(dst_cache[0].CurrentFilesCached),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_FilesCachedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalFilesCached),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_FilesFlushedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalFlushedFiles),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URICacheFlushesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalFlushedURIs),
+		"user",
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URICacheFlushesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].KernelTotalFlushedURIs),
+		"kernel",
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URICacheQueriesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].URICacheHits+dst_cache[0].URICacheMisses),
+		"user",
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URICacheQueriesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].KernelURICacheHits+dst_cache[0].KernelURICacheMisses),
+		"kernel",
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URICacheHitsTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].URICacheHits),
+		"user",
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URICacheHitsTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].KernelURICacheHits),
+		"kernel",
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URIsCached,
+		prometheus.GaugeValue,
+		float64(dst_cache[0].CurrentURIsCached),
+		"user",
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URIsCached,
+		prometheus.GaugeValue,
+		float64(dst_cache[0].KernelCurrentURIsCached),
+		"kernel",
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URIsCachedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalURIsCached),
+		"user",
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URIsCachedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].KernelTotalURIsCached),
+		"kernel",
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URIsFlushedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalFlushedURIs),
+		"user",
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_URIsFlushedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].KernelTotalFlushedURIs),
+		"kernel",
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_MetadataCached,
+		prometheus.GaugeValue,
+		float64(dst_cache[0].CurrentMetadataCached),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_MetadataCacheFlushes,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalFlushedMetadata),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_MetadataCacheQueriesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].MetadataCacheHits+dst_cache[0].MetadataCacheMisses),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_MetadataCacheHitsTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].MetadataCacheHits),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_MetadataCachedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalMetadataCached),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_MetadataFlushedTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].TotalFlushedMetadata),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_OutputCacheActiveFlushedItems,
+		prometheus.CounterValue,
+		float64(dst_cache[0].OutputCacheCurrentFlushedItems),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_OutputCacheItems,
+		prometheus.CounterValue,
+		float64(dst_cache[0].OutputCacheCurrentItems),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_OutputCacheMemoryUsage,
+		prometheus.CounterValue,
+		float64(dst_cache[0].OutputCacheCurrentMemoryUsage),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_OutputCacheQueriesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].OutputCacheTotalHits+dst_cache[0].OutputCacheTotalMisses),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_OutputCacheHitsTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].OutputCacheTotalHits),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_OutputCacheFlushedItemsTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].OutputCacheTotalFlushedItems),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		c.ServiceCache_OutputCacheFlushesTotal,
+		prometheus.CounterValue,
+		float64(dst_cache[0].OutputCacheTotalFlushes),
+	)
+
 	return nil, nil
 }

collector/os.go

@@ -4,6 +4,7 @@
 package collector
 
 import (
+	"errors"
 	"time"
 
 	"github.com/StackExchange/wmi"
@@ -142,6 +143,10 @@ func (c *OSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, er
 		return nil, err
 	}
 
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
+
 	ch <- prometheus.MustNewConstMetric(
 		c.PhysicalMemoryFreeBytes,
 		prometheus.GaugeValue,

collector/system.go

@@ -4,6 +4,7 @@
 package collector
 
 import (
+	"errors"
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
@@ -94,6 +95,9 @@ func (c *SystemCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc
 	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ContextSwitchesTotal,

collector/tcp.go

@@ -5,6 +5,7 @@
 package collector
 
 import (
+	"errors"
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
@@ -118,6 +119,9 @@ func (c *TCPCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, e
 	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	// Counters
 	ch <- prometheus.MustNewConstMetric(

collector/vmware.go

@@ -2,6 +2,8 @@
 package collector
 
 import (
+	"errors"
+
 	"github.com/StackExchange/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
@@ -201,6 +203,9 @@ func (c *VmwareCollector) collectMem(ch chan<- prometheus.Metric) (*prometheus.D
 	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.MemActive,
@@ -287,6 +292,9 @@ func (c *VmwareCollector) collectCpu(ch chan<- prometheus.Metric) (*prometheus.D
 	if err := wmi.Query(q, &dst); err != nil {
 		return nil, err
 	}
+	if len(dst) == 0 {
+		return nil, errors.New("WMI query returned empty result set")
+	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.CpuLimitMHz,

exporter.go

@@ -185,7 +185,7 @@ func main() {
 		).Default("/metrics").String()
 		enabledCollectors = kingpin.Flag(
 			"collectors.enabled",
-			"Comma-separated list of collectors to use. Use '[default]' as a placeholder for all the collectors enabled by default.").
+			"Comma-separated list of collectors to use. Use '[defaults]' as a placeholder for all the collectors enabled by default.").
 			Default(filterAvailableCollectors(defaultCollectors)).String()
 		printCollectors = kingpin.Flag(
 			"collectors.print",