Merge pull request #476 from sll552/fix_domain_hostname

Fix cs collector crashing when running on a domain joined machine
This commit is contained in:
Calle Pettersson
2020-03-04 14:54:49 +01:00
committed by GitHub

View File

@@ -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