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

Use proxy for API key check in info page #3012

Merged
merged 1 commit into from
Nov 10, 2016
Merged

Conversation

2rs2ts
Copy link
Contributor

@2rs2ts 2rs2ts commented Nov 9, 2016

What does this PR do?

This changes the API key validation check to use the proxy settings as exposed by utils/proxy.py.

Motivation

When we upgraded to 5.10 our info page broke. We found out this was the cause. See #3011

Testing Guidelines

Follow the instructions in the linked issue for reproducing, then apply this diff to see the issue be resolved.

Additional Notes

I didn't write any tests since the original change didn't have any tests and I didn't really know what to do. I'm more than happy to write tests with some guidance.

Fixes #3011

@olivielpeau olivielpeau self-assigned this Nov 10, 2016
@gmmeyer gmmeyer added this to the 5.10.1 milestone Nov 10, 2016
@olivielpeau olivielpeau assigned gmmeyer and unassigned olivielpeau Nov 10, 2016
Copy link
Contributor

@gmmeyer gmmeyer left a comment

Choose a reason for hiding this comment

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

Hey @2rs2ts! Thank you for your contribution. This looks great. I tested it and it works fine, I'm going to approve it and merge it, thank you very much for your contribution!

@gmmeyer gmmeyer merged commit 3e09d3e into DataDog:master Nov 10, 2016
truthbk pushed a commit that referenced this pull request Nov 15, 2016
degemer added a commit that referenced this pull request Nov 15, 2016
* master: (254 commits)
  Reduce the maximum amount of argument to pylint.
  [forwarder] stop flushing after 10s
  [etcd] Report errors connecting to etcd endpoint (#3007)
  Postfix check should pass raise_on_empty_output=False
  [status] Silence requests exception
  [psutil] Only set `psutil.PROCFS_PATH` once in the collector (#3013)
  [ci] fix check name detection of test files (#3021)
  [ci][rabbitmq] Increase wait timeout (#3022)
  [core] SpooledTemporaryFile for subprocess output (#3002)
  [collector] isolate system checks (#3001)
  [ci] Fix Travis jobs timing out (#3017)
  [mongo] Use db.current_op instead of manually querying (#3016)
  [ci] fix bad citizens detection (#3020)
  [ci] add debug logs (#3019)
  [mongo] use `currentOp` for mongodb 3.2+
  Use proxy for API key check in info page (#3012)
  [mongo] Add MongoDB 3.2 support
  [mongo] Add MongoDB 3.2 to travis-ci config
  [packaging] 5.11.0 nightlies (#3009)
  [core] hard-deprecate start/stop/restart/status (#3004)
  ...
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.

API key validation check in info page does not use proxy settings
3 participants