From 5b7a3a6ee15e53d9a35eddf2bfa097dde8e489dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?= Date: Sat, 28 Sep 2024 14:42:36 +0200 Subject: [PATCH] Add ALL_PROXY and NO_PROXY to collected env_vars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: #3788 Signed-off-by: Pablo Fernández Rodríguez Signed-off-by: Pablo Fernández Rodríguez --- sos/report/plugins/foreman.py | 7 ++++++- sos/report/plugins/foreman_proxy.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sos/report/plugins/foreman.py b/sos/report/plugins/foreman.py index f3d3f4ad37..c18cac9ddf 100644 --- a/sos/report/plugins/foreman.py +++ b/sos/report/plugins/foreman.py @@ -297,7 +297,12 @@ def collect_proxies(self): timeout=10) # collect http[|s]_proxy env.variables - self.add_env_var(["http_proxy", "https_proxy"]) + self.add_env_var([ + 'HTTP_PROXY', + 'HTTPS_PROXY', + 'NO_PROXY', + 'ALL_PROXY', + ]) def build_query_cmd(self, query, csv=False, binary="psql"): """ diff --git a/sos/report/plugins/foreman_proxy.py b/sos/report/plugins/foreman_proxy.py index 5f684be259..e958e25946 100644 --- a/sos/report/plugins/foreman_proxy.py +++ b/sos/report/plugins/foreman_proxy.py @@ -42,7 +42,12 @@ def setup(self): ]) # collect http[|s]_proxy env.variables - self.add_env_var(["http_proxy", "https_proxy"]) + self.add_env_var([ + 'HTTP_PROXY', + 'HTTPS_PROXY', + 'NO_PROXY', + 'ALL_PROXY', + ]) def postproc(self): self.do_path_regex_sub(