Skip to content

Support different Kibana configs based on stack version #553

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

Merged
merged 13 commits into from
Oct 26, 2021

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Oct 26, 2021

Issue: #552

This PR introduces a mechanism to support multiple Kibana config files to mitigate problems with starting the 8.x stack. There are lot of changes due to "profiles" support and this is something we need to address in follow-ups.

Follow-ups:

  • research if we can introduce similar support for Elasticsearch config (use config file)
  • address FIXME
  • refactor "profiles" logic, after some time we have spaghetti code there (switching to KibanaConfigFile affected too many places)

@mtojek mtojek self-assigned this Oct 26, 2021
@mtojek
Copy link
Contributor Author

mtojek commented Oct 26, 2021

/test

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 26, 2021

💚 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: 2021-10-26T14:20:10.777+0000

  • Duration: 35 min 23 sec

  • Commit: 6a56dd3

Test stats 🧪

Test Results
Failed 0
Passed 438
Skipped 4
Total 442

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@mtojek mtojek marked this pull request as ready for review October 26, 2021 13:21
@mtojek mtojek requested a review from jsoriano October 26, 2021 13:21
Copy link
Member

@jsoriano jsoriano 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, and I agree with the follow ups. There may be more changes needed if more breaking changes are introduced till 8.0 is released, but let's merge this if this unblocks the use of 8.x stacks by now.

Makefile Outdated
./scripts/test-stack-command.sh

test-stack-command-lts:
Copy link
Member

Choose a reason for hiding this comment

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

Nit.

Suggested change
test-stack-command-lts:
test-stack-command-7x:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

Comment on lines +53 to +54
withEnv(stackVariantAsEnv(options.StackVersion)).
withEnvs(options.Profile.ComposeEnvVars()).
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we can encapsulate all the particularities for a given version in the profile.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

First we have to clean this dependency hell around profiles, but in general I agree with you.

@mtojek mtojek changed the title Support different stack descriptions Support different Kibana configs based on stack version Oct 26, 2021
@mtojek mtojek merged commit 96f1205 into elastic:master Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants