From 8d07eca0122b03ecfebb606dae33419bf7239554 Mon Sep 17 00:00:00 2001
From: Alexandre Dantas <alexandre.dantas@yahoo.com.br>
Date: Sun, 2 Jul 2017 00:31:09 -0300
Subject: [PATCH] Fixing issue where use_node_name was always been set as false
 when merging telemetry configurations

---
 command/agent/config.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/command/agent/config.go b/command/agent/config.go
index ef4956e9b443..5ac93f728427 100644
--- 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
 	}