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.

Sign up for GitHub

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

Jump to bottom

[Fleet] Enforce port in fleet server url even for default http|https port #98957

Merged
merged 2 commits into from
May 1, 2021
Merged

[Fleet] Enforce port in fleet server url even for default http|https port #98957

merged 2 commits into from
May 1, 2021

Conversation

nchaulet
Copy link
Member

Description

Related to elastic/elastic-agent#299
Fleet server do not respect default port for http and https and use 8220 instead.
This PR enforce the port to be present in the url even for default http, https port.

The port is set when we save the settings:

  • during the creation of default settings
  • when the user set an url

This PR will not migrate existing fleet_server_hosts.

If a change happen in the agent we can revert that PR.

@nchaulet nchaulet added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.14.0 v7.13.0 labels Apr 30, 2021
@nchaulet nchaulet requested a review from jen-huang April 30, 2021 17:28
@nchaulet nchaulet requested a review from a team as a code owner April 30, 2021 17:28
@nchaulet nchaulet self-assigned this Apr 30, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@nchaulet
Copy link
Member Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @nchaulet

jfsiii
jfsiii approved these changes May 1, 2021
View reviewed changes
Copy link
Contributor

@jfsiii jfsiii left a comment

Choose a reason for hiding this comment

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

🚢

@nchaulet nchaulet added the auto-backport Deprecated - use backport:version if exact versions are needed label May 1, 2021
@nchaulet nchaulet merged commit 5ff845a into elastic:master May 1, 2021
@nchaulet nchaulet deleted the fleet-fix-url-fleet-server-port branch May 1, 2021 00:58
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 1, 2021
@nchaulet @kibanamachine
[Fleet] Enforce port in fleet server url even for default http|https …
ae77582 
…port (elastic#98957)
This was referenced May 1, 2021
Merged
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 1, 2021
@nchaulet @kibanamachine
[Fleet] Enforce port in fleet server url even for default http|https …
926e45c 
…port (elastic#98957)
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 7.13
✅ 7.x

The backport PRs will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request May 1, 2021
@kibanamachine @nchaulet
[Fleet] Enforce port in fleet server url even for default http|https …
3a21113 
…port (#98957) (#99002)

Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
kibanamachine added a commit that referenced this pull request May 1, 2021
@kibanamachine @nchaulet
[Fleet] Enforce port in fleet server url even for default http|https …
e8615d0 
…port (#98957) (#99001)

Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
@nchaulet nchaulet mentioned this pull request May 3, 2021
Merged
@jen-huang jen-huang mentioned this pull request May 4, 2021
Closed
@nchaulet nchaulet mentioned this pull request Jun 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jfsiii jfsiii jfsiii approved these changes

@jen-huang jen-huang Awaiting requested review from jen-huang

Assignees

@nchaulet nchaulet

Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.13.0 v7.14.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nchaulet @elasticmachine @kibanamachine @jfsiii