From 62961c6bc967db462b04b2cc317c0f1cb8ca4439 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 6 Apr 2016 13:49:50 -0600
Subject: [PATCH] Update README and etc/telegraf.conf

---
 README.md         |  1 +
 etc/telegraf.conf | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 9813ca6d4..caa562a6d 100644
--- a/README.md
+++ b/README.md
@@ -156,6 +156,7 @@ more information on each, please look at the directory of the same name in
 
 Currently implemented sources:
 
+* [aws cloudwatch](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/cloudwatch)
 * [aerospike](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/aerospike)
 * [apache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/apache)
 * [bcache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/bcache)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 3d65aaf62..1b534d888 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -429,6 +429,36 @@
 #   bcacheDevs = ["bcache0"]
 
 
+# # Pull Metric Statistics from Amazon CloudWatch
+# [[inputs.cloudwatch]]
+#   ## Amazon Region
+#   region = 'us-east-1'
+# 
+#   ## Requested CloudWatch aggregation Period (required - must be a multiple of 60s)
+#   period = '1m'
+# 
+#   ## Collection Delay (required - must account for metrics availability via CloudWatch API)
+#   delay = '1m'
+# 
+#   ## Recomended: use metric 'interval' that is a multiple of 'period' to avoid 
+#   ## gaps or overlap in pulled data
+#   interval = '1m'
+# 
+#   ## Metric Statistic Namespace (required)
+#   namespace = 'AWS/ELB'
+# 
+#   ## Metrics to Pull (optional)
+#   ## Defaults to all Metrics in Namespace if nothing is provided
+#   ## Refreshes Namespace available metrics every 1h
+#   #[[inputs.cloudwatch.metrics]]
+#   #  names = ['Latency', 'RequestCount']
+#   #	
+#   #  ## Dimension filters for Metric (optional)
+#   #  [[inputs.cloudwatch.metrics.dimensions]]
+#   #    name = 'LoadBalancerName'
+#   #    value = 'p-example'
+
+
 # # Read metrics from one or many couchbase clusters
 # [[inputs.couchbase]]
 #   ## specify servers via a url matching:
@@ -1245,10 +1275,6 @@
 #   ## calculation of percentiles. Raising this limit increases the accuracy
 #   ## of percentiles but also increases the memory usage and cpu time.
 #   percentile_limit = 1000
-# 
-#   ## UDP packet size for the server to listen for. This will depend on the size
-#   ## of the packets that the client is sending, which is usually 1500 bytes.
-#   udp_packet_size = 1500
 
 
 # # Generic TCP listener
@@ -1279,11 +1305,6 @@
 #   ## UDP listener will start dropping packets.
 #   allowed_pending_messages = 10000
 # 
-#   ## UDP packet size for the server to listen for. This will depend
-#   ## on the size of the packets that the client is sending, which is
-#   ## usually 1500 bytes, but can be as large as 65,535 bytes.
-#   udp_packet_size = 1500
-# 
 #   ## Data format to consume.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here: