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

[mesos_slave] Connect to master with same protocol as slave #2910

Merged
merged 1 commit into from
Oct 14, 2016

Conversation

mcclurmc
Copy link
Contributor

Note: Please remember to review the Datadog Contribution Guidelines
if you have not yet done so.

What does this PR do?

Fixes a bug in the mesos-slave.py check. This check queries both the localhost and the master node. The bug is that even if you specify SSL for communicating with the localhost (slave), the master is always queried with plain HTTP. This is definitely a bug because it is impossible to configure a mesos cluster where master and slave are using different protocols.

Motivation

I've got SSL enabled on my mesos cluster and this check just plain doesn't work with SSL enabled.

Testing Guidelines

An overview on testing
is available in our contribution guidelines.

Additional Notes

Anything else we should know when reviewing?

This work is a follow-on to Zendesk ticket: 62968

@masci masci added this to the 5.9.2 milestone Oct 14, 2016
@masci
Copy link
Contributor

masci commented Oct 14, 2016

Nice! Thanks @mcclurmc

@masci masci self-assigned this Oct 14, 2016
@masci masci merged commit 5d63b45 into DataDog:master Oct 14, 2016
@olivielpeau olivielpeau modified the milestones: 5.10.0, 5.9.2 Oct 18, 2016
jcejohnson pushed a commit to EFXCIA/dd-agent that referenced this pull request Oct 24, 2016
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.

3 participants