diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index b2650ada3..8453bd16b 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -2253,6 +2253,12 @@
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## Optional SOCKS5 proxy to use
+#   # socks5_enabled = true
+#   # socks5_address = "127.0.0.1:1080"
+#   # socks5_username = "alice"
+#   # socks5_password = "pass123"
+#
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -3251,6 +3257,7 @@
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
 #   # tls_key = "/etc/telegraf/key.pem"
+#   # tls_name = "tlsname"
 #   ## If false, skip chain & host verification
 #   # insecure_skip_verify = true
 #
@@ -5202,6 +5209,14 @@
 #   ## with optional port. ie localhost, 10.0.0.1:11211, etc.
 #   servers = ["localhost:11211"]
 #   # unix_sockets = ["/var/run/memcached.sock"]
+#
+#   ## Optional TLS Config
+#   # enable_tls = true
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## If false, skip chain & host verification
+#   # insecure_skip_verify = true
 
 
 # # Telegraf plugin for gathering metrics from N Mesos masters
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index cb4b741b8..7078e1cf6 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -2253,6 +2253,12 @@
 #   ## Use TLS but skip chain & host verification
 #   # insecure_skip_verify = false
 #
+#   ## Optional SOCKS5 proxy to use
+#   # socks5_enabled = true
+#   # socks5_address = "127.0.0.1:1080"
+#   # socks5_username = "alice"
+#   # socks5_password = "pass123"
+#
 #   ## Data format to output.
 #   ## Each data format has it's own unique set of configuration options, read
 #   ## more about them here:
@@ -3251,6 +3257,7 @@
 #   # tls_ca = "/etc/telegraf/ca.pem"
 #   # tls_cert = "/etc/telegraf/cert.pem"
 #   # tls_key = "/etc/telegraf/key.pem"
+#   # tls_name = "tlsname"
 #   ## If false, skip chain & host verification
 #   # insecure_skip_verify = true
 #
@@ -5076,6 +5083,14 @@
 #   ## with optional port. ie localhost, 10.0.0.1:11211, etc.
 #   servers = ["localhost:11211"]
 #   # unix_sockets = ["/var/run/memcached.sock"]
+#
+#   ## Optional TLS Config
+#   # enable_tls = true
+#   # tls_ca = "/etc/telegraf/ca.pem"
+#   # tls_cert = "/etc/telegraf/cert.pem"
+#   # tls_key = "/etc/telegraf/key.pem"
+#   ## If false, skip chain & host verification
+#   # insecure_skip_verify = true
 
 
 # # Telegraf plugin for gathering metrics from N Mesos masters