diff --git a/docs/en/ingest-management/faq.asciidoc b/docs/en/ingest-management/faq.asciidoc index 37d41a2691..42f7e05420 100644 --- a/docs/en/ingest-management/faq.asciidoc +++ b/docs/en/ingest-management/faq.asciidoc @@ -12,9 +12,9 @@ Also read <>. [discrete] [[enrolled-agent-not-showing-up]] -== Why doesn't my enrolled Agent show up in the {ingest-manager} app? +== Why doesn't my enrolled agent show up in the {fleet} app? -If {agent} was successfully enrolled, but doesn't show up in the {fleet} list, +If {agent} was successfully enrolled, but doesn't show up in the *Agents* list, it might not be started. You need to <>. [discrete] @@ -28,9 +28,9 @@ higher level problem to triage. [discrete] [[what-is-my-agent-config]] -== What configuration is the {agent} running? +== What policy is the {agent} running? -To find the configuration file, inspect the `elastic-agent.yml` file in the +To find the policy file, inspect the `elastic-agent.yml` file in the folder where you ran {agent}. If you're running the agent in {fleet} mode, this file contains the following citation: @@ -39,13 +39,13 @@ file contains the following citation: Management: mode: "fleet" ---- -The `action_store.yml` contains the entire, unencrypted configuration: +The `action_store.yml` contains the entire, unencrypted policy: * To see the {es} location, look at `outputs:hosts`. * To see the {agent} version, look at the download folder and zip filenames. This file also shows the version of all packages used by the current -configuration. +policy. [discrete] [[where-is-the-data-agent-is-sending]] @@ -110,7 +110,7 @@ available in a future release. == Does {agent} or {kib} download integration packages? {agent} does not download integration packages. When you add an integration in -{ingest-manager}, {kib} connects to the {package-registry} at `epr.elastic.co`, +{fleet}, {kib} connects to the {package-registry} at `epr.elastic.co`, downloads the integration package, and stores its assets in {es}. This means that you no longer have to run a manual setup command to load integrations as you did previously with {beats} modules. @@ -140,7 +140,7 @@ command on the host to load assets, such as ingest pipelines and dashboards. In contrast, {beats} managed by {agent} use integration packages that {kib} downloads from the {package-registry} at `epr.elastic.co`. This means that {agent} does not need extra privileges to set up assets because -{ingest-manager} manages the assets. +{fleet} manages the assets. [discrete] [[what-is-the-endpoint-package]] diff --git a/docs/en/ingest-management/ingest-management-limitations.asciidoc b/docs/en/ingest-management/fleet-limitations.asciidoc similarity index 86% rename from docs/en/ingest-management/ingest-management-limitations.asciidoc rename to docs/en/ingest-management/fleet-limitations.asciidoc index 5543464f21..93c98f2b92 100644 --- a/docs/en/ingest-management/ingest-management-limitations.asciidoc +++ b/docs/en/ingest-management/fleet-limitations.asciidoc @@ -1,12 +1,12 @@ -[[ingest-management-limitations]] +[[fleet-limitations]] [role="xpack"] = Limitations of this release beta[] -{ingest-manager} is currently only available to users with the +{fleet} is currently only available to users with the {ref}/built-in-roles.html[superuser role]. This role is necessary to create -indices, install integration assets, and update {agent} configurations. In order +indices, install integration assets, and update {agent} policies. In order to use {fleet}, the {agent}s must have a direct network connection to {kib} and {es}. It is also possible to run the {agent}s in standalone mode in cases where a network connection is not available or not needed. diff --git a/docs/en/ingest-management/ingest-management-overview.asciidoc b/docs/en/ingest-management/fleet-overview.asciidoc similarity index 69% rename from docs/en/ingest-management/ingest-management-overview.asciidoc rename to docs/en/ingest-management/fleet-overview.asciidoc index 362fdd29f6..d16ec28cb8 100644 --- a/docs/en/ingest-management/ingest-management-overview.asciidoc +++ b/docs/en/ingest-management/fleet-overview.asciidoc @@ -1,6 +1,6 @@ -[[ingest-management-overview]] +[[fleet-overview]] [role="xpack"] -= Ingest management overview += Overview beta[] @@ -11,13 +11,13 @@ beta[] {agent} is a single, unified way to add monitoring for logs, metrics, and other types of data to each host. A single agent makes it easier and faster to deploy monitoring across your infrastructure. The agent's single, unified -configuration makes it easier to add integrations for new data sources. +policy makes it easier to add integrations for new data sources. [discrete] -[[ingest-manager]] -== {ingest-manager} +[[fleet]] +== {fleet} -{ingest-manager} provides a web-based UI in {kib} to add and manage integrations +{fleet} provides a web-based UI in {kib} to add and manage integrations for popular services and platforms, as well as manage a fleet of {agent}s. Our integrations provide an easy way to add new sources of data, plus they ship with out-of-the-box assets like dashboards, visualizations, and pipelines to @@ -29,28 +29,28 @@ image::images/integrations.png[Integrations page] [discrete] [[configuring-integrations]] -== {integrations} in {ingest-manager} +== {integrations} in {fleet} -{ingest-manager} provides a web-based UI for configuring integrations with your +{fleet} provides a web-based UI for configuring integrations with your data sources. This includes popular services and platforms like Nginx or AWS, as well as many generic input types like log files. -The {agent} configuration allows you to use any number of integrations for -data sources. You can apply the {agent} configuration to multiple agents, +The {agent} policy allows you to use any number of integrations for +data sources. You can apply the {agent} policy to multiple agents, making it even easier to manage configuration at scale. [role="screenshot"] image::images/add-integration.png[Add integration page] -When you add an integration, you select the agent configuration to use then +When you add an integration, you select the agent policy to use then configure inputs for logs and metrics, such as the path to your Nginx access logs. When you're done, you save the integration to update the {agent} -configuration. The next time enrolled agents check in, they receive the update. -Having the configurations automatically deployed is more convenient +policy. The next time enrolled agents check in, they receive the update. +Having the policies automatically deployed is more convenient than doing it yourself by using SSH, Ansible playbooks, or some other tool. If you prefer infrastructure as code, you may use YAML files and APIs. -{ingest-manager} has an API-first design. Anything you can do in the UI, you +{fleet} has an API-first design. Anything you can do in the UI, you can also do using the API. This makes it easy to automate and integrate with other systems. @@ -58,21 +58,22 @@ other systems. [[central-management]] == Central management in {fleet} -You can see the state of all your {agent}s on the {fleet} page. Here you can see -which agents are online, which have errors, and the last time they checked in. -You can also see the version of the {agent} binary and configuration. +You can see the state of all your {agent}s in {fleet}. On the **Agents** page, +you can see which agents are online, which have errors, and the last time +they checked in. You can also see the version of the {agent} binary and +policy. -//TODO: Replace this screen after testing (to show a number of agents). +//TODO: Replace this screenshot with one that shows more than one agent. [role="screenshot"] -image::images/fleet.png[{fleet} page] +image::images/kibana-fleet-agents.png[Agents page] {fleet} serves as the communication channel back to the {agent}s. Agents check in for the latest updates on a regular basis. You can have any number of agents -enrolled into each agent configuration, which allows you to scale up to -thousands of hosts. When you make a change to an agent configuration, all the +enrolled into each agent policy, which allows you to scale up to +thousands of hosts. When you make a change to an agent policy, all the agents receive the update during their next check-in. You no longer have to -distribute configuration updates yourself. +distribute policy updates yourself. [discrete] [[data-streams]] @@ -86,8 +87,12 @@ permissions. These indices are called _data streams_. As you can see in the following screen, each data stream (or index) is broken out by dataset, type, and namespace. +// REVIEWERS: Have I gotten the terminology right here? It sounds +// like datasets is still a concept, but when we talk about the indices created +// here, they are data streams. Is that correct? + [role="screenshot"] -image::images/datasets.png[Datasets page] +image::images/kibana-fleet-datastreams.png[Data streams page] The _dataset_ is defined by the integration and describes the fields and other settings for each index. For example, you might have one dataset for process diff --git a/docs/en/ingest-management/getting-started.asciidoc b/docs/en/ingest-management/getting-started.asciidoc index 5772fdde38..cee7f114f8 100644 --- a/docs/en/ingest-management/getting-started.asciidoc +++ b/docs/en/ingest-management/getting-started.asciidoc @@ -8,8 +8,7 @@ beta[] -This guide describes how to use the {ingest-management} capabilities in the -{stack} to: +This guide describes how to: * Collect logs and metrics from systems and services across your organization * Send the data to the {stack} @@ -18,10 +17,10 @@ This guide describes how to use the {ingest-management} capabilities in the For feedback and questions, please contact us in the {im-forum}[discuss forum]. [discrete] -[[ingest-manager-prereqs]] +[[fleet-prereqs]] == Prerequisites -Before you begin, please read <>. +Before you begin, please read <>. You need {es} for storing and searching your data, and {kib} for visualizing and managing it. You can use our @@ -36,57 +35,45 @@ include::tab-widgets/prereq-widget.asciidoc[] [[install-integration]] == Step 1: Add integrations -{ingest-manager} provides _integrations_ that bundle various assets needed to +{fleet} provides _integrations_ that bundle various assets needed to ingest and visualize data. In this guide, we assume that you have `nginx` running on some of your infrastructure, and want to collect logs and metrics from it. To do so: -. Log in to {kib} and go to **Management > {ingest-manager}**. +. Log in to {kib} and go to **Management > {fleet}**. + [role="screenshot"] -image::images/kibana-ingest-manager-start.png[{ingest-manager} in {kib}] +image::images/kibana-fleet-start.png[{fleet} in {kib}] -. In {ingest-manager}, click the **Integrations** tab and use the search bar to +. In {fleet}, click the **Integrations** tab and use the search bar to find the Nginx integration. + [role="screenshot"] -image::images/kibana-ingest-manager-integrations-nginx.png[{ingest-manager} showing Nginx integration] +image::images/kibana-fleet-integrations-nginx.png[{fleet} showing Nginx integration] . Click the Nginx integration to see more details about it, and then click **Add Nginx**. + [role="screenshot"] -image::images/kibana-ingest-manager-integrations-nginx-overview.png[{ingest-manager} showing Nginx integration overview] +image::images/kibana-fleet-integrations-nginx-overview.png[{fleet} showing Nginx integration overview] -. On the **Add Nginx integration** page, click the default agent configuration -to select it, then scroll down to inspect or change the default settings. +. On the **Add Nginx integration** page, select the default agent policy, +then scroll down to inspect or change the default settings. ++ +[role="screenshot"] +image::images/add-integration.png[{fleet} Add Nginx integration page] . If your logs are not in the default location, click the down arrow next to enabled streams and change the **Paths** field. . When you're done, click **Save integration**. + -[role="screenshot"] -image::images/kibana-ingest-manager-integrations-nginx-add-datasource.png[{ingest-manager} Add data source screen] - -. To verify that the integration is installed, click the **Integrations** tab -and then click **Installed Integrations**. -+ -The Nginx integration has been installed and should show up in this list. Note -that the **System** and **Elastic Endpoint Security** integrations are installed -by default. +The newly added Nginx integration should appear under **Integrations** in the +Default policy. Note that the `system-1` integration has been created by +default. + [role="screenshot"] -image::images/kibana-ingest-manager-integrations-list-installed.png[{ingest-manager} showing installed integrations] - -. Select the **Configurations** tab, and in the list of agent configurations, -click **Default config**. -+ -The newly added Nginx integration should appear under **Integrations**. -Note that the `system-1` integration has been created by default. -+ -[role="screenshot"] -image::images/kibana-ingest-manager-configurations-default-with-nginx.png[{ingest-manager} showing default agent configuration with nginx-1 datasource] +image::images/kibana-fleet-policies-default-with-nginx.png[{fleet} showing default agent policy with nginx-1 datasource] [discrete] [[install-run-elastic-agent]] @@ -102,8 +89,8 @@ installation options. After the download is complete, decide which mode you want to run in: {fleet} or standalone. What's the difference? -* With <>, you use {ingest-manager} in {kib} to -define and manage {agent} configurations from a central location. +* With <>, you use {fleet} in {kib} to +define and manage {agent} policies from a central location. * With <>, you configure {agent} manually on the system where the agent is installed. @@ -113,32 +100,32 @@ manually on the system where the agent is installed. To use {fleet} to configure {agent}: -. In {ingest-manager}, click **Settings** and change the defaults, if necessary. +. 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-ingest-manager-settings.png[{ingest-manager} settings] +image::images/kibana-fleet-settings.png[{fleet} settings] -. Enable {fleet}. Click the **{fleet}** tab and click -**Create user and enable {fleet}**. +. Enable central management. Click the **Agents** tab and click +**Create user and enable central management**. + [role="screenshot"] -image::images/kibana-ingest-manager-fleet-enable.png[{ingest-manager} showing prompt to enable {fleet}] +image::images/kibana-fleet-enable.png[{fleet} showing prompt to enable central management] -. On the **{fleet}** tab, click **Add agent** and complete the steps under -**Enroll with {fleet}**. Skip the first step because you downloaded {agent} +. On the **Agents** tab, click **Add agent** and complete the steps under +**Enroll in {fleet}**. Skip the first step because you downloaded {agent} earlier. -. Select an agent configuration (or accept the default). +. Choose an agent policy (or accept the default). -. Copy the command for enrolling the agent. +. Copy the command for enrolling and starting the agent. + The copied command contains your {kib} URL and an enrollment key that was -generated by {ingest-manager}. +generated by {fleet}. + [role="screenshot"] -image::images/kibana-ingest-manager-fleet-enrol.png[{ingest-manager} showing agent enrollment dialog] +image::images/kibana-fleet-enroll.png[{fleet} showing agent enrollment page] . In the directory where {agent} is installed, run the command you copied. Note that this command will overwrite the `elastic-agent.yml` file in that directory. @@ -147,17 +134,11 @@ that this command will overwrite the `elastic-agent.yml` file in that directory. include::{beats-repo-dir}/x-pack/elastic-agent/docs/tab-widgets/enroll-widget.asciidoc[] -- -. Run {agent}: -+ --- -include::{beats-repo-dir}/x-pack/elastic-agent/docs/tab-widgets/run-widget.asciidoc[] --- - -. In {ingest-manager}, click **Continue** to go to the **{fleet}** +. In {fleet}, click **Continue** to go to the **Agents** tab, where you should see the newly enrolled agent. + [role="screenshot"] -image::images/kibana-ingest-manager-fleet-agents.png[{ingest-manager} showing enrolled agents] +image::images/kibana-fleet-agents.png[{fleet} showing enrolled agents] If you run into problems, see <>. @@ -173,24 +154,24 @@ To configure {agent} manually: **Standalone mode**. Skip the first step because you downloaded {agent} earlier. -. Select an agent configuration (or accept the default). +. Select an agent policy (or accept the default). -. Copy the content of the agent configuration and put it into a file named +. Copy the content of the agent policy and put it into a file named `elastic-agent.yml` on the system where {agent} is installed. + [role="screenshot"] -image::images/kibana-ingest-manager-configurations-default-yaml.png[{ingest-manager} showing default agent configuration in YAML format] +image::images/kibana-fleet-policies-default-yaml.png[{fleet} showing default agent policy in YAML format] + -NOTE: The configuration file generated by {ingest-manager} already -contains the correct {es} address and port for your setup. If you run everything -locally, the address is `127.0.0.1:9200`. If you use our -https://www.elastic.co/cloud/elasticsearch-service[hosted {ess}] on -{ecloud}, the address corresponds to the {es} endpoint URL that is listed -under **Endpoints** as described in -{cloud}/ec-working-with-elasticsearch.html[Work with {es}]. +NOTE: The policy generated by {fleet} already contains the correct {es} address +and port for your setup. If you run everything locally, the address is +`127.0.0.1:9200`. If you use our +https://www.elastic.co/cloud/elasticsearch-service[hosted {ess}] on {ecloud}, +the address corresponds to the {es} endpoint URL that is listed under +**Endpoints** as described in {cloud}/ec-working-with-elasticsearch.html[Work +with {es}]. . Change the {es} username and password in the `outputs` section of the -configuration file: +policy file: + [source,yaml] ---- @@ -217,15 +198,13 @@ include::{beats-repo-dir}/x-pack/elastic-agent/docs/tab-widgets/run-standalone-w [[view-data]] == Step 4: View your data -In {ingest-manager}, click the **Datasets** tab to inspect the data +In {fleet}, click the **Data streams** tab to inspect the data that is sent by {agent}. From the **Actions** column, you can navigate to the dashboards corresponding to the data type that is sent. [role="screenshot"] -image::images/kibana-ingest-manager-datastreams.png[{ingest-manager} showing data streams list] +image::images/kibana-fleet-datastreams.png[{fleet} showing data streams list] -//Adding this section for future use. Might be premature to add this for the -//beta release. [discrete] == What's next? diff --git a/docs/en/ingest-management/images/add-integration.png b/docs/en/ingest-management/images/add-integration.png index 0d683c937c..df58e044c9 100644 Binary files a/docs/en/ingest-management/images/add-integration.png and b/docs/en/ingest-management/images/add-integration.png differ diff --git a/docs/en/ingest-management/images/datasets.png b/docs/en/ingest-management/images/datasets.png deleted file mode 100644 index cd4dd17e6a..0000000000 Binary files a/docs/en/ingest-management/images/datasets.png and /dev/null differ diff --git a/docs/en/ingest-management/images/fleet.png b/docs/en/ingest-management/images/fleet.png deleted file mode 100755 index 39100edc0b..0000000000 Binary files a/docs/en/ingest-management/images/fleet.png and /dev/null differ diff --git a/docs/en/ingest-management/images/integrations.png b/docs/en/ingest-management/images/integrations.png index 8372b241a3..4fd2a35778 100644 Binary files a/docs/en/ingest-management/images/integrations.png and b/docs/en/ingest-management/images/integrations.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-agents.png b/docs/en/ingest-management/images/kibana-fleet-agents.png new file mode 100644 index 0000000000..fa42fbb24a Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-agents.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-datastreams.png b/docs/en/ingest-management/images/kibana-fleet-datastreams.png new file mode 100644 index 0000000000..e3022582ef Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-datastreams.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-enable.png b/docs/en/ingest-management/images/kibana-fleet-enable.png new file mode 100644 index 0000000000..4a464d2829 Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-enable.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-enroll.png b/docs/en/ingest-management/images/kibana-fleet-enroll.png new file mode 100644 index 0000000000..036558ea48 Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-enroll.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-integrations-nginx-overview.png b/docs/en/ingest-management/images/kibana-fleet-integrations-nginx-overview.png new file mode 100644 index 0000000000..cc4ec2aa05 Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-integrations-nginx-overview.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-integrations-nginx.png b/docs/en/ingest-management/images/kibana-fleet-integrations-nginx.png new file mode 100644 index 0000000000..e91fedd7cb Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-integrations-nginx.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-policies-default-with-nginx.png b/docs/en/ingest-management/images/kibana-fleet-policies-default-with-nginx.png new file mode 100644 index 0000000000..9bdda497da Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-policies-default-with-nginx.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-policies-default-yaml.png b/docs/en/ingest-management/images/kibana-fleet-policies-default-yaml.png new file mode 100644 index 0000000000..d9171a7387 Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-policies-default-yaml.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-settings.png b/docs/en/ingest-management/images/kibana-fleet-settings.png new file mode 100644 index 0000000000..e2f51f0ad2 Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-settings.png differ diff --git a/docs/en/ingest-management/images/kibana-fleet-start.png b/docs/en/ingest-management/images/kibana-fleet-start.png new file mode 100644 index 0000000000..60e5416fde Binary files /dev/null and b/docs/en/ingest-management/images/kibana-fleet-start.png differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-configurations-default-with-nginx.png b/docs/en/ingest-management/images/kibana-ingest-manager-configurations-default-with-nginx.png deleted file mode 100644 index 517b135473..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-configurations-default-with-nginx.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-datastreams.png b/docs/en/ingest-management/images/kibana-ingest-manager-datastreams.png deleted file mode 100644 index e2f4049f39..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-datastreams.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-fleet-agents.png b/docs/en/ingest-management/images/kibana-ingest-manager-fleet-agents.png deleted file mode 100644 index ac4681a275..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-fleet-agents.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-fleet-enable.png b/docs/en/ingest-management/images/kibana-ingest-manager-fleet-enable.png deleted file mode 100644 index ca68004c4d..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-fleet-enable.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-fleet-enrol.png b/docs/en/ingest-management/images/kibana-ingest-manager-fleet-enrol.png deleted file mode 100644 index e973594c32..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-fleet-enrol.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-fleet.png b/docs/en/ingest-management/images/kibana-ingest-manager-fleet.png deleted file mode 100644 index c8e3c73f15..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-fleet.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-add-datasource.png b/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-add-datasource.png deleted file mode 100644 index c3ad013c2d..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-add-datasource.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-overview.png b/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-overview.png deleted file mode 100644 index 94c3f1c0ae..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-overview.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-settings.png b/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-settings.png deleted file mode 100644 index badfcb485c..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx-settings.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx.png b/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx.png deleted file mode 100644 index 2a13a2c553..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-integrations-nginx.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-settings.png b/docs/en/ingest-management/images/kibana-ingest-manager-settings.png deleted file mode 100644 index fb3d5f7dfb..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-settings.png and /dev/null differ diff --git a/docs/en/ingest-management/images/kibana-ingest-manager-start.png b/docs/en/ingest-management/images/kibana-ingest-manager-start.png deleted file mode 100644 index 2c4e9c9ce9..0000000000 Binary files a/docs/en/ingest-management/images/kibana-ingest-manager-start.png and /dev/null differ diff --git a/docs/en/ingest-management/index.asciidoc b/docs/en/ingest-management/index.asciidoc index acbcd36931..3e1b1ba736 100644 --- a/docs/en/ingest-management/index.asciidoc +++ b/docs/en/ingest-management/index.asciidoc @@ -4,15 +4,15 @@ :code-path: {beats-repo-dir}/libbeat/docs/tab-widgets/code :elastic-endpoint-integration: Endpoint Security -= Ingest Management Guide += Fleet User Guide include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[] include::{docs-root}/shared/attributes.asciidoc[] -include::ingest-management-overview.asciidoc[leveloffset=+1] +include::fleet-overview.asciidoc[leveloffset=+1] -include::ingest-management-limitations.asciidoc[leveloffset=+2] +include::fleet-limitations.asciidoc[leveloffset=+2] include::getting-started.asciidoc[leveloffset=+1] @@ -22,4 +22,6 @@ include::troubleshooting.asciidoc[leveloffset=+1] include::faq.asciidoc[leveloffset=+1] +include::redirects.asciidoc[] + diff --git a/docs/en/ingest-management/redirects.asciidoc b/docs/en/ingest-management/redirects.asciidoc new file mode 100644 index 0000000000..36c75e8722 --- /dev/null +++ b/docs/en/ingest-management/redirects.asciidoc @@ -0,0 +1,15 @@ +["appendix",role="exclude",id="redirects"] += Deleted pages + +The following pages have moved or been deleted. + +[role="exclude",id="ingest-management-limitations"] +=== Limitations of this release + +See <>. + +[role="exclude",id="ingest-management-overview"] +=== Ingest management overview + +See <>. + diff --git a/docs/en/ingest-management/troubleshooting.asciidoc b/docs/en/ingest-management/troubleshooting.asciidoc index ae3a4b07a7..d856cd156e 100644 --- a/docs/en/ingest-management/troubleshooting.asciidoc +++ b/docs/en/ingest-management/troubleshooting.asciidoc @@ -15,13 +15,13 @@ Have a question? Read our <>, or contact us in the {im-forum}[discuss forum]. Your feedback is very valuable to us. [discrete] -[[ingest-manager-not-in-kibana]] -== {ingest-manager} is not listed in the {kib} side navigation +[[fleet-not-in-kibana]] +== {fleet} is not listed in the {kib} side navigation -The {ingest-manager} app is enabled by default. If you are unable to +The {fleet} app is enabled by default. If you are unable to see the app in {kib}, make sure it's enabled. -**To enable {ingest-manager} on {ecloud}:** +**To enable {fleet} on {ecloud}:** . Go to your deployment in the user console. @@ -38,9 +38,9 @@ xpack.ingestManager.enabled: true . Click **Save**. {kib} will restart automatically. When {kib} is available, refresh the browser -to see the {ingest-manager} app in the navigation menu. +to see the {fleet} app in the navigation menu. -**To enable {ingest-manager} on a self-managed cluster:** +**To enable {fleet} on a self-managed cluster:** . In the {es} configuration file, `config/elasticsearch.yml`, set the following security settings to enable security and API keys: @@ -51,7 +51,7 @@ xpack.security.enabled: true xpack.security.authc.api_key.enabled: true ---- -. In the {kib} configuration file, `config/kibana.yml`, enable {ingest-manager} +. In the {kib} configuration file, `config/kibana.yml`, enable {fleet} and specify user credentials: + [source,yaml] @@ -63,7 +63,7 @@ elasticsearch.username: "elastic" <2> elasticsearch.password: "abc123iUnbRftkABC123" ---- <1> This setting is not required if you configure TLS checking. -<2> Specify a user who is authorized to use {ingest-manager}. +<2> Specify a user who is authorized to use {fleet}. [TIP] ===== @@ -80,17 +80,17 @@ Then restart {kib}. [[ingest-management-setup-fails]] == The `/api/ingest_management/setup` endpoint can't reach the package registry -In order to install {integrations}, the {ingest-manager} app needs to connect to +In order to install {integrations}, the {fleet} app needs to connect to an external service called the {package-registry}. For this to work, the {kib} server must be able to connect to `https://epr.elastic.co` on port 443. [discrete] -[[ingest-manager-app-crashes]] -== {ingest-manager} in {kib} crashes +[[fleet-app-crashes]] +== {fleet} in {kib} crashes To find more about the error, open your browser's development console, navigate to the **Network** tab, and refresh the page. One of the requests to the -{ingest-manager} API will most likely have returned an error. If the error +{fleet} API will most likely have returned an error. If the error message doesn't give you enough information to fix the problem, please contact us in the {im-forum}[discuss forum]. @@ -117,7 +117,7 @@ your environment. . Check the enrollment key that you specified during enrollment to confirm that the key is valid. To do this: -.. In {ingest-manager}, go to the {fleet} tab and click **Enrollment Tokens**. +.. In {fleet}, go to the **Agents** tab and click **Enrollment Tokens**. .. Click the eyeball icon to see the secret. The secret should match the string that you used to enroll {agent} on your host. .. If the secret doesn't match, create a new enrollment token and use the new @@ -173,7 +173,8 @@ When you unenroll an agent, {fleet} waits for acknowledgement from the agent before it completes the unenrollment process. If {fleet} doesn't receive acknowledgement, the status hangs at `unenrolling.` -If this happens, select **Force unenroll** from the *Actions* menu in {fleet}. +If this happens, select **Force unenroll** from the *Actions* menu in the +Agents list. This will invalidate all API keys related to the agent and change the status to `inactive` so that the agent no longer appears in {fleet}.