From 3e4ceec0c25866f9b3f86c2ede542b3460dcdb1a Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 4 Apr 2018 11:59:31 -0700 Subject: [PATCH] [DOCS] Removed X-Pack installation info (elastic/x-pack-elasticsearch#4299) Original commit: elastic/x-pack-elasticsearch@5af83b75312b761718cccf2093beaf3abbe8d607 --- docs/en/ml/configuring.asciidoc | 4 ++-- docs/en/ml/getting-started.asciidoc | 14 +++++--------- docs/en/settings/sql-settings.asciidoc | 4 +--- docs/en/setup/setup-xes.asciidoc | 12 +++++++++--- docs/en/sql/getting-started.asciidoc | 5 ++--- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/docs/en/ml/configuring.asciidoc b/docs/en/ml/configuring.asciidoc index 28d847bafaa..9e7b787dcea 100644 --- a/docs/en/ml/configuring.asciidoc +++ b/docs/en/ml/configuring.asciidoc @@ -3,8 +3,8 @@ If you want to use {xpackml} features, there must be at least one {ml} node in your cluster and all master-eligible nodes must have {ml} enabled. By default, -when you install {xpack}, all nodes are {ml} nodes. For more information about -these settings, see <>. +all nodes are {ml} nodes. For more information about these settings, see +<>. To use the {xpackml} features to analyze your data, you must create a job and send your data to that job. diff --git a/docs/en/ml/getting-started.asciidoc b/docs/en/ml/getting-started.asciidoc index 2a2f897c87f..d77b587c579 100644 --- a/docs/en/ml/getting-started.asciidoc +++ b/docs/en/ml/getting-started.asciidoc @@ -31,10 +31,7 @@ components of the Elastic Stack: * {es} {version}, which stores the data and the analysis results * {xpack} {version}, which includes the {ml} features for both {es} and {kib} * {kib} {version}, which provides a helpful user interface for creating and -viewing jobs + - -//ll {ml} features are available to use as an API, however this tutorial -//will focus on using the {ml} tab in the {kib} UI. +viewing jobs See the https://www.elastic.co/support/matrix[Elastic Support Matrix] for information about supported operating systems. @@ -47,13 +44,12 @@ single VM or even on your laptop (requires 64-bit OS). As you add more data and your traffic grows, you'll want to replace the single {es} instance with a cluster. -When you install {xpack} into {es} and {kib}, the {ml} features are -enabled by default. If you have multiple nodes in your cluster, you can -optionally dedicate nodes to specific purposes. If you want to control which -nodes are _machine learning nodes_ or limit which nodes run resource-intensive +When you install {es} and {kib}, the {ml} features are enabled by default. If +you have multiple nodes in your cluster, you can optionally dedicate nodes to +specific purposes. If you want to control which nodes are +_machine learning nodes_ or limit which nodes run resource-intensive activity related to jobs, see <>. - [float] [[ml-gs-users]] ==== Users, Roles, and Privileges diff --git a/docs/en/settings/sql-settings.asciidoc b/docs/en/settings/sql-settings.asciidoc index 52e11d30989..baefe008c42 100644 --- a/docs/en/settings/sql-settings.asciidoc +++ b/docs/en/settings/sql-settings.asciidoc @@ -5,7 +5,7 @@ SQL Access Settings ++++ -SQL Access is enabled by default when you install {xpack}. You can configure +SQL Access is enabled by default. You can configure these SQL Access settings in the `elasticsearch.yml` file. [float] @@ -13,5 +13,3 @@ these SQL Access settings in the `elasticsearch.yml` file. ==== General SQL Access Settings `xpack.sql.enabled`:: Set to `false` to disable SQL Access on the node. - - diff --git a/docs/en/setup/setup-xes.asciidoc b/docs/en/setup/setup-xes.asciidoc index dae3dba6092..ffb7f6aa96e 100644 --- a/docs/en/setup/setup-xes.asciidoc +++ b/docs/en/setup/setup-xes.asciidoc @@ -5,9 +5,15 @@ [partintro] -- {xpack} is an Elastic Stack extension that bundles security, alerting, -monitoring, reporting, machine learning, and graph capabilities into one -easy-to-install package. To access this functionality, you must -<>. +monitoring, reporting, machine learning, and graph capabilities. + +* <> +* <> +* <> +* <> +* <> +* <> + -- include::installing-xes.asciidoc[] diff --git a/docs/en/sql/getting-started.asciidoc b/docs/en/sql/getting-started.asciidoc index cefbaf3b7ac..802d3b9d757 100644 --- a/docs/en/sql/getting-started.asciidoc +++ b/docs/en/sql/getting-started.asciidoc @@ -1,9 +1,8 @@ [[sql-getting-started]] == Getting Started with SQL -To start using Elasticsearch SQL, first -<>. Then create -in index with some data to experiment with: +To start using Elasticsearch SQL, create +an index with some data to experiment with: [source,js] --------------------------------------------------