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.

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

[paths] Add default lookup for kibana.yml at /etc/kibana #103934

Merged
merged 3 commits into from
Jul 9, 2021

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented Jun 30, 2021

When (KBN|KIBANA)_PATH_CONF was introduced, we removed the fallback lookup to
/etc/kibana/kibana.yml in #67433. This environment variable was added
to /etc/default/kibana and made available, scoped to the Kibana service
for deb and rpm packages. This environment setting, however, is not available
when running binaries directly and caused the regression noted in #101249.

This re-adds a fallback lookup to /etc/kibana/kibana.yml when
searching for a kibana.yml configuration.

Testing

  1. Install a .deb or .rpm package
  2. sudo -u kibana /usr/share/bin/kibana --version

Closes #101249

When `(KBN|KIBANA)_PATH_CONF` was introduced, we removed the fallback lookup to
`/etc/kibana/kibana.yml` in elastic#67433.  This environment variable was added
to `/etc/default/kibana` and made available, scoped to the Kibana service
for deb and rpm packages.  This environment setting, however, is not available
when running binaries directly and caused the regression noted in

This re-adds a fallback lookup to `/etc/kibana/kibana.yml` when
searching for a kibana.yml configuration.

Testing
1) Install a .deb or .rpm package
2) `sudo -u kibana /usr/share/bin/kibana --version`

Closes elastic#101249
@jbudz jbudz added Team:Operations Team label for Operations Team v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.14.0 v7.15.0 labels Jun 30, 2021
@jbudz jbudz requested a review from a team as a code owner June 30, 2021 16:47
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@jbudz jbudz changed the title [paths] Add default lookup for config folder at /etc/kibana [paths] Add default lookup for kibana.yml at /etc/kibana Jun 30, 2021
@jbudz
Copy link
Member Author

jbudz commented Jun 30, 2021

@jbudz jbudz added the auto-backport Deprecated - use backport:version if exact versions are needed label Jul 1, 2021
@jbudz
Copy link
Member Author

jbudz commented Jul 6, 2021

@elasticmachine merge upstream

Copy link
Member

@mistic mistic left a comment

Choose a reason for hiding this comment

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

LGTM

@mistic
Copy link
Member

mistic commented Jul 8, 2021

@elasticmachine merge upstream

@jbudz jbudz enabled auto-merge (squash) July 9, 2021 00:27
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@jbudz jbudz merged commit fcb0de4 into elastic:master Jul 9, 2021
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Jul 9, 2021
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Jul 9, 2021
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
7.14
7.x

The backport PRs will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Jul 9, 2021
kibanamachine added a commit that referenced this pull request Jul 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.14.0 v7.15.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Kibana configuration default path
4 participants