[docs][7.2] Documentation backports

docs/configuring.asciidoc

@@ -27,7 +27,7 @@ include::./copied-from-beats/shared-ssl-config.asciidoc[]
 
 include::./template-config.asciidoc[]
 
-include::./ilm-setup.asciidoc[]
+include::./ilm.asciidoc[]
 
 include::./copied-from-beats/loggingconfig.asciidoc[]
 

docs/copied-from-beats/command-reference.asciidoc

@@ -17,11 +17,11 @@
 :deploy-command-short-desc: Deploys the specified function to your serverless environment
 
 ifndef::no_dashboards[]
-:export-command-short-desc: Exports the configuration, index template, or a dashboard to stdout
+:export-command-short-desc: Exports the configuration, index template, ilm-policy or a dashboard to stdout
 endif::no_dashboards[]
 
 ifdef::no_dashboards[]
-:export-command-short-desc: Exports the configuration or index template to stdout
+:export-command-short-desc: Exports the configuration, index template, or ilm-policy to stdout
 endif::no_dashboards[]
 
 :help-command-short-desc: Shows help for any command
@@ -32,15 +32,15 @@ endif::no_dashboards[]
 :run-command-short-desc: Runs {beatname_uc}. This command is used by default if you start {beatname_uc} without specifying a command
 
 ifdef::has_ml_jobs[]
-:setup-command-short-desc: Sets up the initial environment, including the index template, {kib} dashboards (when available), and machine learning jobs (when available)
+:setup-command-short-desc: Sets up the initial environment, including the index template, ilm policy and write alias, {kib} dashboards (when available), and machine learning jobs (when available)
 endif::[]
 
 ifdef::no_dashboards[]
-:setup-command-short-desc: Sets up the initial environment, including the ES index template
+:setup-command-short-desc: Sets up the initial environment, including the ES index template, ilm policy and write alias
 endif::no_dashboards[]
 
 ifndef::has_ml_jobs,no_dashboards[]
-:setup-command-short-desc: Sets up the initial environment, including the index template and {kib} dashboards (when available)
+:setup-command-short-desc: Sets up the initial environment, including the index template, ilm policy and write alias, and {kib} dashboards (when available)
 endif::[]
 
 :update-command-short-desc: Updates the specified function
@@ -82,31 +82,31 @@ endif::[]
 [options="header"]
 |=======================
 |Commands |
-ifeval::[("{beatname_lc}"=="functionbeat")]
+ifeval::["{beatname_lc}"=="functionbeat"]
 |<<deploy-command,`deploy`>> | {deploy-command-short-desc}.
 endif::[]
 |<<export-command,`export`>> |{export-command-short-desc}.
 |<<help-command,`help`>> |{help-command-short-desc}.
 |<<keystore-command,`keystore`>> |{keystore-command-short-desc}.
-ifeval::[("{beatname_lc}"=="functionbeat")]
+ifeval::["{beatname_lc}"=="functionbeat"]
 |<<package-command,`package`>> |{package-command-short-desc}.
 |<<remove-command,`remove`>> |{remove-command-short-desc}.
 endif::[]
-ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="metricbeat")]
+ifdef::has_modules_command[]
 |<<modules-command,`modules`>> |{modules-command-short-desc}.
 endif::[]
 |<<run-command,`run`>> |{run-command-short-desc}.
 |<<setup-command,`setup`>> |{setup-command-short-desc}.
 |<<test-command,`test`>> |{test-command-short-desc}.
-ifeval::[("{beatname_lc}"=="functionbeat")]
+ifeval::["{beatname_lc}"=="functionbeat"]
 |<<update-command,`update`>> |{update-command-short-desc}.
 endif::[]
 |<<version-command,`version`>> |{version-command-short-desc}.
 |=======================
 
 Also see <<global-flags,Global flags>>.
 
-ifeval::[("{beatname_lc}"=="functionbeat")]
+ifeval::["{beatname_lc}"=="functionbeat"]
 [[deploy-command]]
 ==== `deploy` command
 
@@ -145,13 +145,13 @@ endif::[]
 ifndef::no_dashboards[]
 {export-command-short-desc}. You can use this
 command to quickly view your configuration, see the contents of the index
-template, or export a dashboard from {kib}.
+template and the ilm policy, or export a dashboard from {kib}.
 endif::no_dashboards[]
 
 ifdef::no_dashboards[]
 {export-command-short-desc}. You can use this
 command to quickly view your configuration or see the contents of the index
-template.
+template or the ilm policy.
 endif::no_dashboards[]
 
 *SYNOPSIS*
@@ -194,19 +194,21 @@ endif::no_dashboards[]
 
 [[template-subcommand]]*`template`*::
 Exports the index template to stdout. You can specify the `--es.version` and
-`--index` flags to further define what gets exported.
+`--index` flags to further define what gets exported. Furthermore you can export
+the template to a file instead of `stdout` by defining a directory via `--dir`.
 
-ifndef::apm-server[]
 [[ilm-policy-subcommand]]
 *`ilm-policy`*::
-Exports ILM policy to stdout.
-endif::apm-server[]
+Exports ILM policy to stdout. You can specify the `--es.version` and a `--dir`
+to which the policy should be exported as a file rather than exporting to `stdout`.
 
 *FLAGS*
 
 *`--es.version VERSION`*::
 When used with <<template-subcommand,`template`>>, exports an index
 template that is compatible with the specified version.
+When used with <<ilm-policy-subcommand,`ilm-policy`>>, exports the ilm policy
+if the specified ES version is enabled for ILM.
 
 *`-h, --help`*::
 Shows help for the `export` command.
@@ -216,6 +218,10 @@ When used with <<template-subcommand,`template`>>, sets the base name to use for
 the index template. If this flag is not specified, the default base name is
 +{beatname_lc}+.
 
+*`--dir DIRNAME`*::
+Define a directory to which the template and ilm-policy should be exported to
+as files instead of printing them to `stdout`.
+
 ifndef::no_dashboards[]
 *`--id DASHBOARD_ID`*::
 When used with <<dashboard-subcommand,`dashboard`>>, specifies the dashboard ID.
@@ -327,7 +333,7 @@ Shows help for the `keystore` command.
 
 See <<keystore>> for more examples.
 
-ifeval::[("{beatname_lc}"=="functionbeat")]
+ifeval::["{beatname_lc}"=="functionbeat"]
 [[package-command]]
 ==== `package` command
 
@@ -389,7 +395,7 @@ Shows help for the `remove` command.
 -----
 endif::[]
 
-ifeval::[("{beatname_lc}"=="filebeat") or ("{beatname_lc}"=="metricbeat")]
+ifdef::has_modules_command[]
 [[modules-command]]
 ==== `modules` command
 
@@ -584,6 +590,10 @@ Or:
 {setup-command-short-desc}
 
 * The index template ensures that fields are mapped correctly in Elasticsearch.
+If index lifecycle management is enabled it also ensures that the defined ILM policy
+and write alias are connected to the indices matching the index template.
+The ILM policy takes care of the lifecycle of an index, when to do a rollover,
+when to move an index from the hot phase to the next phase etc.
 
 ifndef::no_dashboards[]
 * The {kib} dashboards make it easier for you to visualize {beatname_uc} data
@@ -636,8 +646,19 @@ enabled modules in the +{beatname_lc}.yml+ file. If you used the
 directory, also specify the `--modules` flag.
 endif::[]
 
+*`--index-management`*::
+Sets up components related to Elasticsearch index management including
+template, ilm policy, and write alias.
+
 *`--template`*::
+deprecated[7.2]
 Sets up the index template only.
+It is recommended to use `--index-management` instead.
+
+*`--ilm-policy`*::
+deprecated[7.2]
+Sets up the index lifecycle policy.
+It is recommended to use `--index-management` instead.
 
 {global-flags}
 
@@ -650,7 +671,7 @@ ifeval::["{beatname_lc}"=="filebeat"]
 {beatname_lc} setup --machine-learning
 {beatname_lc} setup --pipelines
 {beatname_lc} setup --pipelines --modules system,nginx,mysql <1>
-{beatname_lc} setup --template
+{beatname_lc} setup --index-management
 -----
 <1> If you used the <<modules-command,`modules`>> command to enable modules in
 the `modules.d` directory, also specify the `--modules` flag to indicate which
@@ -664,14 +685,14 @@ ifndef::no_dashboards[]
 -----
 {beatname_lc} setup --dashboards
 {beatname_lc} setup --machine-learning
-{beatname_lc} setup --template
+{beatname_lc} setup --index-management
 -----
 endif::no_dashboards[]
 ifdef::no_dashboards[]
 ["source","sh",subs="attributes"]
 -----
 {beatname_lc} setup --machine-learning
-{beatname_lc} setup --template
+{beatname_lc} setup --index-management
 -----
 endif::no_dashboards[]
 
@@ -732,7 +753,7 @@ ifeval::["{beatname_lc}"=="metricbeat"]
 -----
 endif::[]
 
-ifeval::[("{beatname_lc}"=="functionbeat")]
+ifeval::["{beatname_lc}"=="functionbeat"]
 [[update-command]]
 ==== `update` command
 

docs/copied-from-beats/keystore.asciidoc

@@ -64,7 +64,7 @@ To create a secrets keystore, use:
 ----------------------------------------------------------------
 
 
-{beatname_uc} creates the keystore in the directory defined by the `path.config`
+{beatname_uc} creates the keystore in the directory defined by the `path.data`
 configuration setting.
 
 [float]

docs/copied-from-beats/monitoring/monitoring-beats.asciidoc

@@ -38,9 +38,13 @@ configured the {es} output and want to send {beatname_uc} monitoring events to
 the same {es} cluster, specify the following minimal configuration:
 +
 --
-[source, yml]
+["source","yml",subs="attributes"]
 --------------------
-monitoring.enabled: true
+monitoring:
+  enabled: true
+  elasticsearch:
+    username: {beat_monitoring_user}
+    password: somepassword
 --------------------
 
 If you configured a different output, such as {ls} or you want to send {beatname_uc}

docs/copied-from-beats/outputconfig.asciidoc

@@ -1568,8 +1568,11 @@ endif::[]
 ++++
 
 ifdef::apm-server[]
-NOTE: This page refers to using a separate instance of APM Server with an existing Elasticsearch Service deployment.
-APM Server is not yet supported on Elasticsearch Service.
+NOTE: This page refers to using a separate instance of APM Server with an existing
+https://www.elastic.co/cloud/elasticsearch-service[Elasticsearch Service deployment].
+If you want to use APM on Elastic Cloud, see the cloud docs:
+{cloud}/ec-create-deployment.html[Create your deployment] or
+{cloud}/ec-manage-apm-settings.html[Add APM user settings].
 endif::apm-server[]
 
 {beatname_uc} comes with two settings that simplify the output configuration