Merge pull request #2762 from alexandredantas/master

Use node name always false
hashicorp · Jul 2, 2017 · 79d323d · 79d323d
2 parents 47c9637 + 8d07eca
commit 79d323d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/command/agent/config.go b/command/agent/config.go
@@ -1053,6 +1053,10 @@ func (a *Telemetry) Merge(b *Telemetry) *Telemetry {
 	if b.DisableHostname {
 		result.DisableHostname = true
 	}
+
+	if b.UseNodeName {
+		result.UseNodeName = true
+	}
 	if b.CollectionInterval != "" {
 		result.CollectionInterval = b.CollectionInterval
 	}