Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nginx] allow proxy disabling #1051

Merged
merged 6 commits into from
Jan 29, 2018
Merged

[nginx] allow proxy disabling #1051

merged 6 commits into from
Jan 29, 2018

Conversation

ofek
Copy link
Contributor

@ofek ofek commented Jan 25, 2018

What does this PR do?

This allows users of the nginx check to bypass proxy settings. It is particularly useful for auto discovery with Docker.

Motivation

Customer request

Versioning

  • Bumped the check version in manifest.json
  • Bumped the check version in datadog_checks/{integration}/__init__.py
  • Updated CHANGELOG.md. Please use Unreleased as the date in the title
    for the new section.

Copy link
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

One comment on the option name, other than that LGTM!

# The (optional) skip_proxy parameter will bypass any proxy
# settings enabled and attempt to reach the URL directly.
#
# skip_proxy: false
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be no_proxy instead? (based on this: https://github.com/DataDog/dd-agent/blob/5.21.0/checks/__init__.py#L396)

@ofek ofek merged commit eb89d1a into master Jan 29, 2018
@ofek ofek deleted the ofek/nginx-skip-proxy branch January 29, 2018 16:11
@hush-hush hush-hush added this to the 5.22 milestone Feb 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants