diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index d6f93a292..54b863dde 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1648,6 +1648,7 @@
 
 # # Configuration for the Riemann server to send metrics to
 # [[outputs.riemann_legacy]]
+#   ## DEPRECATED: The 'riemann_legacy' plugin is deprecated in version 1.3.0, use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878).
 #   ## URL of server
 #   url = "localhost:5555"
 #   ## transport protocol to use either tcp or udp
@@ -4536,6 +4537,7 @@
 
 # # Read flattened metrics from one or more JSON HTTP endpoints
 # [[inputs.httpjson]]
+#   ## DEPRECATED: The 'httpjson' plugin is deprecated in version 1.6.0, use 'inputs.http' instead.
 #   ## NOTE This plugin only reads numerical measurements, strings and booleans
 #   ## will be ignored.
 #
@@ -4808,6 +4810,7 @@
 
 # # Read JMX metrics through Jolokia
 # [[inputs.jolokia]]
+#   ## DEPRECATED: The 'jolokia' plugin is deprecated in version 1.5.0, use 'inputs.jolokia2' instead.
 #   # DEPRECATED: the jolokia plugin has been deprecated in favor of the
 #   # jolokia2 plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2
@@ -6685,6 +6688,7 @@
 
 # # DEPRECATED! PLEASE USE inputs.snmp INSTEAD.
 # [[inputs.snmp_legacy]]
+#   ## DEPRECATED: The 'snmp_legacy' plugin is deprecated in version 1.0.0, use 'inputs.snmp' instead.
 #   ## Use 'oids.txt' file to translate oids to names
 #   ## To generate 'oids.txt' you need to run:
 #   ##   snmptranslate -m all -Tz -On | sed -e 's/"//g' > /tmp/oids.txt
@@ -7401,6 +7405,7 @@
 
 # # Read Cassandra metrics through Jolokia
 # [[inputs.cassandra]]
+#   ## DEPRECATED: The 'cassandra' plugin is deprecated in version 1.7.0, use 'inputs.jolokia2' with the 'cassandra.conf' example configuration instead.
 #   ## DEPRECATED: The cassandra plugin has been deprecated.  Please use the
 #   ## jolokia2 plugin instead.
 #   ##
@@ -7938,6 +7943,7 @@
 
 # # Generic HTTP write listener
 # [[inputs.http_listener_v2]]
+#   ## DEPRECATED: The 'http_listener_v2' plugin is deprecated in version 1.9.0, has been renamed to 'influxdb_listener', use 'inputs.influxdb_listener' or 'inputs.influxdb_listener_v2' instead.
 #   ## Address and port to host HTTP listener on
 #   service_address = ":8080"
 #
@@ -8293,6 +8299,7 @@
 
 # # Read metrics from Kafka topic(s)
 # [[inputs.kafka_consumer_legacy]]
+#   ## DEPRECATED: The 'kafka_consumer_legacy' plugin is deprecated in version 1.4.0, use 'inputs.kafka_consumer' instead, NOTE: 'kafka_consumer' only supports Kafka v0.8+.
 #   ## topic(s) to consume
 #   topics = ["telegraf"]
 #
@@ -8421,6 +8428,7 @@
 
 # # Stream and parse log file(s).
 # [[inputs.logparser]]
+#   ## DEPRECATED: The 'logparser' plugin is deprecated in version 1.15.0, use 'inputs.tail' with 'grok' data format instead.
 #   ## Log files to parse.
 #   ## These accept standard unix glob matching rules, but with the addition of
 #   ## ** as a "super asterisk". ie:
@@ -9359,6 +9367,7 @@
 
 # # Generic TCP listener
 # [[inputs.tcp_listener]]
+#   ## DEPRECATED: The 'tcp_listener' plugin is deprecated in version 1.3.0, use 'inputs.socket_listener' instead.
 #   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
 #   # socket_listener plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
@@ -9366,6 +9375,7 @@
 
 # # Generic UDP listener
 # [[inputs.udp_listener]]
+#   ## DEPRECATED: The 'udp_listener' plugin is deprecated in version 1.3.0, use 'inputs.socket_listener' instead.
 #   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
 #   # socket_listener plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 6b6c99a03..4af5aaa7e 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -1648,6 +1648,7 @@
 
 # # Configuration for the Riemann server to send metrics to
 # [[outputs.riemann_legacy]]
+#   ## DEPRECATED: The 'riemann_legacy' plugin is deprecated in version 1.3.0, use 'outputs.riemann' instead (see https://github.com/influxdata/telegraf/issues/1878).
 #   ## URL of server
 #   url = "localhost:5555"
 #   ## transport protocol to use either tcp or udp
@@ -4474,6 +4475,7 @@
 
 # # Read flattened metrics from one or more JSON HTTP endpoints
 # [[inputs.httpjson]]
+#   ## DEPRECATED: The 'httpjson' plugin is deprecated in version 1.6.0, use 'inputs.http' instead.
 #   ## NOTE This plugin only reads numerical measurements, strings and booleans
 #   ## will be ignored.
 #
@@ -4710,6 +4712,7 @@
 
 # # Read JMX metrics through Jolokia
 # [[inputs.jolokia]]
+#   ## DEPRECATED: The 'jolokia' plugin is deprecated in version 1.5.0, use 'inputs.jolokia2' instead.
 #   # DEPRECATED: the jolokia plugin has been deprecated in favor of the
 #   # jolokia2 plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2
@@ -6542,6 +6545,7 @@
 
 # # DEPRECATED! PLEASE USE inputs.snmp INSTEAD.
 # [[inputs.snmp_legacy]]
+#   ## DEPRECATED: The 'snmp_legacy' plugin is deprecated in version 1.0.0, use 'inputs.snmp' instead.
 #   ## Use 'oids.txt' file to translate oids to names
 #   ## To generate 'oids.txt' you need to run:
 #   ##   snmptranslate -m all -Tz -On | sed -e 's/"//g' > /tmp/oids.txt
@@ -7355,6 +7359,7 @@
 
 # # Read Cassandra metrics through Jolokia
 # [[inputs.cassandra]]
+#   ## DEPRECATED: The 'cassandra' plugin is deprecated in version 1.7.0, use 'inputs.jolokia2' with the 'cassandra.conf' example configuration instead.
 #   ## DEPRECATED: The cassandra plugin has been deprecated.  Please use the
 #   ## jolokia2 plugin instead.
 #   ##
@@ -7892,6 +7897,7 @@
 
 # # Generic HTTP write listener
 # [[inputs.http_listener_v2]]
+#   ## DEPRECATED: The 'http_listener_v2' plugin is deprecated in version 1.9.0, has been renamed to 'influxdb_listener', use 'inputs.influxdb_listener' or 'inputs.influxdb_listener_v2' instead.
 #   ## Address and port to host HTTP listener on
 #   service_address = ":8080"
 #
@@ -8168,6 +8174,7 @@
 
 # # Read metrics from Kafka topic(s)
 # [[inputs.kafka_consumer_legacy]]
+#   ## DEPRECATED: The 'kafka_consumer_legacy' plugin is deprecated in version 1.4.0, use 'inputs.kafka_consumer' instead, NOTE: 'kafka_consumer' only supports Kafka v0.8+.
 #   ## topic(s) to consume
 #   topics = ["telegraf"]
 #
@@ -8296,6 +8303,7 @@
 
 # # Stream and parse log file(s).
 # [[inputs.logparser]]
+#   ## DEPRECATED: The 'logparser' plugin is deprecated in version 1.15.0, use 'inputs.tail' with 'grok' data format instead.
 #   ## Log files to parse.
 #   ## These accept standard unix glob matching rules, but with the addition of
 #   ## ** as a "super asterisk". ie:
@@ -9227,6 +9235,7 @@
 
 # # Generic TCP listener
 # [[inputs.tcp_listener]]
+#   ## DEPRECATED: The 'tcp_listener' plugin is deprecated in version 1.3.0, use 'inputs.socket_listener' instead.
 #   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
 #   # socket_listener plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener
@@ -9234,6 +9243,7 @@
 
 # # Generic UDP listener
 # [[inputs.udp_listener]]
+#   ## DEPRECATED: The 'udp_listener' plugin is deprecated in version 1.3.0, use 'inputs.socket_listener' instead.
 #   # DEPRECATED: the TCP listener plugin has been deprecated in favor of the
 #   # socket_listener plugin
 #   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/socket_listener