From cc8dc19d9a20d051a4777d59ce24e3eb885d9a7b Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 17 May 2018 16:37:34 -0700 Subject: [PATCH] [DOCS] Moves X-Pack configuration pages in table of contents (#9604) --- docs/index-shared3.asciidoc | 14 ++++++++++++++ x-pack/docs/en/index.asciidoc | 1 + .../configuring-centralized-pipelines.asciidoc | 3 +++ .../en/monitoring/configuring-logstash.asciidoc | 2 +- x-pack/docs/en/security/logstash.asciidoc | 2 +- x-pack/docs/en/setup/setting-up-xpack.asciidoc | 8 +------- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/docs/index-shared3.asciidoc b/docs/index-shared3.asciidoc index 16679e395..511b0ed8e 100644 --- a/docs/index-shared3.asciidoc +++ b/docs/index-shared3.asciidoc @@ -30,6 +30,20 @@ include::static/ingest-convert.asciidoc[] :edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/ls-ls-config.asciidoc include::static/ls-ls-config.asciidoc[] +ifdef::include-xpack[] +:edit_url: https://github.com/elastic/logstash/edit/{branch}/x-pack/docs/en/management/configuring-centralized-pipelines.asciidoc +include::{xls-repo-dir}/management/configuring-centralized-pipelines.asciidoc[] + +:edit_url: https://github.com/elastic/logstash/edit/{branch}/x-pack/docs/en/monitoring/configuring-logstash.asciidoc +include::{xls-repo-dir}/monitoring/configuring-logstash.asciidoc[] + +:edit_url: https://github.com/elastic/logstash/edit/{branch}/x-pack/docs/en/security/logstash.asciidoc +include::{xls-repo-dir}/security/logstash.asciidoc[] + +:edit_url: https://github.com/elastic/logstash/edit/{branch}/x-pack/docs/en/setup/configuring-xls.asciidoc +include::{xls-repo-dir}/setup/configuring-xls.asciidoc[] +endif::include-xpack[] + // Centralized configuration managements :edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/config-management.asciidoc include::static/config-management.asciidoc[] diff --git a/x-pack/docs/en/index.asciidoc b/x-pack/docs/en/index.asciidoc index c3d34a73f..86636c3c9 100644 --- a/x-pack/docs/en/index.asciidoc +++ b/x-pack/docs/en/index.asciidoc @@ -2,6 +2,7 @@ include::{log-repo-dir}/index-shared1.asciidoc[] :edit_url: https://github.com/elastic/logstash/edit/{branch}/ +include::setup/installing-xls.asciidoc[] include::setup/setting-up-xpack.asciidoc[] include::{log-repo-dir}/index-shared2.asciidoc[] diff --git a/x-pack/docs/en/management/configuring-centralized-pipelines.asciidoc b/x-pack/docs/en/management/configuring-centralized-pipelines.asciidoc index 3e351189d..4a99d3cd9 100644 --- a/x-pack/docs/en/management/configuring-centralized-pipelines.asciidoc +++ b/x-pack/docs/en/management/configuring-centralized-pipelines.asciidoc @@ -1,6 +1,9 @@ [role="xpack"] [[configuring-centralized-pipelines]] === Configuring Centralized Pipeline Management +++++ +Centralized Pipeline Management +++++ To configure {logstash-ref}/logstash-centralized-pipeline-management.html[centralized pipeline management]: diff --git a/x-pack/docs/en/monitoring/configuring-logstash.asciidoc b/x-pack/docs/en/monitoring/configuring-logstash.asciidoc index 644dd7e61..9155e9599 100644 --- a/x-pack/docs/en/monitoring/configuring-logstash.asciidoc +++ b/x-pack/docs/en/monitoring/configuring-logstash.asciidoc @@ -2,7 +2,7 @@ [[configuring-logstash]] === Configuring Monitoring for Logstash Nodes ++++ -Configuring Monitoring +{monitoring} ++++ To monitor Logstash nodes: diff --git a/x-pack/docs/en/security/logstash.asciidoc b/x-pack/docs/en/security/logstash.asciidoc index eee451d40..d1376cc31 100644 --- a/x-pack/docs/en/security/logstash.asciidoc +++ b/x-pack/docs/en/security/logstash.asciidoc @@ -2,7 +2,7 @@ [[ls-security]] === Configuring Security in Logstash ++++ -Configuring Security +{security} ++++ The Logstash {es} plugins ( diff --git a/x-pack/docs/en/setup/setting-up-xpack.asciidoc b/x-pack/docs/en/setup/setting-up-xpack.asciidoc index 8297f4d99..29e3ac233 100644 --- a/x-pack/docs/en/setup/setting-up-xpack.asciidoc +++ b/x-pack/docs/en/setup/setting-up-xpack.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[setup-xpack]] -== Setting Up X-Pack +=== Setting Up X-Pack {xpack} is an Elastic Stack extension that provides security, alerting, monitoring, machine learning, pipeline management, and many other capabilities. @@ -10,9 +10,3 @@ If you want to try all of the {xpack} features, you can {xpack-ref}/license-management.html[start a 30-day trial]. At the end of the trial period, you can purchase a subscription to keep using the full functionality of the {xpack} components. For more information, see https://www.elastic.co/subscriptions. - -include::installing-xls.asciidoc[] -include::configuring-xls.asciidoc[] -include::{xls-repo-dir}/management/configuring-centralized-pipelines.asciidoc[] -include::{xls-repo-dir}/monitoring/configuring-logstash.asciidoc[] -include::{xls-repo-dir}/security/logstash.asciidoc[]