Ensure backwards compatibility for http proxy

plugins/common/proxy/proxy.go

@@ -9,23 +9,21 @@ import (
 )
 
 type HTTPProxy struct {
-	UseProxy     bool   `toml:"use_proxy"`
-	HTTPProxyURL string `toml:"http_proxy_url"`
+	UseSystemProxy bool   `toml:"use_system_proxy"`
+	HTTPProxyURL   string `toml:"http_proxy_url"`
 }
 
 type proxyFunc func(req *http.Request) (*url.URL, error)
 
 func (p *HTTPProxy) Proxy() (proxyFunc, error) {
-	if p.UseProxy {
-		if len(p.HTTPProxyURL) > 0 {
-			address, err := url.Parse(p.HTTPProxyURL)
-			if err != nil {
-				return nil, fmt.Errorf("error parsing proxy url %q: %w", p.HTTPProxyURL, err)
-			}
-			return http.ProxyURL(address), nil
-		}
-
+	if p.UseSystemProxy {
 		return http.ProxyFromEnvironment, nil
+	} else if len(p.HTTPProxyURL) > 0 {
+		address, err := url.Parse(p.HTTPProxyURL)
+		if err != nil {
+			return nil, fmt.Errorf("error parsing proxy url %q: %w", p.HTTPProxyURL, err)
+		}
+		return http.ProxyURL(address), nil
 	}
 
 	return nil, nil

plugins/inputs/cloudwatch/README.md

@@ -47,7 +47,7 @@ API endpoint. In the following order the plugin will attempt to authenticate.
   # endpoint_url = ""
 
   ## Set http_proxy
-  # use_proxy = true
+  # use_system_proxy = false
   # http_proxy_url = "http://localhost:8888"
 
   # The minimum period for Cloudwatch metrics is 1 minute (60s). However not all

plugins/inputs/cloudwatch/cloudwatch_test.go

@@ -361,8 +361,8 @@ func TestUpdateWindow(t *testing.T) {
 func TestProxyFunction(t *testing.T) {
 	c := &CloudWatch{
 		HTTPProxy: proxy.HTTPProxy{
-			HTTPProxyURL: "http://www.penguins.com",
-			UseProxy:     true,
+			HTTPProxyURL:   "http://www.penguins.com",
+			UseSystemProxy: true,
 		},
 	}
 

plugins/outputs/datadog/README.md

@@ -18,7 +18,7 @@ This plugin writes to the [Datadog Metrics API][metrics] and requires an
   # url = "https://app.datadoghq.com/api/v1/series"
 
   ## Set http_proxy
-  # use_proxy = true
+  # use_system_proxy = false
   # http_proxy_url = "http://localhost:8888"
 
   ## Override the default (none) compression used to send data.

plugins/outputs/websocket/README.md

@@ -34,7 +34,7 @@ It can output data in any of the [supported output formats](https://github.com/i
   # socks5_password = "pass123"
 
   ## Optional HTTP proxy to use
-  # use_proxy = true
+  # use_system_proxy = false
   # http_proxy_url = "http://localhost:8888"
 
   ## Data format to output.