From 27fb09ede8fe606e4d9380e14cfdcb43511ec671 Mon Sep 17 00:00:00 2001
From: "telegraf-tiger[bot]"
 <76974415+telegraf-tiger[bot]@users.noreply.github.com>
Date: Wed, 22 Jun 2022 11:25:16 -0500
Subject: [PATCH] docs: Update etc/telegraf.conf and etc/telegraf_windows.conf
 (#11351)

Co-authored-by: Tiger Bot <>
Co-authored-by: Sebastian Spaink <sspaink@influxdata.com>
(cherry picked from commit 38c5ec1f05f04f8c92cf80c655cdf88710f20589)
---
 config/agent.conf         |  2 +-
 etc/telegraf.conf         | 18 +++++++++++++++---
 etc/telegraf_windows.conf | 18 +++++++++++++++---
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/config/agent.conf b/config/agent.conf
index b8457140403b7..99bbb2d57597e 100644
--- a/config/agent.conf
+++ b/config/agent.conf
@@ -87,4 +87,4 @@
   ## Method of translating SNMP objects. Can be "netsnmp" which
   ## translates by calling external programs snmptranslate and snmptable,
   ## or "gosmi" which translates using the built-in gosmi library.
-  # snmp_translator = "netsnmp"
\ No newline at end of file
+  # snmp_translator = "netsnmp"
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index fb6e72b301ac6..1711b9eaeb1dd 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -21,7 +21,6 @@
   ## Environment variables can be used as tags, and throughout the config file
   # user = "$USER"
 
-
 # Configuration for telegraf agent
 [agent]
   ## Default data collection interval for all inputs
@@ -586,7 +585,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.
@@ -2307,6 +2307,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:
@@ -3656,7 +3660,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
@@ -7326,6 +7331,10 @@
 #   # 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"
 
 
 #  # Gathers Metrics From a Dell EMC XtremIO Storage Array's V3 API
@@ -9135,6 +9144,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/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 0975eef744fc1..5478136b774af 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -21,7 +21,6 @@
   ## Environment variables can be used as tags, and throughout the config file
   # user = "$USER"
 
-
 # Configuration for telegraf agent
 [agent]
   ## Default data collection interval for all inputs
@@ -586,7 +585,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.
@@ -2307,6 +2307,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:
@@ -3643,7 +3647,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
@@ -7283,6 +7288,10 @@
 #   # 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"
 
 
 #  # Gathers Metrics From a Dell EMC XtremIO Storage Array's V3 API
@@ -9006,6 +9015,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"