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

[Fleet] Add default http|https port to ES hosts #99240

Merged
merged 3 commits into from
May 4, 2021

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented May 4, 2021

Summary

Related to #98356

The Elastic agent is using 9200 as a default port for Elasticsearch, so if in the Fleet settings you use something like this http://elasticsearch.fr the agent is going to use http://elasticsearch.fr:9220 as the ES host.

Recently we decided for the Fleet server hosts to explicitly set the port for default http|https port so http://fleetserver.fr will be saved as http://fleetserver.fr:80 and the agent will use http://fleetserver.fr:80 as fleet server host.

That PR is doing the same for the the ES host.
Also I added some basic API integration test for the output crud as we do not have any

@nchaulet nchaulet added bug Fixes for quality problems that affect the customer experience 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 May 4, 2021
@nchaulet nchaulet self-assigned this May 4, 2021
@nchaulet nchaulet requested a review from a team as a code owner May 4, 2021 19:00
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@nchaulet nchaulet added the auto-backport Deprecated - use backport:version if exact versions are needed label May 4, 2021
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.

On the phone but this lgtm. Thanks for creating utils and adding tests

@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

@nchaulet nchaulet merged commit ed8dc62 into elastic:master May 4, 2021
@nchaulet nchaulet deleted the fix-default-es-port-fleet branch May 4, 2021 22:13
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 4, 2021
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 4, 2021
@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 5, 2021
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
kibanamachine added a commit that referenced this pull request May 5, 2021
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed bug Fixes for quality problems that affect the customer experience 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
Development

Successfully merging this pull request may close these issues.

4 participants