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] Remove host and port for Fleet Server #5896

Merged
merged 2 commits into from
Apr 20, 2023
Merged

Conversation

nchaulet
Copy link
Member

@nchaulet nchaulet commented Apr 17, 2023

Description

Remove the host and port field from the Fleet server integration as it seems those values are only configurable during Fleet server installation.

Related to 154674

cc @jen-huang @michel-laterman

Should we restrict that package to newest version of Kibana (8.7?)

Tests

I tested manually:

  • that a fleet server is available when not providing any port or host
  • that you can customize fleet server port with --fleet-server-port

@nchaulet nchaulet added the Team:Fleet Label for the Fleet team [elastic/fleet] label Apr 17, 2023
@nchaulet nchaulet requested a review from a team as a code owner April 17, 2023 12:49
@nchaulet nchaulet self-assigned this Apr 17, 2023
@elasticmachine
Copy link

Pinging @elastic/fleet (Team:Fleet)

@elasticmachine
Copy link

elasticmachine commented Apr 17, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-04-17T20:11:08.400+0000

  • Duration: 14 min 13 sec

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

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

@nchaulet If these fields were never used in any version of Fleet Server, I don't think we need to restrict a higher Kibana version. However, I would like to check on what will happen if these vars are defined in preconfiguration, but is not present on the latest version of the package.

The reason I am asking is because on Cloud, our stackpack has these fields defined and they will always use the latest version of the Fleet Server package available to the version for that instance:
https://github.com/elastic/cloud-assets/blob/master/stackpack/kibana/config/kibana-7.yml
https://github.com/elastic/cloud-assets/blob/master/stackpack/kibana/config/kibana.yml

Could you check the behavior? If there is an issue, then we may need to restrict these changes to >v8.8.0.

@@ -1,10 +1,4 @@
server:
Copy link
Contributor

Choose a reason for hiding this comment

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

if none of the optional fields below are present, is there any issue with having this empty server value?

Copy link
Member Author

@nchaulet nchaulet Apr 17, 2023

Choose a reason for hiding this comment

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

it still will be a valid yaml

@nchaulet
Copy link
Member Author

Could you check the behavior? If there is an issue, then we may need to restrict these changes to >v8.8.0.

@jen-huang I just tested a fleet server pre-configuration with some port and hosts and looks like we do not validate extra variables so we should be okay here.

I just did a test with fleet server 7.17 and in this case the host and port for the package policy is used, to be safe I think it will make sense to restrict that change to 8.8+

@jen-huang
Copy link
Contributor

I just did a test with fleet server 7.17 and in this case the host and port for the package policy is used, to be safe I think it will make sense to restrict that change to 8.8+

@nchaulet Thanks for catching that. Let's restrict it then. Could you also update the 8.x stackpack so that we don't add these fields for 8.8+?

Copy link
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

looks good

@nchaulet nchaulet merged commit c27ebf5 into main Apr 20, 2023
@elasticmachine
Copy link

Package fleet_server - 1.3.0 containing this change is available at https://epr.elastic.co/search?package=fleet_server

@nchaulet nchaulet deleted the feature-remove-port-host branch April 20, 2023 15:06
agithomas pushed a commit to agithomas/integrations that referenced this pull request Apr 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Integration:fleet_server Fleet Server Team:Fleet Label for the Fleet team [elastic/fleet]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants