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

[rpm] Create default environment file at "/etc/sysconfig/kibana" #82144

Merged
merged 8 commits into from
Nov 17, 2020
Merged

[rpm] Create default environment file at "/etc/sysconfig/kibana" #82144

merged 8 commits into from
Nov 17, 2020

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented Oct 30, 2020 •
edited
Loading

instead of "/etc/default/kibana".

This is a standards difference. rpm based distributions generally
use /etc/sysconfig. In production we're reading from both, with
sysconfig second to override any historical differences.

Related to #36671, #6423

Testing:

  • A fresh rpm installation should have /etc/sysconfig/kibana
  • Environment variables set in /etc/default/kibana and /etc/sysconfig/kibana should both be used
  • Settings in /etc/sysconfig/kibana should take precedence

@jbudz
[rpm] Create default environment file at "/etc/sysconfig/kibana" instead
3cd1a5e 
of "/etc/default/kibana".

This is a standards difference.  rpm based distributions generally
use /etc/sysconfig.  In production we're reading from both, with
sysconfig second to override any historical differences.

Related to elastic#36671, elastic#6423
@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.11.0 labels Oct 30, 2020
@jbudz jbudz requested a review from a team as a code owner October 30, 2020 15:01
@elasticmachine
Copy link
Contributor

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

@jbudz
Copy link
Member Author

jbudz commented Oct 30, 2020

https://s3-us-west-1.amazonaws.com/kibana.budzenski.com/82144/3cd1a5e/kibana-8.0.0-SNAPSHOT-x86_64.rpm
https://s3-us-west-1.amazonaws.com/kibana.budzenski.com/82144/3cd1a5e/kibana-8.0.0-SNAPSHOT-amd64.deb

@jbudz
Copy link
Member Author

jbudz commented Nov 2, 2020

@elasticmachine merge upstream

@jbudz jbudz added the review label Nov 2, 2020
@jbudz
Copy link
Member Author

jbudz commented Nov 4, 2020

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented Nov 6, 2020

@elasticmachine merge upstream

tylersmalley
tylersmalley suggested changes Nov 7, 2020
View reviewed changes
Copy link
Contributor

@tylersmalley tylersmalley left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Unable to start on CentOS

● kibana.service - Kibana
   Loaded: loaded (/etc/systemd/system/kibana.service; enabled; vendor preset: disabled)
   Active: failed (Result: exit-code) since Sat 2020-11-07 00:22:10 UTC; 1s ago
     Docs: https://www.elastic.co
  Process: 3030 ExecStart=/usr/share/kibana/bin/kibana --logging.dest=/var/log/kibana/kibana.log (code=exited, status=64)
 Main PID: 3030 (code=exited, status=64)

Nov 07 00:22:10 tyler-centos systemd[1]: kibana.service: Service RestartSec=3s expired, scheduling restart.
Nov 07 00:22:10 tyler-centos systemd[1]: kibana.service: Scheduled restart job, restart counter is at 3.
Nov 07 00:22:10 tyler-centos systemd[1]: Stopped Kibana.
Nov 07 00:22:10 tyler-centos systemd[1]: kibana.service: Start request repeated too quickly.
Nov 07 00:22:10 tyler-centos systemd[1]: kibana.service: Failed with result 'exit-code'.
Nov 07 00:22:10 tyler-centos systemd[1]: Failed to start Kibana.

@jbudz
Copy link
Member Author

jbudz commented Nov 9, 2020

@elasticmachine merge upstream

@jbudz
Copy link
Member Author

jbudz commented Nov 9, 2020 •
edited
Loading

Do you have the logs above/have the environment available still? I just ran through upgrade and fresh install scenarios and couldn't reproduce. I'll get fresh builds up in case there's any conflicts.

edit:
https://s3-us-west-1.amazonaws.com/kibana.budzenski.com/82144/c7fe34e/kibana-8.0.0-SNAPSHOT-amd64.deb
https://s3-us-west-1.amazonaws.com/kibana.budzenski.com/82144/c7fe34e/kibana-8.0.0-SNAPSHOT-x86_64.rpm

@jbudz
Copy link
Member Author

jbudz commented Nov 16, 2020

@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

@tylersmalley
Copy link
Contributor

LGTM - something must have been up with my test env.

@jbudz jbudz merged commit 24c8b82 into elastic:master Nov 17, 2020
@jbudz jbudz deleted the os/mv-rpm-etc-sysconfig branch November 17, 2020 20:09
jbudz added a commit that referenced this pull request Nov 17, 2020
@jbudz @kibanamachine
[rpm] Create default environment file at "/etc/sysconfig/kibana" (#82144
242eae0 
)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@jbudz
Copy link
Member Author

jbudz commented Nov 17, 2020 •
edited
Loading

7.x/7.11: 242eae0

phillipb added a commit to phillipb/kibana that referenced this pull request Nov 18, 2020
@phillipb
Merge branch 'master' of github.com:elastic/kibana into add-metrics-t…
2def566 
…o-node-details

* 'master' of github.com:elastic/kibana: (65 commits)
  update chromedriver dependency to 87 (elastic#83624)
  [TSVB] use new Search API for rollup search (elastic#83275)
  [TSVB] Y-axis has number formatting not considering all series formatters in the group (elastic#83438)
  [Logs UI] Update <LogStream /> internal state when its props change (elastic#83302)
  Add tag bulk action context menu (elastic#82816)
  [code coverage] adding plugin to flush coverage data (elastic#83447)
  [UsageCollection] Expose `KibanaRequest` to explicitly opted-in collectors (elastic#83413)
  Added eventBus to trigger and listen plotHandler event (elastic#83435)
  [Runtime fields] Editor phase 1 (elastic#81472)
  [Maps] Fix threshold alert issue resolving nested fields (elastic#83577)
  chore(NA): remove usage of unverified es snapshots (elastic#83589)
  [DOCS] Adds Elastic Contributor Program link (elastic#83561)
  Upgrade EUI to v30.2.0 (elastic#82730)
  Don't show loading screen during auto-reload (elastic#83376)
  Functional tests - fix esArchive mappings with runtime fields (elastic#83530)
  [deb/rpm] Create keystore after installation (elastic#76465)
  [rpm] Create default environment file at "/etc/sysconfig/kibana" (elastic#82144)
  [docker] removes workaround for missing crypto-policies-scripts subpackage (elastic#83455)
  [ML] Persisted URL state for the Data frame analytics jobs and models pages (elastic#83439)
  adds xpack.security.authc.selector.enabled setting (elastic#83551)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tylersmalley tylersmalley tylersmalley approved these changes

Assignees
No one assigned
Labels
backported release_note:skip Skip the PR/issue when compiling release notes review Team:Operations Team label for Operations Team v7.11.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jbudz @elasticmachine @kibanamachine @tylersmalley