From f3f8d9b8337d7e7ea378cba01c95d647e39715e6 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 4 Sep 2018 10:02:13 -0700 Subject: [PATCH] [DOCS] Moves monitoring pages to docs folder (#33324) --- docs/reference/index.asciidoc | 2 +- .../monitoring/configuring-monitoring.asciidoc | 17 ++++++++--------- .../reference}/monitoring/indices.asciidoc | 1 - 3 files changed, 9 insertions(+), 11 deletions(-) rename {x-pack/docs/en => docs/reference}/monitoring/configuring-monitoring.asciidoc (91%) rename {x-pack/docs/en => docs/reference}/monitoring/indices.asciidoc (98%) diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index 4df3ad48fb6..e4debd30c03 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -16,7 +16,7 @@ include::setup.asciidoc[] include::setup/setup-xes.asciidoc[] -include::{xes-repo-dir}/monitoring/configuring-monitoring.asciidoc[] +include::monitoring/configuring-monitoring.asciidoc[] include::{xes-repo-dir}/security/configuring-es.asciidoc[] diff --git a/x-pack/docs/en/monitoring/configuring-monitoring.asciidoc b/docs/reference/monitoring/configuring-monitoring.asciidoc similarity index 91% rename from x-pack/docs/en/monitoring/configuring-monitoring.asciidoc rename to docs/reference/monitoring/configuring-monitoring.asciidoc index e705100e05e..3bcfef2acbf 100644 --- a/x-pack/docs/en/monitoring/configuring-monitoring.asciidoc +++ b/docs/reference/monitoring/configuring-monitoring.asciidoc @@ -1,9 +1,9 @@ [role="xpack"] [testenv="gold"] [[configuring-monitoring]] -== Configuring Monitoring in {es} +== Configuring monitoring in {es} ++++ -Configuring Monitoring +Configuring monitoring ++++ By default, {monitoring} is enabled but data collection is disabled. Advanced @@ -47,21 +47,19 @@ as {kib}, Beats, and Logstash to a monitoring cluster: .. Verify that `xpack.monitoring.collection.enabled` settings are `true` on each node in the cluster. -.. {xpack-ref}/xpack-monitoring.html[Configure {monitoring} across the Elastic Stack]. +.. {stack-ov}/xpack-monitoring.html[Configure {monitoring} across the Elastic Stack]. . Identify where to store monitoring data. + -- By default, {monitoring} uses a `local` exporter that indexes monitoring data -on the same cluster. -//See <> and <>. +on the same cluster. See <> and <>. Alternatively, you can use an `http` exporter to send data to a separate -monitoring cluster. -//See <>. +monitoring cluster. See <>. For more information about typical monitoring architectures, -see {xpack-ref}/how-monitoring-works.html[How Monitoring Works]. +see {stack-ov}/how-monitoring-works.html[How Monitoring Works]. -- . If {security} is enabled and you are using an `http` exporter to send data to @@ -82,6 +80,7 @@ POST /_xpack/security/user/remote_monitor } --------------------------------------------------------------- // CONSOLE +// TEST[skip:needs-gold+-license] -- .. On each node in the cluster that is being monitored, configure the `http` @@ -136,7 +135,7 @@ read from the monitoring indices. You set up {monitoring} UI users on the cluster where the monitoring data is stored, that is to say the monitoring cluster. To grant all of the necessary permissions, assign users the `monitoring_user` and `kibana_user` roles. For more information, see -{xpack-ref}/mapping-roles.html[Mapping users and groups to roles]. +{stack-ov}/mapping-roles.html[Mapping users and groups to roles]. -- . Optional: diff --git a/x-pack/docs/en/monitoring/indices.asciidoc b/docs/reference/monitoring/indices.asciidoc similarity index 98% rename from x-pack/docs/en/monitoring/indices.asciidoc rename to docs/reference/monitoring/indices.asciidoc index a27d91d423e..658ac389ae8 100644 --- a/x-pack/docs/en/monitoring/indices.asciidoc +++ b/docs/reference/monitoring/indices.asciidoc @@ -13,7 +13,6 @@ You can retrieve the templates through the `_template` API: GET /_template/.monitoring-* ---------------------------------- // CONSOLE -// TEST[catch:missing] By default, the template configures one shard and one replica for the monitoring indices. To override the default settings, add your own template: