diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63c4403cb..e0e2fa32c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - [#1138](https://github.com/influxdata/telegraf/pull/1138): nstat input plugin. Thanks @Maksadbek!
 - [#1139](https://github.com/influxdata/telegraf/pull/1139): instrumental output plugin. Thanks @jasonroelofs!
+- [#1172](https://github.com/influxdata/telegraf/pull/1172): Ceph storage stats. Thanks @robinpercy!
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index b6cc91536..3b969639e 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,7 @@ Currently implemented sources:
 * [apache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/apache)
 * [bcache](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/bcache)
 * [cassandra](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/cassandra)
+* [ceph](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/ceph)
 * [couchbase](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchbase)
 * [couchdb](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/couchdb)
 * [disque](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/disque)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 8ac753c1d..714a5cb4e 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -196,6 +196,21 @@
 #   timeout = 2
 
 
+# # Configuration for sending metrics to an Instrumental project
+# [[outputs.instrumental]]
+#   ## Project API Token (required)
+#   api_token = "API Token" # required
+#   ## Prefix the metrics with a given name
+#   prefix = ""
+#   ## Stats output template (Graphite formatting)
+#   ## see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md#graphite
+#   template = "host.tags.measurement.field"
+#   ## Timeout in seconds to connect
+#   timeout = "2s"
+#   ## Display Communcation to Instrumental
+#   debug = false
+
+
 # # Configuration for the Kafka server to send metrics to
 # [[outputs.kafka]]
 #   ## URLs of kafka brokers
@@ -369,24 +384,6 @@
 #                            INPUT PLUGINS                                    #
 ###############################################################################
 
-# # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
-# [[inputs.ceph]]
-#   ## All configuration values are optional, defaults are shown below
-#
-#    ## location of ceph binary
-#    ceph_binary = "/usr/bin/ceph"
-#
-#    ## directory in which to look for socket files
-#    socket_dir = "/var/run/ceph"
-#
-#    ## prefix of MON and OSD socket files, used to determine socket type
-#    mon_prefix = "ceph-mon"
-#    osd_prefix = "ceph-osd"
-#
-#    ## suffix used to identify socket files
-#    socket_suffix = "asok"
-
-
 # Read metrics about cpu usage
 [[inputs.cpu]]
   ## Whether to report per-cpu stats or not
@@ -487,6 +484,24 @@
 #   ]
 
 
+# # Collects performance metrics from the MON and OSD nodes in a Ceph storage cluster.
+# [[inputs.ceph]]
+#   ## All configuration values are optional, defaults are shown below
+# 
+#   ## location of ceph binary
+#   ceph_binary = "/usr/bin/ceph"
+# 
+#   ## directory in which to look for socket files
+#   socket_dir = "/var/run/ceph"
+# 
+#   ## prefix of MON and OSD socket files, used to determine socket type
+#   mon_prefix = "ceph-mon"
+#   osd_prefix = "ceph-osd"
+# 
+#   ## suffix used to identify socket files
+#   socket_suffix = "asok"
+
+
 # # Pull Metric Statistics from Amazon CloudWatch
 # [[inputs.cloudwatch]]
 #   ## Amazon Region
@@ -866,8 +881,8 @@
 #   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
 #   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
 #   ##  e.g.
-#   ##    root:passwd@tcp(127.0.0.1:3306)/?tls=false
-#   ##    root@tcp(127.0.0.1:3306)/?tls=false
+#   ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
+#   ##    db_user@tcp(127.0.0.1:3306)/?tls=false
 #   #
 #   ## If no servers are specified, then localhost is used as the host.
 #   servers = ["tcp(127.0.0.1:3306)/"]