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

docs: Restructure and deduplicate security docs #18594

Merged
merged 7 commits into from
Jun 4, 2020

Conversation

bmorelli25
Copy link
Member

@bmorelli25 bmorelli25 commented May 15, 2020

What does this PR do?

This PR restructures the security documentation in a few different ways:

  • Secure content is now sorted in the order a user would complete each task.
  • The content in Configure authentication credentials, Configure {beatname} to use encrypted connections, and Secure communication with Elasticsearch has been consolidated and deduplicated into a single file: Secure communication with Elasticsearch. It has also been restructured to be more of a user guide.
  • User creation has moved to individual pages to allow room for APM Server to document the creation of additional user roles.

Before and after:
Screen Shot 2020-05-15 at 12 27 46 PM

What doesn't this PR do?

This PR does not touch the Secure communication with Logstash or the Use Linux Secure Computing Mode (seccomp) files.

Related issues

elastic/apm-server#3596.

HTML preview

http://beats_18594.docs-preview.app.elstc.co/diff

Redirects

The following pages have been removed and will need redirects:

  • /beats-tls.html
  • /securing-beats.html
  • /beats-basic-auth.html

@bmorelli25 bmorelli25 requested a review from dedemorton May 15, 2020 19:29
@bmorelli25 bmorelli25 self-assigned this May 15, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 15, 2020
@bmorelli25
Copy link
Member Author

bmorelli25 commented May 15, 2020

I have no idea which team label to apply to this. I guess APM, as that was the initial motivation for these changes, but these changes impact all Beats.

@bmorelli25 bmorelli25 added the Team:apm APM Server team issues/PRs label May 15, 2020
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 15, 2020
@bmorelli25 bmorelli25 requested a review from EamonnTP May 15, 2020 19:33
Comment on lines 116 to 148
ifndef::apm-server[]
[role="xpack"]
[float]
[[securing-communication-kibana]]
=== Secure communication with the Kibana endpoint

If you've configured the <<setup-kibana-endpoint,{kib} endpoint>>,
you can also specify credentials for authenticating with {kib} under `kibana.setup`.
If no credentials are specified, Kibana will use the configured authentication method
in the Elasticsearch output.

For example, specify a unique username and password to connect to Kibana like this:

--
["source","yaml",subs="attributes,callouts"]
----
setup.kibana:
host: "mykibanahost:5601"
username: "{beat_default_index_prefix}_kib_setup" <1>
password: "{pwd}" <2>
----
<1> This user needs privileges required to set up dashboards. To create a user like this,
see <<privileges-to-setup-beats>>.
<2> This example shows a hard-coded password, but you should store sensitive
values
ifndef::serverless[]
in the <<keystore,secrets keystore>>.
endif::[]
ifdef::serverless[]
in environment variables.
endif::[]
endif::apm-server[]
--
Copy link
Member Author

Choose a reason for hiding this comment

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

Should this content move to its own top-level heading/page? The TOC would then include:

  • Secure communication with Elasticsearch
  • Secure communication with Kibana
  • Secure communication with Logstash

Alternatively, we could group these under a new header, like this:

  • Secure communication with the Elastic Stack
    • Elasticsearch
    • Kibana
    • Logstash

Choose a reason for hiding this comment

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

I do like the idea of grouping the content under a new heading, "Secure communication with the Elastic Stack".

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 15, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Branch indexing]

  • Start Time: 2020-05-20T19:49:08.401+0000

  • Duration: 24 min 32 sec (1412247)


[[privileges-to-setup-beats]]
==== Grant privileges and roles needed for setup
=== Grant privileges and roles needed for setup
Copy link
Member Author

Choose a reason for hiding this comment

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

If it's alright, I'll probably move each role into its own file in libbeat/docs/security/.

@bmorelli25
Copy link
Member Author

bmorelli25 commented May 15, 2020

Please hold on reviewing this. I have some links to fix.

@bmorelli25
Copy link
Member Author

Ready for review again.

14:11:24 INFO:build_docs:Bad cross-document links:
14:11:24 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/elasticsearch/reference/master/beats.html:
14:11:24 INFO:build_docs:   - en/beats/auditbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/filebeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/heartbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/metricbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/packetbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/winlogbeat/master/securing-beats.html
14:11:24 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/elasticsearch/reference/master/ccs-clients-integrations.html:
14:11:24 INFO:build_docs:   - en/beats/auditbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/filebeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/heartbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/metricbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/packetbeat/master/securing-beats.html
14:11:24 INFO:build_docs:   - en/beats/winlogbeat/master/securing-beats.html
14:11:24 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/elasticsearch/reference/master/get-started-verify-users.html:
14:11:24 INFO:build_docs:   - en/beats/filebeat/master/securing-beats.html
14:11:24 INFO:build_docs:  /tmp/docsbuild/target_repo/html/en/elasticsearch/reference/master/ssl-tls.html:
14:11:24 INFO:build_docs:   - en/beats/filebeat/master/securing-beats.html

Broken links have been fixed in elastic/elasticsearch#56875.

@bmorelli25
Copy link
Member Author

@elasticmachine, run elasticsearch-ci/docs

Copy link

@EamonnTP EamonnTP 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! As a newbie to Elastic, I found the content clear and concise to follow. As it's still early days for me, I feel @dedemorton would be in a better position to make a judgement call on the overall restructuring.

Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

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

Thanks so much for taking this on! I like what you've done with the reorg. I had a couple of minor comments, but otherwise looks good! TBH it's been awhile since I've gone through the security setup myself. Let's make sure at least one developer from the beats team reviews this.

libbeat/docs/https.asciidoc Outdated Show resolved Hide resolved
libbeat/docs/https.asciidoc Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 27, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Branch indexing]

  • Start Time: 2020-06-02T13:42:42.665+0000

  • Duration: 23 min 35 sec

@bmorelli25 bmorelli25 merged commit 9e38e66 into elastic:master Jun 4, 2020
@bmorelli25 bmorelli25 deleted the security-docs-structure branch June 4, 2020 15:11
bmorelli25 added a commit to bmorelli25/beats that referenced this pull request Jul 20, 2020
bmorelli25 added a commit to bmorelli25/beats that referenced this pull request Jul 20, 2020
bmorelli25 added a commit to bmorelli25/beats that referenced this pull request Jul 20, 2020
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Team:apm APM Server team issues/PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants