diff --git a/command/agent/config.go b/command/agent/config.go index f08d545b18..9a6a043f8a 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -500,6 +500,9 @@ func MergeConfig(a, b *Config) *Config { if b.SkipLeaveOnInt == true { result.SkipLeaveOnInt = true } + if b.StatsiteAddr != "" { + result.StatsiteAddr = b.StatsiteAddr + } if b.EnableDebug { result.EnableDebug = true } diff --git a/website/source/docs/agent/telemetry.html.markdown b/website/source/docs/agent/telemetry.html.markdown index 473e2832de..1035304cc9 100644 --- a/website/source/docs/agent/telemetry.html.markdown +++ b/website/source/docs/agent/telemetry.html.markdown @@ -18,9 +18,10 @@ information to the stderr of the agent. In general, the telemetry information is used for debugging or otherwise getting a better view into what Consul is doing. -Additionally, if the `-statsite` [option](/docs/agent/options.html) is provided, -then the telemetry information will be streamed to a [statsite](http://github.com/armon/statsite) -server where it can be aggregate and flushed to Graphite or any other metrics store. +Additionally, if the `statsite_addr` [configuration option](/docs/agent/options.html) +is provided, then the telemetry information will be streamed to a +[statsite](http://github.com/armon/statsite) server where it can be +aggregate and flushed to Graphite or any other metrics store. Below is an example output: