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

[deb/rpm] Generate os package specific kibana.yml #98213

Merged
merged 25 commits into from
Aug 31, 2021

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented Apr 23, 2021

This adds a new build task to create OS Package specific kibana.yml's. Two configurations are written:

logging.dest: /var/log/kibana/kibana.log
pid.file: /run/kibana/kibana.pid

These configurations were originally passed in as CLI arguments, which takes precedence over yml configuration. This caused issued with deployments where these configurations needed to be modified, e.g. writing log files to an external file system.

Closes #91885

@jbudz jbudz added Team:Operations Team label for Operations Team v8.0.0 labels Apr 23, 2021
const kibanaYML = readFileSync(configReadPath, {
encoding: 'utf-8',
})
.replace(/#pid.file:.*/g, 'pid.file: /run/kibana/kibana.pid')
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's verify these replacements were successful.

Copy link
Member Author

Choose a reason for hiding this comment

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

Pushed with 66cd259

@jbudz jbudz added the release_note:skip Skip the PR/issue when compiling release notes label Apr 28, 2021
@jbudz jbudz marked this pull request as ready for review April 28, 2021 19:26
@jbudz jbudz requested a review from a team as a code owner April 28, 2021 19:26
@elasticmachine
Copy link
Contributor

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


let kibanaYML = readFileSync(configReadPath, { encoding: 'utf8' });

[
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm iffy on this approach, but it does work. I looked into templating kibana.yml while preserving it's relatively static nature. Turning it into a template would remove validity of the yml, leading to more duplication.

Any thoughts here?

@jbudz
Copy link
Member Author

jbudz commented Apr 28, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 3, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 5, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 10, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 10, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 11, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 14, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 24, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented May 26, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented Jun 1, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented Jul 27, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented Aug 16, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented Aug 24, 2021

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented Aug 30, 2021

@elasticmachine merge upstream

@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 added auto-backport Deprecated - use backport:version if exact versions are needed v7.16.0 labels Aug 31, 2021
@jbudz jbudz merged commit 40b91c9 into elastic:master Aug 31, 2021
@jbudz jbudz deleted the os/kibana_yml branch August 31, 2021 23:00
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Aug 31, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
7.x

This backport PR will be merged automatically after passing CI.

kibanamachine added a commit that referenced this pull request Sep 1, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Jonathan Budzenski <jon@budzenski.me>
jbudz added a commit to jbudz/kibana that referenced this pull request Sep 2, 2021
With the merge of elastic#98213, pid and log file settings were moved from
command line options to kibana.yml.  Package tests use a non-default
kibana.yml and these settings were not applied.  This updates our
configuration to include these settings.
jbudz added a commit that referenced this pull request Sep 3, 2021
With the merge of #98213, pid and log file settings were moved from
command line options to kibana.yml.  Package tests use a non-default
kibana.yml and these settings were not applied.  This updates our
configuration to include these settings.
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Sep 3, 2021
With the merge of elastic#98213, pid and log file settings were moved from
command line options to kibana.yml.  Package tests use a non-default
kibana.yml and these settings were not applied.  This updates our
configuration to include these settings.
kibanamachine added a commit that referenced this pull request Sep 3, 2021
…1073)

With the merge of #98213, pid and log file settings were moved from
command line options to kibana.yml.  Package tests use a non-default
kibana.yml and these settings were not applied.  This updates our
configuration to include these settings.

Co-authored-by: Jonathan Budzenski <jon@budzenski.me>
jbudz added a commit to jbudz/kibana that referenced this pull request Sep 13, 2021
jbudz added a commit that referenced this pull request Sep 14, 2021
@jbudz jbudz removed the v7.16.0 label Sep 28, 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 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Kibana logs and Kibana pid configuration settings seem to be ignored in 7.11
5 participants