From 6700f0ba494cd1a83a495b2f959133e2af718587 Mon Sep 17 00:00:00 2001
From: Sebastian Spaink <3441183+sspaink@users.noreply.github.com>
Date: Wed, 22 Jun 2022 08:01:56 -0500
Subject: [PATCH] docs: Sync sample.conf for recent features (#11348)

---
 plugins/inputs/cloudwatch/sample.conf | 3 ++-
 plugins/inputs/redis/sample.conf      | 3 +++
 plugins/inputs/x509_cert/sample.conf  | 4 ++++
 plugins/outputs/datadog/sample.conf   | 3 ++-
 plugins/outputs/websocket/sample.conf | 4 ++++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/plugins/inputs/cloudwatch/sample.conf b/plugins/inputs/cloudwatch/sample.conf
index 79b4084fdcefd..51fb6142e9473 100644
--- a/plugins/inputs/cloudwatch/sample.conf
+++ b/plugins/inputs/cloudwatch/sample.conf
@@ -27,7 +27,8 @@
   ##   ex: endpoint_url = "http://localhost:8000"
   # endpoint_url = ""
 
-  ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
+  ## Set http_proxy
+  # use_system_proxy = false
   # http_proxy_url = "http://localhost:8888"
 
   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all
diff --git a/plugins/inputs/redis/sample.conf b/plugins/inputs/redis/sample.conf
index a0f7b92be6460..6f1db720d53a7 100644
--- a/plugins/inputs/redis/sample.conf
+++ b/plugins/inputs/redis/sample.conf
@@ -24,6 +24,9 @@
   ## specify server password
   # password = "s#cr@t%"
 
+  ## specify username for ACL auth (Redis 6.0+)
+  # username = "default"
+
   ## Optional TLS Config
   # tls_ca = "/etc/telegraf/ca.pem"
   # tls_cert = "/etc/telegraf/cert.pem"
diff --git a/plugins/inputs/x509_cert/sample.conf b/plugins/inputs/x509_cert/sample.conf
index d3421a1dd60e3..de7c75bee6b0b 100644
--- a/plugins/inputs/x509_cert/sample.conf
+++ b/plugins/inputs/x509_cert/sample.conf
@@ -21,3 +21,7 @@
   # tls_cert = "/etc/telegraf/cert.pem"
   # tls_key = "/etc/telegraf/key.pem"
   # tls_server_name = "myhost.example.org"
+
+  ## Set the proxy URL
+  # use_proxy = true
+  # proxy_url = "http://localhost:8888"
diff --git a/plugins/outputs/datadog/sample.conf b/plugins/outputs/datadog/sample.conf
index ecababf462167..35852d7c48597 100644
--- a/plugins/outputs/datadog/sample.conf
+++ b/plugins/outputs/datadog/sample.conf
@@ -9,7 +9,8 @@
   ## Write URL override; useful for debugging.
   # url = "https://app.datadoghq.com/api/v1/series"
 
-  ## Set http_proxy (telegraf uses the system wide proxy settings if it isn't set)
+  ## Set http_proxy
+  # use_system_proxy = false
   # http_proxy_url = "http://localhost:8888"
 
   ## Override the default (none) compression used to send data.
diff --git a/plugins/outputs/websocket/sample.conf b/plugins/outputs/websocket/sample.conf
index fc83729a983de..5c0c6271f0307 100644
--- a/plugins/outputs/websocket/sample.conf
+++ b/plugins/outputs/websocket/sample.conf
@@ -24,6 +24,10 @@
   # socks5_username = "alice"
   # socks5_password = "pass123"
 
+  ## Optional HTTP proxy to use
+  # use_system_proxy = false
+  # http_proxy_url = "http://localhost:8888"
+
   ## Data format to output.
   ## Each data format has it's own unique set of configuration options, read
   ## more about them here: