Merging telemetry configs

CHANGELOG.md

@@ -60,6 +60,7 @@ BUG FIXES:
     terminal [GH-1508]
   * agent: Fix advertise address when using IPv6 [GH-1465]
   * cli: Fix node-status when using IPv6 advertise address [GH-1465]
+  * client: Merging telemetry configuration properly [GH-1670]
   * client: Task start errors adhere to restart policy mode [GH-1405]
   * client: Reregister with servers if node is unregistered [GH-1593]
   * client: Killing an allocation doesn't cause allocation stats to block

command/agent/config.go

@@ -767,6 +767,12 @@ func (a *Telemetry) Merge(b *Telemetry) *Telemetry {
 	if b.collectionInterval != 0 {
 		result.collectionInterval = b.collectionInterval
 	}
+	if b.PublishNodeMetrics {
+		result.PublishNodeMetrics = true
+	}
+	if b.PublishAllocationMetrics {
+		result.PublishAllocationMetrics = true
+	}
 	if b.CirconusAPIToken != "" {
 		result.CirconusAPIToken = b.CirconusAPIToken
 	}