status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-24 03:18:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #243 from nelhage/statsite

Browse Source 
Fix statsite integration
This commit is contained in:
Armon Dadgar 2014-07-11 10:52:04 -07:00
commit 00f60082b4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/agent/config.go
View File

@ -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
}

7
website/source/docs/agent/telemetry.html.markdown
View File

@ -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: