Skip to content

Retrieve no_proxy directly from the Datadog Agent's configuration#2004

Merged
nmuesch merged 2 commits into
masterfrom
nick/no_proxy
Aug 7, 2018
Merged

Retrieve no_proxy directly from the Datadog Agent's configuration#2004
nmuesch merged 2 commits into
masterfrom
nick/no_proxy

Conversation

@nmuesch

@nmuesch nmuesch commented Aug 7, 2018

Copy link
Copy Markdown
Contributor

What does this PR do?

Remove the check for the no_proxy environment variables in get_instance_proxy. The logic should be done by the Datadog Agent and the https, http, and no_proxy options should all be available in the agents config to retrieve by the time the integrations request it.

Motivation

User had a no_proxy setup in the datadog.yaml file, however this wasn't being propogated to the integrations that use get_instance_proxy and instead these checks were using the proxy directly.

Review checklist

  • PR has a meaningful title or PR has the no-changelog label attached
  • Feature or bugfix has tests
  • Git history is clean
  • If PR impacts documentation, docs team has been notified or an issue has been opened on the documentation repo

Additional Notes

Noticed some commented out pdbs in the network check, so removed those for cleanliness

@nmuesch
nmuesch requested a review from a team as a code owner August 7, 2018 13:04

@zippolyte zippolyte left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ofek ofek left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nmuesch
nmuesch merged commit 2bd8f8d into master Aug 7, 2018
@nmuesch
nmuesch deleted the nick/no_proxy branch August 7, 2018 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants