Merge pull request #480 from martinlindhe/fix-versioning

Fix versioning in binary
2026-02-09 14:36:38 +00:00 · 2020-03-05 21:30:25 +01:00 · 2020-03-05 21:15:26 +01:00 · 2020-03-04 14:54:49 +01:00 · 2020-03-04 14:49:59 +01:00
2 changed files with 7 additions and 7 deletions
--- a/.promu.yml
+++ b/.promu.yml
@@ -4,11 +4,11 @@ build:
    binaries:
        - name: wmi_exporter
    ldflags: |
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Version={{.Version}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Revision={{.Revision}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.Branch={{.Branch}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-        -X {{repoPath}}/vendor/github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+        -X github.com/prometheus/common/version.Version={{.Version}}
+        -X github.com/prometheus/common/version.Revision={{.Revision}}
+        -X github.com/prometheus/common/version.Branch={{.Branch}}
+        -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+        -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 tarball:
    files:
        - LICENSE
--- 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
Author	SHA1	Message	Date
Calle Pettersson	af250824f7	Merge pull request #480 from martinlindhe/fix-versioning Fix versioning in binary	2020-03-05 21:30:25 +01:00
Calle Pettersson	7f57491fac	Fix versioning in binary	2020-03-05 21:15:26 +01:00
Calle Pettersson	890fdc2996	Merge pull request #476 from sll552/fix_domain_hostname Fix cs collector crashing when running on a domain joined machine	2020-03-04 14:54:49 +01:00
Stefan Lengauer	d1a807840c	Fix cs collector crashing when running on a domain joined machine The wmi lib does some type checking for nil values. Use a pointer as a workaround for that.	2020-03-04 14:49:59 +01:00