luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merging telemetry configs

Browse source
This commit is contained in:
Diptanu Choudhury 2016-08-31 11:19:00 -07:00
parent e9b27a528c
commit a80f67d097
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

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

6
command/agent/config.go
View file

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