From 5004dff1f84caf80f342992e815ffddea85c2667 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Tue, 28 Mar 2023 11:35:02 +0200
Subject: [PATCH] docs: document the new proxy-related settings

The version of `github.com/prometheus/common` imported by Alertmanager
adds several fields to the `http_config` and `oauth2` structs for
setting proxy parameters:
* `no_proxy`
* `proxy_from_environment`
* `proxy_connect_header`

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
 docs/configuration.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/configuration.md b/docs/configuration.md
index b5bc69f5..bb23d6f2 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -557,6 +557,15 @@ oauth2:
 
 # Optional proxy URL.
 [ proxy_url: <string> ]
+# Comma-separated string that can contain IPs, CIDR notation, domain names
+# that should be excluded from proxying. IP and domain names can
+# contain port numbers.
+[ no_proxy: <string> ]
+# Use proxy URL indicated by environment variables (HTTP_PROXY, https_proxy, HTTPs_PROXY, https_proxy, and no_proxy)
+[ proxy_from_environment: <boolean> | default: false ]
+# Specifies headers to send to proxies during CONNECT requests.
+[ proxy_connect_header:
+  [ <string>: [<secret>, ...] ] ]
 
 # Configure whether HTTP requests follow HTTP 3xx redirects.
 [ follow_redirects: <bool> | default = true ]
@@ -597,6 +606,15 @@ tls_config:
 
 # Optional proxy URL.
 [ proxy_url: <string> ]
+# Comma-separated string that can contain IPs, CIDR notation, domain names
+# that should be excluded from proxying. IP and domain names can
+# contain port numbers.
+[ no_proxy: <string> ]
+# Use proxy URL indicated by environment variables (HTTP_PROXY, https_proxy, HTTPs_PROXY, https_proxy, and no_proxy)
+[ proxy_from_environment: <boolean> | default: false ]
+# Specifies headers to send to proxies during CONNECT requests.
+[ proxy_connect_header:
+  [ <string>: [<secret>, ...] ] ]
 ```
 
 #### `<tls_config>`