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

[Fleet] Remove host and port for Fleet Server #5896

Merged
merged 2 commits into from
Apr 20, 2023
Merged

[Fleet] Remove host and port for Fleet Server #5896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cf1069
[Fleet] Remove host and port for Fleet Server
nchaulet Apr 17, 2023
dd53973
restrict to Kibana 8.8+
nchaulet Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/fleet_server/agent/input/agent.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 •
edited
Loading

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

{{#if port}}
port: {{port}}
{{/if}}
{{#if host}}
host: {{host}}
{{/if}}
{{#if max_connections}}
limits.max_connections: {{max_connections}}
{{/if}}
Expand Down
5 changes: 5 additions & 0 deletions packages/fleet_server/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.3.0"
changes:
- description: Remove host and port
type: enhancement
link: https://github.com/elastic/integrations/pull/5896
- version: "1.2.0"
changes:
- description: Added max agents field, deprecated max connections
Expand Down
18 changes: 2 additions & 16 deletions packages/fleet_server/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: fleet_server
title: Fleet Server
version: 1.2.0
version: 1.3.0
release: ga
description: Centrally manage Elastic Agents with the Fleet Server integration.
type: integration
format_version: 1.0.0
license: basic
categories: ["elastic_stack"]
conditions:
kibana.version: "^7.16.0 || ^8.0.0"
kibana.version: "^8.8.0"
owner:
github: elastic/elastic-agent-control-plane
icons:
Expand All @@ -26,20 +26,6 @@ policy_templates:
description: "Fleet Server Configuration"
template_path: "agent.yml.hbs"
vars:
- name: host
type: text
title: Host
required: true
show_user: true
default:
- 0.0.0.0
- name: port
type: integer
title: Port
required: true
show_user: true
default:
- 8220
- name: max_agents
type: integer
title: Max agents (per server)
Expand Down