diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 517600475..28edd5192 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -822,6 +822,7 @@
 #   # max_message_bytes = 1000000
 #
 #   ## Optional TLS Config
+#   # enable_tls = true
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
 #   # tls_key = "/etc/telegraf/key.pem"
@@ -832,6 +833,9 @@
 #   # sasl_username = "kafka"
 #   # sasl_password = "secret"
 #
+#   ## SASL protocol version.  When connecting to Azure EventHub set to 0.
+#   # sasl_version = 1
+#
 #   ## Data format to output.
 #   ## Each data format has its own unique set of configuration options, read
 #   ## more about them here:
@@ -1651,7 +1655,9 @@
 
 # # Merge metrics into multifield metrics by series key
 # [[aggregators.merge]]
-#   # no configuration
+#   ## If true, the original metric will be dropped by the
+#   ## aggregator and will not get sent to the output plugins.
+#   drop_original = true
 
 
 # # Keep the aggregate min/max of each metric passing through.
@@ -2870,6 +2876,11 @@
 #   ## optionally specify the path to the ipmitool executable
 #   # path = "/usr/bin/ipmitool"
 #   ##
+#   ## Setting 'use_sudo' to true will make use of sudo to run ipmitool.
+#   ## Sudo must be configured to allow the telegraf user to run ipmitool
+#   ## without a password.
+#   # use_sudo = false
+#   ##
 #   ## optionally force session privilege level. Can be CALLBACK, USER, OPERATOR, ADMINISTRATOR
 #   # privilege = "ADMINISTRATOR"
 #   ##
@@ -3191,6 +3202,11 @@
 #   ## OR
 #   # bearer_token_string = "abc_123"
 #
+#   ## Pod labels to be added as tags.  An empty array for both include and
+#   ## exclude will include all labels.
+#   # label_include = []
+#   # label_exclude = ["*"]
+#
 #   ## Set response_timeout (default 5 seconds)
 #   # response_timeout = "5s"
 #
@@ -4150,61 +4166,46 @@
 
 # # Retrieves SNMP values from remote agents
 # [[inputs.snmp]]
-#   agents = [ "127.0.0.1:161" ]
-#   ## Timeout for each SNMP query.
-#   timeout = "5s"
-#   ## Number of retries to attempt within timeout.
-#   retries = 3
-#   ## SNMP version, values can be 1, 2, or 3
-#   version = 2
+#   ## Agent addresses to retrieve values from.
+#   ##   example: agents = ["udp://127.0.0.1:161"]
+#   ##            agents = ["tcp://127.0.0.1:161"]
+#   agents = ["udp://127.0.0.1:161"]
+#
+#   ## Timeout for each request.
+#   # timeout = "5s"
+#
+#   ## SNMP version; can be 1, 2, or 3.
+#   # version = 2
 #
 #   ## SNMP community string.
-#   community = "public"
+#   # community = "public"
 #
-#   ## The GETBULK max-repetitions parameter
-#   max_repetitions = 10
+#   ## Number of retries to attempt.
+#   # retries = 3
 #
-#   ## SNMPv3 auth parameters
-#   #sec_name = "myuser"
-#   #auth_protocol = "md5"      # Values: "MD5", "SHA", ""
-#   #auth_password = "pass"
-#   #sec_level = "authNoPriv"   # Values: "noAuthNoPriv", "authNoPriv", "authPriv"
-#   #context_name = ""
-#   #priv_protocol = ""         # Values: "DES", "AES", ""
-#   #priv_password = ""
+#   ## The GETBULK max-repetitions parameter.
+#   # max_repetitions = 10
 #
-#   ## measurement name
-#   name = "system"
-#   [[inputs.snmp.field]]
-#     name = "hostname"
-#     oid = ".1.0.0.1.1"
-#   [[inputs.snmp.field]]
-#     name = "uptime"
-#     oid = ".1.0.0.1.2"
-#   [[inputs.snmp.field]]
-#     name = "load"
-#     oid = ".1.0.0.1.3"
-#   [[inputs.snmp.field]]
-#     oid = "HOST-RESOURCES-MIB::hrMemorySize"
+#   ## SNMPv3 authentication and encryption options.
+#   ##
+#   ## Security Name.
+#   # sec_name = "myuser"
+#   ## Authentication protocol; one of "MD5", "SHA", or "".
+#   # auth_protocol = "MD5"
+#   ## Authentication password.
+#   # auth_password = "pass"
+#   ## Security Level; one of "noAuthNoPriv", "authNoPriv", or "authPriv".
+#   # sec_level = "authNoPriv"
+#   ## Context Name.
+#   # context_name = ""
+#   ## Privacy protocol used for encrypted messages; one of "DES", "AES" or "".
+#   # priv_protocol = ""
+#   ## Privacy password used for encrypted messages.
+#   # priv_password = ""
 #
-#   [[inputs.snmp.table]]
-#     ## measurement name
-#     name = "remote_servers"
-#     inherit_tags = [ "hostname" ]
-#     [[inputs.snmp.table.field]]
-#       name = "server"
-#       oid = ".1.0.0.0.1.0"
-#       is_tag = true
-#     [[inputs.snmp.table.field]]
-#       name = "connections"
-#       oid = ".1.0.0.0.1.1"
-#     [[inputs.snmp.table.field]]
-#       name = "latency"
-#       oid = ".1.0.0.0.1.2"
-#
-#   [[inputs.snmp.table]]
-#     ## auto populate table's fields using the MIB
-#     oid = "HOST-RESOURCES-MIB::hrNetworkTable"
+#   ## Add fields and tables defining the variables you wish to collect.  This
+#   ## example collects the system uptime and interface variables.  Reference the
+#   ## full plugin documentation for configuration details.
 
 
 # # DEPRECATED! PLEASE USE inputs.snmp INSTEAD.
@@ -5253,16 +5254,21 @@
 #   # version = ""
 #
 #   ## Optional TLS Config
+#   # enable_tls = true
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
 #   # tls_key = "/etc/telegraf/key.pem"
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
-#   ## Optional SASL Config
+#   ## SASL authentication credentials.  These settings should typically be used
+#   ## with TLS encryption enabled using the "enable_tls" option.
 #   # sasl_username = "kafka"
 #   # sasl_password = "secret"
 #
+#   ## SASL protocol version.  When connecting to Azure EventHub set to 0.
+#   # sasl_version = 1
+#
 #   ## Name of the consumer group.
 #   # consumer_group = "telegraf_metrics_consumers"
 #