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

fix: use new file name in elastic-package v0.26.0 #1739

Merged
mdelapenya merged 2 commits into from
Oct 29, 2021
Merged

fix: use new file name in elastic-package v0.26.0 #1739

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
df326e5
chore: update kibana configs for 7.x
mdelapenya Oct 28, 2021
ccae604
fix: use new file name in elastic-package v0.26.0
mdelapenya Oct 28, 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
7 changes: 3 additions & 4 deletions cli/config/compose/profiles/fleet/default/kibana.config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ elasticsearch.password: changeme
xpack.monitoring.ui.container.elasticsearch.enabled: true

xpack.fleet.enabled: true
xpack.fleet.registryUrl: https://epr-staging.elastic.co
xpack.fleet.registryUrl: "http://package-registry:8080"
Copy link
Copy Markdown
Contributor Author

@mdelapenya mdelapenya Oct 28, 2021

Choose a reason for hiding this comment

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

Using local package registry

Copy link
Copy Markdown
Contributor Author

@mdelapenya mdelapenya Oct 29, 2021

Choose a reason for hiding this comment

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

I described my concerns about using the local package reigstry in https://github.com/elastic/e2e-testing/pull/1738/files#r738951910

Not sure if this line should be kept as it's now

xpack.fleet.agents.enabled: true
xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
xpack.fleet.agents.fleet_server.hosts:
["http://fleet-server:8220"]
xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200"
xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"]

xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012"
xpack.fleet.agents.tlsCheckDisabled: true
6 changes: 3 additions & 3 deletions cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ server.host: "0.0.0.0"

telemetry.enabled: false

elasticsearch.hosts: ["http://elasticsearch:9200"]
elasticsearch.hosts: [ "http://elasticsearch:9200" ]
elasticsearch.username: elastic
elasticsearch.password: changeme
xpack.monitoring.ui.container.elasticsearch.enabled: true

xpack.fleet.enabled: true
xpack.fleet.registryUrl: https://epr-staging.elastic.co
xpack.fleet.registryUrl: "http://package-registry:8080"
xpack.fleet.agents.enabled: true
xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200"
xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"]

xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012"
Expand Down
3 changes: 2 additions & 1 deletion internal/deploy/elastic_package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ func (ep *EPServiceManager) Add(ctx context.Context, profile ServiceRequest, ser

func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error {
// check compose profile
kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.yml")
// The kibana config file is only valid in 8.0.0, for other maintenance branches it's kibana.config.default.yml
kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.default.yml")
found, err := io.Exists(kibanaProfileFile)
if !found || err != nil {
return err
Expand Down