Merge pull request #476 from sll552/fix_domain_hostname

Fix cs collector crashing when running on a domain joined machine
prometheus-community · Mar 4, 2020 · 890fdc2 · 890fdc2
2 parents 74d7332 + d1a8078
commit 890fdc2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/collector/cs.go b/collector/cs.go
@@ -67,7 +67,7 @@ type Win32_ComputerSystem struct {
 	TotalPhysicalMemory       uint64
 	DNSHostname               string
 	Domain                    string
-	Workgroup                 string
+	Workgroup                 *string
 }
 
 func (c *CSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
@@ -93,7 +93,7 @@ func (c *CSCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, er
 	)
 
 	var fqdn string
-	if dst[0].Domain != dst[0].Workgroup {
+	if dst[0].Workgroup == nil || dst[0].Domain != *dst[0].Workgroup {
 		fqdn = dst[0].DNSHostname + "." + dst[0].Domain
 	} else {
 		fqdn = dst[0].DNSHostname