Skip to content

Commit

Permalink
[docs] Rename ingest manager to fleet (#79731)
Browse files Browse the repository at this point in the history
* [docs] Rename ingest manager to fleet

* remove commented out todo
  • Loading branch information
dedemorton authored Oct 7, 2020
1 parent 59d83e6 commit cc784a0
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[chapter]
[role="xpack"]
[[ingest-manager]]
= {ingest-manager}
[[fleet]]
= {fleet}

experimental[]

{ingest-manager} in {kib} enables you to add and manage integrations for popular
{fleet} in {kib} enables you to add and manage integrations for popular
services and platforms, as well as manage {elastic-agent} installations in
standalone or {fleet} mode.

Expand All @@ -17,11 +17,13 @@ Standalone mode requires you to manually configure and manage the agent locally.
* An overview of the data ingest in your {es} cluster.
* Multiple integrations to collect and transform data.

//TODO: Redo screen capture.

[role="screenshot"]
image::ingest_manager/images/ingest-manager-start.png[{ingest-manager} app in {kib}]
image::fleet/images/fleet-start.png[{fleet} app in {kib}]

[float]
== Get started

To get started with {ingest-management}, refer to the
To get started with {fleet}, refer to the
{ingest-guide}/index.html[Ingest Management Guide].
Binary file added docs/fleet/images/fleet-start.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/ingest_manager/images/ingest-manager-start.png
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[role="xpack"]
[[ingest-manager-settings-kb]]
=== {ingest-manager} settings in {kib}
[[fleet-settings-kb]]
=== {fleet} settings in {kib}
++++
<titleabbrev>{ingest-manager} settings</titleabbrev>
<titleabbrev>{fleet} settings</titleabbrev>
++++

experimental[]

You can configure `xpack.fleet` settings in your `kibana.yml`.
By default, {ingest-manager} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.
By default, {fleet} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.

See the {ingest-guide}/index.html[Ingest Management] docs for more information.

[[general-ingest-manager-settings-kb]]
==== General {ingest-manager} settings
[[general-fleet-settings-kb]]
==== General {fleet} settings

[cols="2*<"]
|===
| `xpack.fleet.enabled` {ess-icon}
| Set to `true` (default) to enable {ingest-manager}.
| Set to `true` (default) to enable {fleet}.
| `xpack.fleet.agents.enabled` {ess-icon}
| Set to `true` (default) to enable {fleet}.
|===

[[ingest-manager-data-visualizer-settings]]
[[fleet-data-visualizer-settings]]

==== {package-manager} settings

Expand Down
2 changes: 1 addition & 1 deletion docs/settings/settings-xkb.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ include::ml-settings.asciidoc[]
include::reporting-settings.asciidoc[]
include::spaces-settings.asciidoc[]
include::i18n-settings.asciidoc[]
include::ingest-manager-settings.asciidoc[]
include::fleet-settings.asciidoc[]
2 changes: 1 addition & 1 deletion docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[]
include::{kib-repo-dir}/settings/apm-settings.asciidoc[]
include::{kib-repo-dir}/settings/dev-settings.asciidoc[]
include::{kib-repo-dir}/settings/graph-settings.asciidoc[]
include::{kib-repo-dir}/settings/ingest-manager-settings.asciidoc[]
include::{kib-repo-dir}/settings/fleet-settings.asciidoc[]
include::{kib-repo-dir}/settings/i18n-settings.asciidoc[]
include::{kib-repo-dir}/settings/logs-ui-settings.asciidoc[]
include::{kib-repo-dir}/settings/infrastructure-ui-settings.asciidoc[]
Expand Down
2 changes: 1 addition & 1 deletion docs/user/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ include::monitoring/index.asciidoc[]

include::management.asciidoc[]

include::{kib-repo-dir}/ingest_manager/ingest-manager.asciidoc[]
include::{kib-repo-dir}/fleet/fleet.asciidoc[]

include::reporting/index.asciidoc[]

Expand Down

0 comments on commit cc784a0

Please sign in to comment.