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

Jump to bottom

Make interactive setup work properly in Docker container. #110629

Merged
merged 4 commits into from
Sep 7, 2021
Merged

Make interactive setup work properly in Docker container. #110629

merged 4 commits into from
Sep 7, 2021

Conversation

azasypkin
Copy link
Member

@azasypkin azasypkin commented Aug 31, 2021 •
edited
Loading

Summary

Make interactive setup work properly in Docker container:

  • Allow passing interactiveSetup plugin settings via environment variables in Docker
  • Treat http://elasticsearch:9200 as a default Elasticsearch address when Kibana is run inside of Docker container (ELASTIC_CONTAINER=true)
  • Load, parse and check for conflicts existing Kibana config file before writing new configuration values. Existing config will be backed up (commented out) in case there are conflicts. It's mainly supposed to cover a Docker use case since Kibana docker image is shipped with existing kibana.yml file that includes elasticsearch.hosts: ["http://elasticsearch:9200"].

@azasypkin azasypkin added Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! v8.0.0 release_note:skip Skip the PR/issue when compiling release notes backport:skip This commit does not require backporting labels Aug 31, 2021
@azasypkin azasypkin mentioned this pull request Aug 31, 2021
Closed
15 tasks
@azasypkin azasypkin force-pushed the issue-xxx-interactive-setup-docker branch from 2c0b4ee to 9d9430f Compare September 1, 2021 13:26
@azasypkin azasypkin self-assigned this Sep 2, 2021
@azasypkin azasypkin force-pushed the issue-xxx-interactive-setup-docker branch 2 times, most recently from 9ea4422 to 95a43b2 Compare September 3, 2021 17:19
@azasypkin azasypkin force-pushed the issue-xxx-interactive-setup-docker branch from 95a43b2 to 79d90c4 Compare September 6, 2021 06:09
@azasypkin azasypkin marked this pull request as ready for review September 6, 2021 08:36
@azasypkin azasypkin requested review from a team as code owners September 6, 2021 08:36
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-security (Team:Security)

thomheymann
thomheymann approved these changes Sep 6, 2021
View reviewed changes
Copy link
Contributor

@thomheymann thomheymann left a comment

Choose a reason for hiding this comment

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

LGTM, verified and working as expected.

src/plugins/interactive_setup/server/kibana_config_writer.ts Outdated Show resolved Hide resolved
jbudz
jbudz approved these changes Sep 6, 2021
View reviewed changes
Copy link
Member

@jbudz jbudz left a comment

Choose a reason for hiding this comment

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

kibana-docker LGTM and I verified that docker-build-context doesn't include the comment.

@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 @azasypkin

@azasypkin azasypkin merged commit 1eed669 into elastic:master Sep 7, 2021
@azasypkin azasypkin deleted the issue-xxx-interactive-setup-docker branch September 7, 2021 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jbudz jbudz jbudz approved these changes

@thomheymann thomheymann thomheymann approved these changes

Assignees

@azasypkin azasypkin

Labels
backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@azasypkin @elasticmachine @kibanamachine @thomheymann @jbudz