add no_proxy option #549
Merged
add no_proxy option #549
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stonith
force-pushed
the
add_support_no_proxy
branch
from
b744e8e
to
66382dc
Compare
olivielpeau
reviewed
Jul 16, 2018
There was a problem hiding this comment.
Thanks @stonith for the PR! I've left a few comments, could you have a look?
attributes/default.rb
Outdated
| @@ -296,6 +296,7 @@ | |||
| default['datadog']['web_proxy']['user'] = nil | |||
| default['datadog']['web_proxy']['password'] = nil | |||
| default['datadog']['web_proxy']['skip_ssl_validation'] = nil # accepted values 'yes' or 'no' | |||
| default['datadog']['web_proxy']['no_proxy'] = nil | |||
There was a problem hiding this comment.
Could you add a small comment here to mention it's used for Agent v6+ only?
| @@ -37,6 +37,7 @@ if node['datadog']['web_proxy']['host'] | |||
| user = node['datadog']['web_proxy']['user'] | |||
| password = node['datadog']['web_proxy']['password'] | |||
| scheme = "" | |||
| no_proxy = node['datadog']['web_proxy']['no_proxy'] | |||
There was a problem hiding this comment.
can you initialize no_proxy to nil outside of this if block
templates/default/datadog.yaml.erb
Outdated
| @@ -136,6 +137,10 @@ if !http_proxy.nil? | |||
| } | |||
| end | |||
|
|
|||
| if !no_proxy.nil? | |||
| agent_config['proxy']['no_proxy'] = no_proxy | |||
There was a problem hiding this comment.
agent_config['proxy'] should be initialized to a hash here, but the logic is a bit brittle. Could you either check that the key is indeed present in agent_config or move this block inside the !http_proxy.nil? conditional above?
- adds comment to the attributes to identify it as v6+ - ensures no_proxy variable has as default value - ensures the proxy key exists in the config:
|
@olivielpeau comments addressed. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TL:DR Adds no_proxy option
The behaviour in agent v6 seems to behave differently than v5 when a web proxy is configured. With v5, the agent would connect directly to 127.0.0.1 whereas with v6, the agent will try to connect to 127.0.0.1 via the proxy. In v6, there is a no_proxy option which is not supported the chef datadog cookbook.