Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Fix kibana config for fleet server #1054

Closed
adam-stokes wants to merge 2 commits into from
Closed

Fix kibana config for fleet server #1054

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
2e842af
Fix kibana config for fleet server
adam-stokes Apr 19, 2021
e640941
Do not force fleet recreation as no fleet server exists yet
adam-stokes Apr 19, 2021
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
4 changes: 2 additions & 2 deletions cli/config/compose/profiles/fleet/configurations/kibana.config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ xpack.fleet.enabled: true
xpack.fleet.registryUrl: http://package-registry:8080
xpack.fleet.agents.enabled: true
xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
xpack.fleet.agents.fleetServerEnabled: true
xpack.fleet.agents.kibana.host: http://kibana:5601
xpack.fleet.agents.fleet_server.hosts:
- http://kibana:5601
xpack.fleet.agents.tlsCheckDisabled: true
7 changes: 1 addition & 6 deletions e2e/_suites/fleet/fleet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,12 +419,7 @@ func (fts *FleetTestSuite) processStateChangedOnTheHost(process string, state st
func (fts *FleetTestSuite) setup() error {
log.Trace("Creating Fleet setup")

err := createFleetConfiguration()
Copy link
Copy Markdown
Contributor

@mdelapenya mdelapenya Apr 20, 2021

Choose a reason for hiding this comment

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

I think we can remove the entire function, as it's not used elsewhere

if err != nil {
return err
}

err = checkFleetConfiguration()
err := checkFleetConfiguration()
if err != nil {
return err
}
Expand Down