Skip to content

docs: Restore keystore docs #12113

Merged
colleenmcginnis merged 5 commits intoelastic:mainfrom
colleenmcginnis:issue-11637
Nov 30, 2023
Merged

docs: Restore keystore docs #12113
colleenmcginnis merged 5 commits intoelastic:mainfrom
colleenmcginnis:issue-11637

Conversation

@colleenmcginnis
Copy link
Contributor

@colleenmcginnis colleenmcginnis commented Nov 27, 2023

Motivation/summary

Restores keystore docs removed in #10791. I wasn't sure how much to restore, but this is how I approached it:

  • I restored the Secrets keystore for secure settings page @axw mentioned in the initial request (1479581).
  • I restore the keystore section on the command reference page (d4e9212).
  • I did not add back links to the keystore docs (like this, this, and this) because it looked like some of those docs might have changed since the keystore docs were removed. Let me know if we should add them back.

Questions

  • How far back should I backport these changes?
  • Should I add a note on the Secrets keystore for secure settings page similar to the note at the top of the APM Server command reference page to clarify that the content only applies to the APM Server binary installation method?

Checklist

Related issues

Closes #11637

@colleenmcginnis colleenmcginnis added the backport-8.11 Automated backport with mergify label Nov 27, 2023
@colleenmcginnis colleenmcginnis self-assigned this Nov 27, 2023
@colleenmcginnis colleenmcginnis requested a review from a team as a code owner November 27, 2023 22:47
@axw
Copy link
Member

axw commented Nov 28, 2023

How far back should I backport these changes?

Can we please go back to 8.8?

Should I add a note on the Secrets keystore for secure settings page similar to the note at the top of the APM Server command reference page to clarify that the content only applies to the APM Server binary installation method?

Yes I think that makes sense.

axw
axw previously approved these changes Nov 28, 2023
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @colleenmcginnis !

@colleenmcginnis colleenmcginnis added backport-8.8 Automated backport with mergify backport-8.9 Automated backport with mergify backport-8.10 Automated backport with mergify labels Nov 28, 2023
@colleenmcginnis colleenmcginnis requested a review from a team November 29, 2023 17:48
@colleenmcginnis colleenmcginnis merged commit 50815d1 into elastic:main Nov 30, 2023
@colleenmcginnis colleenmcginnis deleted the issue-11637 branch November 30, 2023 15:43
mergify bot pushed a commit that referenced this pull request Nov 30, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)
mergify bot pushed a commit that referenced this pull request Nov 30, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)
mergify bot pushed a commit that referenced this pull request Nov 30, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)
mergify bot pushed a commit that referenced this pull request Nov 30, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)
mergify bot added a commit that referenced this pull request Dec 4, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Dec 4, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Dec 4, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot added a commit that referenced this pull request Dec 4, 2023
* restore old keystore doc

* restore keystore section in command reference

* add new advanced settings pages to list

* add a note

(cherry picked from commit 50815d1)

Co-authored-by: Colleen McGinnis <colleen.mcginnis@elastic.co>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.8 Automated backport with mergify backport-8.9 Automated backport with mergify backport-8.10 Automated backport with mergify backport-8.11 Automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docs: add keystore command docs

2 participants