Skip to content

Commit

Permalink
Add more edits
Browse files Browse the repository at this point in the history
  • Loading branch information
dedemorton committed May 1, 2021
1 parent 76797fa commit 3cf9ab9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 32 deletions.
21 changes: 4 additions & 17 deletions docs/en/ingest-management/getting-started-traces.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,12 @@ include::{tab-widgets}/prereq-widget.asciidoc[]

Use {fleet} in {kib} to get APM data into the {stack}.

The first time you use {fleet}, you need to set it up:
The first time you use {fleet}, you might need to set it up and add a
{fleet-server}:

. Log in to {kib} and go to **Management > {fleet}**.
+
[role="screenshot"]
image::images/kibana-fleet-start.png[{fleet} in {kib}]
include::{tab-widgets}/add-fleet-server/widget.asciidoc[]

. In {fleet}, click **Settings** and change the defaults, if necessary.
For self-managed installations, set the URLs for {es} and {kib}, including
the http ports, then save your changes.
+
[role="screenshot"]
image::images/kibana-fleet-settings.png[{fleet} settings]

. Enable central management. Click the **Agents** tab and click
**Create user and enable central management**.
+
[role="screenshot"]
image::images/kibana-fleet-enable.png[{fleet} showing prompt to enable central management]
For more information, see <<fleet-server>>.

[discrete]
[[add-agent-to-fleet-traces]]
Expand Down
25 changes: 11 additions & 14 deletions docs/en/ingest-management/getting-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,34 @@ For feedback and questions, please contact us in the {forum}[discuss forum].
[[fleet-prereqs]]
== Prerequisites

Before you begin, please read <<fleet-limitations>>.
* Please read <<fleet-limitations>>.

You need {es} for storing and searching your data, and {kib} for visualizing and
* You need {es} for storing and searching your data, and {kib} for visualizing and
managing it. You can use our
{ess-product}[hosted {ess}]
on {ecloud} (recommended), or self-manage the {stack} on your own hardware.

+
Here's what you need for each deployment type:

+
--
include::{tab-widgets}/prereq-widget.asciidoc[]
--

[discrete]
[[set-up-fleet]]
== Step 1: Set up {fleet}

The best way to get logs, metrics, and security data into the {stack} is
by using {fleet} in {kib}.
Use {fleet} in {kib} to get logs, metrics, and security data into the {stack}.

TIP: Not using {fleet}? Advanced users who want to configure and manage
{agent}s manually can <<run-elastic-agent-standalone,run agents standalone>>.

The first time you use {fleet}, you need to set it up and add {fleet-server}:

//TODO: Make Fleet Server an active link to the Fleet Server topic

//TODO: Use tagged regions to include steps from the Fleet Server docs.
The first time you use {fleet}, you might need to set it up and add a
{fleet-server}:

//TODO: Add fleet/images/management-nav.png (for new users)
include::{tab-widgets}/add-fleet-server/widget.asciidoc[]

//TODO: Indicate that the page might take a minute to load because it's setting
//up stuff behind the scenes
For more information, see <<fleet-server>>.

[discrete]
[[add-agent-to-fleet]]
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ To add {fleet-server}:

//TODO: Mention API for adding the token.

. Log in to {kib} and go to *Management > {fleet}*.
. Log in to {kib} and go to *Management > {fleet}*. The first time you visit
this page, it might take a minute to load.

. Click *{fleet} settings*, and in the *{fleet-server} hosts* field, specify the
URL {agent}s will use to connect to {fleet-server}. For example,
Expand Down
1 change: 1 addition & 0 deletions docs/en/ingest-management/tab-widgets/prereq.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// tag::cloud[]
* Access to a deployment of our {ess-product}[hosted {ess}]
on {ecloud}. The {ess} is available on AWS, GCP, and Azure. {ess-trial}[Try it out for free].
This deployment must include an APM & Fleet node.
* User with the superuser role. See {ref}/built-in-roles.html[Built-in roles].
// end::cloud[]
Expand Down

0 comments on commit 3cf9ab9

Please sign in to comment.