dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Spelling + Readme/Changelog updates

This commit is contained in:
martinrusev 2015-11-06 12:46:20 +02:00
parent f3ef4e64f1
commit 1f5bef1caf
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ changed to just run docker commands in the Makefile. See `make docker-run` and
- [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive! - [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive!
- [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter! - [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter!
- [#338](https://github.com/influxdb/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac! - [#338](https://github.com/influxdb/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac!
- [#350](https://github.com/influxdb/telegraf/pull/350): Amon output.
### Bugfixes ### Bugfixes
- [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin. - [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin.

1
README.md
View File

@ -225,6 +225,7 @@ found by running `telegraf -sample-config`.
* mqtt * mqtt
* librato * librato
* prometheus * prometheus
* amon
## Contributing ## Contributing

6
outputs/amon/amon.go
View File

@ -25,8 +25,8 @@ var sampleConfig = `
# Amon Server Key # Amon Server Key
serverkey = "my-server-key" # required. serverkey = "my-server-key" # required.
# Amon Insance URL # Amon Instance URL
amoninstance = "https://youramoninstance" # required amon_instance = "https://youramoninstance" # required
# Connection timeout. # Connection timeout.
# timeout = "5s" # timeout = "5s"
@ -45,7 +45,7 @@ type Point [2]float64
func (a *Amon) Connect() error { func (a *Amon) Connect() error {
if a.ServerKey == "" || a.AmonInstance == "" { if a.ServerKey == "" || a.AmonInstance == "" {
return fmt.Errorf("serverkey and amoninstance are required fields for amon output") return fmt.Errorf("serverkey and amon_instance are required fields for amon output")
} }
a.client = &http.Client{ a.client = &http.Client{
Timeout: a.Timeout.Duration, Timeout: a.Timeout.Duration,