diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index f89d54b96..2c23864cf 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -313,6 +313,34 @@
 #   brokers = ["localhost:9092"]
 #   ## Kafka topic for producer messages
 #   topic = "telegraf"
+#
+#   ## Optional topic suffix configuration.
+#   ## If the section is omitted, no suffix is used.
+#   ## Following topic suffix methods are supported:
+#   ##   measurement - suffix equals to separator + measurement's name
+#   ##   tags        - suffix equals to separator + specified tags' values
+#   ##                 interleaved with separator
+#
+#   ## Suffix equals to "_" + measurement name
+#   # [outputs.kafka.topic_suffix]
+#   #   method = "measurement"
+#   #   separator = "_"
+#
+#   ## Suffix equals to "__" + measurement's "foo" tag value.
+#   ##   If there's no such a tag, suffix equals to an empty string
+#   # [outputs.kafka.topic_suffix]
+#   #   method = "tags"
+#   #   keys = ["foo"]
+#   #   separator = "__"
+#
+#   ## Suffix equals to "_" + measurement's "foo" and "bar"
+#   ##   tag values, separated by "_". If there is no such tags,
+#   ##   their values treated as empty strings.
+#   # [outputs.kafka.topic_suffix]
+#   #   method = "tags"
+#   #   keys = ["foo", "bar"]
+#   #   separator = "_"
+#
 #   ## Telegraf tag to use as a routing key
 #   ##  ie, if this tag exists, its value will be used as the routing key
 #   routing_tag = "host"
@@ -527,6 +555,9 @@
 #
 #   ## Debug true - Prints OpenTSDB communication
 #   debug = false
+#
+#   ## Separator separates measurement name from field
+#   separator = "_"
 
 
 # # Configuration for the Prometheus client to spawn
@@ -1392,6 +1423,10 @@
 
 # # Read JMX metrics through Jolokia
 # [[inputs.jolokia]]
+#   # DEPRECATED: the jolokia plugin has been deprecated in favor of the
+#   # jolokia2 plugin
+#   # see https://github.com/influxdata/telegraf/tree/master/plugins/inputs/jolokia2
+#
 #   ## This is the context root used to compose the jolokia url
 #   ## NOTE that Jolokia requires a trailing slash at the end of the context root
 #   ## NOTE that your jolokia security policy must allow for POST requests.
@@ -1454,6 +1489,64 @@
 #     attribute = "LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"
 
 
+# # Read JMX metrics from a Jolokia REST agent endpoint
+# [[inputs.jolokia2_agent]]
+#   # default_tag_prefix      = ""
+#   # default_field_prefix    = ""
+#   # default_field_separator = "."
+#
+#   # Add agents URLs to query
+#   urls = ["http://localhost:8080/jolokia"]
+#   # username = ""
+#   # password = ""
+#   # response_timeout = "5s"
+#
+#   ## Optional SSL config
+#   # ssl_ca   = "/var/private/ca.pem"
+#   # ssl_cert = "/var/private/client.pem"
+#   # ssl_key  = "/var/private/client-key.pem"
+#   # insecure_skip_verify = false
+#
+#   ## Add metrics to read
+#   [[inputs.jolokia2.metric]]
+#     name  = "java_runtime"
+#     mbean = "java.lang:type=Runtime"
+#     paths = ["Uptime"]
+
+
+# # Read JMX metrics from a Jolokia REST proxy endpoint
+# [[inputs.jolokia2_proxy]]
+#   # default_tag_prefix      = ""
+#   # default_field_prefix    = ""
+#   # default_field_separator = "."
+#
+#   ## Proxy agent
+#   url = "http://localhost:8080/jolokia"
+#   # username = ""
+#   # password = ""
+#   # response_timeout = "5s"
+#
+#   ## Optional SSL config
+#   # ssl_ca   = "/var/private/ca.pem"
+#   # ssl_cert = "/var/private/client.pem"
+#   # ssl_key  = "/var/private/client-key.pem"
+#   # insecure_skip_verify = false
+#
+#   ## Add proxy targets to query
+#   # default_target_username = ""
+#   # default_target_password = ""
+#   [[inputs.jolokia_proxy.target]]
+#     url = "service:jmx:rmi:///jndi/rmi://targethost:9999/jmxrmi"
+# 	# username = ""
+# 	# password = ""
+#
+#   ## Add metrics to read
+#   [[inputs.jolokia_proxy.metric]]
+#     name  = "java_runtime"
+#     mbean = "java.lang:type=Runtime"
+#     paths = ["Uptime"]
+
+
 # # Read Kapacitor-formatted JSON metrics from one or more HTTP endpoints
 # [[inputs.kapacitor]]
 #   ## Multiple URLs from which to read Kapacitor-formatted JSON
@@ -1479,6 +1572,9 @@
 #   ## Use bearer token for authorization
 #   # bearer_token = /path/to/bearer/token
 #
+#   ## Set response_timeout (default 5 seconds)
+#   # response_timeout = "5s"
+#
 #   ## Optional SSL Config
 #   # ssl_ca = /path/to/cafile
 #   # ssl_cert = /path/to/certfile
@@ -1713,6 +1809,15 @@
 #   response_timeout = "5s"
 
 
+# # Read Nginx Plus' full status information (ngx_http_status_module)
+# [[inputs.nginx_plus]]
+#   ## An array of ngx_http_status_module or status URI to gather stats.
+#   urls = ["http://localhost/status"]
+#
+#   # HTTP response timeout (default: 5s)
+#   response_timeout = "5s"
+
+
 # # Read NSQ topic and channel statistics.
 # [[inputs.nsq]]
 #   ## An array of NSQD HTTP API endpoints
@@ -1931,6 +2036,9 @@
 #   ## An array of urls to scrape metrics from.
 #   urls = ["http://localhost:9100/metrics"]
 #
+#   ## An array of Kubernetes services to scrape metrics from.
+#   # kubernetes_services = ["http://my-service-dns.my-namespace:9100/metrics"]
+#
 #   ## Use bearer token for authorization
 #   # bearer_token = /path/to/bearer/token
 #
@@ -2424,6 +2532,14 @@
 #   ## Maximum line size allowed to be sent in bytes.
 #   ## 0 means to use the default of 65536 bytes (64 kibibytes)
 #   max_line_size = 0
+#
+#   ## Set one or more allowed client CA certificate file names to
+#   ## enable mutually authenticated TLS connections
+#   tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
+#
+#   ## Add service certificate and key
+#   tls_cert = "/etc/telegraf/cert.pem"
+#   tls_key = "/etc/telegraf/key.pem"
 
 
 # # Read metrics from Kafka topic(s)
@@ -2499,6 +2615,9 @@
 #   ## be read from the beginning.
 #   from_beginning = false
 #
+#   ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+#   # watch_method = "inotify"
+#
 #   ## Parse logstash-style "grok" patterns:
 #   ##   Telegraf built-in parsing patterns: https://goo.gl/dkay10
 #   [inputs.logparser.grok]
@@ -2537,6 +2656,8 @@
 #   servers = ["localhost:1883"]
 #   ## MQTT QoS, must be 0, 1, or 2
 #   qos = 0
+#   ## Connection timeout for initial connection in seconds
+#   connection_timeout = "30s"
 #
 #   ## Topics to subscribe to
 #   topics = [
@@ -2721,6 +2842,9 @@
 #   ## Whether file is a named pipe
 #   pipe = false
 #
+#   ## Method used to watch for file updates.  Can be either "inotify" or "poll".
+#   # watch_method = "inotify"
+#
 #   ## Data format to consume.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -2768,3 +2892,4 @@
 # [[inputs.zipkin]]
 #   # path = "/api/v1/spans" # URL path for span data
 #   # port = 9411            # Port on which Telegraf listens
+