From 1f5bef1caf78b5b07567a325bbe8cbeac1fb2de5 Mon Sep 17 00:00:00 2001
From: martinrusev <martin@amon.cx>
Date: Fri, 6 Nov 2015 12:46:20 +0200
Subject: [PATCH] Spelling + Readme/Changelog updates

---
 CHANGELOG.md         | 1 +
 README.md            | 1 +
 outputs/amon/amon.go | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee4a9ad0..c24ecd761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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!
 - [#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!
+- [#350](https://github.com/influxdb/telegraf/pull/350): Amon output.
 
 ### Bugfixes
 - [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin.
diff --git a/README.md b/README.md
index 4b6bd636f..864510069 100644
--- a/README.md
+++ b/README.md
@@ -225,6 +225,7 @@ found by running `telegraf -sample-config`.
 * mqtt
 * librato
 * prometheus
+* amon
 
 ## Contributing
 
diff --git a/outputs/amon/amon.go b/outputs/amon/amon.go
index 662050147..bbe214612 100644
--- a/outputs/amon/amon.go
+++ b/outputs/amon/amon.go
@@ -25,8 +25,8 @@ var sampleConfig = `
   # Amon Server Key
   serverkey = "my-server-key" # required.
 
-  # Amon Insance URL
-  amoninstance = "https://youramoninstance" # required
+  # Amon Instance URL
+  amon_instance = "https://youramoninstance" # required
 
   # Connection timeout.
   # timeout = "5s"
@@ -45,7 +45,7 @@ type Point [2]float64
 
 func (a *Amon) Connect() error {
 	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{
 		Timeout: a.Timeout.Duration,