Skip to content

Commit

Permalink
[foreman] Resolves: #3788 - Add ALL_PROXY and NO_PROXY to collected e…
Browse files Browse the repository at this point in the history
…nv_vars
  • Loading branch information
pafernanr committed Sep 26, 2024
1 parent 0ab183d commit 6c13274
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion sos/report/plugins/foreman.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
"""
Expand Down
7 changes: 6 additions & 1 deletion sos/report/plugins/foreman_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 6c13274

Please sign in to comment.