From 6c1327467edcb4fa486c63ca8ffc49a32c6d6e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?= Date: Thu, 26 Sep 2024 12:57:56 +0200 Subject: [PATCH] [foreman] Resolves: #3788 - Add ALL_PROXY and NO_PROXY to collected env_vars --- 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..fe817ae544 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..21249e2f61 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(