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

heartbeat: setup default ports in http monitors #3924

Merged
merged 3 commits into from Apr 10, 2017

Conversation

Projects
None yet
4 participants
@7AC
Copy link
Contributor

commented Apr 5, 2017

Default http to 80 and https to 443

Resolves #3915

@7AC 7AC added the review label Apr 5, 2017

heartbeat: setup default ports in http monitors
Default http to 80 and https to 443

Resolves #3915
@ruflin

This comment has been minimized.

Copy link
Collaborator

commented Apr 6, 2017

Could you update the changelog with an entry and potentially also the docs? Should we backport this?

@ruflin ruflin added the Heartbeat label Apr 6, 2017

@7AC

This comment has been minimized.

Copy link
Contributor Author

commented Apr 6, 2017

I updated the changelog, I'm not sure the doc deserves an entry for this. About backporting I'm open to suggestions..

@ruflin

ruflin approved these changes Apr 7, 2017

Copy link
Collaborator

left a comment

LGTM. I would be nice to have a quick test to confirm that the default is set correctly.

About backporting: I suggest we backport it to 5.x (5.4).

Add test
Also refactor the code, turns out net.SplitHostPort() doesn't like hosts
without ports.

@monicasarbu monicasarbu merged commit 77c5b74 into elastic:master Apr 10, 2017

5 checks passed

CLA Commit author has signed the CLA
Details
codecov/patch 72.72% of diff hit (target 61.28%)
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
default Build finished.
Details
@tsg

This comment has been minimized.

Copy link
Collaborator

commented Apr 10, 2017

+1 to including this one in 5.4

@7AC 7AC deleted the 7AC:fix/heartbeat_default_http_port branch Apr 10, 2017

@7AC 7AC removed the needs_backport label Apr 10, 2017

tsg added a commit that referenced this pull request Apr 11, 2017

Cherry-pick #3924 to 5.x: heartbeat: setup default ports in http moni…
…tors (#3978)

* heartbeat: setup default ports in http monitors

Default http to 80 and https to 443

Resolves #3915

(cherry picked from commit c888f3f)

* Add entry to changelog

(cherry picked from commit aa40255)

* Add test

Also refactor the code, turns out net.SplitHostPort() doesn't like hosts
without ports.

(cherry picked from commit bd6898c)

* Add newline

athom added a commit to athom/beats that referenced this pull request Jan 25, 2018

heartbeat: setup default ports in http monitors (elastic#3924)
* heartbeat: setup default ports in http monitors

Default http to 80 and https to 443

Resolves elastic#3915

* Add entry to changelog

* Add test

Also refactor the code, turns out net.SplitHostPort() doesn't like hosts
without ports.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.