[DOCS] Removes X-Pack settings section (#39870)

This commit is contained in:
Lisa Cawley 2019-03-14 14:22:06 -07:00 committed by lcawl
parent b57af6c401
commit e050d50759
11 changed files with 30 additions and 36 deletions

View File

@ -22,8 +22,6 @@ include::{xes-repo-dir}/security/configuring-es.asciidoc[]
include::setup/setup-xclient.asciidoc[] include::setup/setup-xclient.asciidoc[]
include::settings/configuring-xes.asciidoc[]
include::setup/bootstrap-checks-xes.asciidoc[] include::setup/bootstrap-checks-xes.asciidoc[]
:edit_url: :edit_url:

View File

@ -576,3 +576,8 @@ See <<gce-hosts-provider>>.
Zen discovery is replaced by the <<modules-discovery,discovery and cluster Zen discovery is replaced by the <<modules-discovery,discovery and cluster
formation module>>. formation module>>.
[role="exclude",id="settings-xpack"]
=== {xpack} settings in {es}
include::{asciidoc-dir}/../../shared/settings.asciidoc[]

View File

@ -1,13 +1,13 @@
[role="xpack"] [role="xpack"]
[[auditing-settings]] [[auditing-settings]]
=== Auditing Security Settings === Auditing security settings
++++ ++++
<titleabbrev>Auditing Settings</titleabbrev> <titleabbrev>Auditing settings</titleabbrev>
++++ ++++
All of these settings can be added to the `elasticsearch.yml` configuration All of these settings can be added to the `elasticsearch.yml` configuration
file. For more information, see file. For more information, see
{xpack-ref}/auditing.html[Auditing Security Events]. {stack-ov}/auditing.html[Auditing Security Events].
[[general-audit-settings]] [[general-audit-settings]]
==== General Auditing Settings ==== General Auditing Settings

View File

@ -1,13 +0,0 @@
[role="xpack"]
[[settings-xpack]]
== {xpack} Settings in {es}
++++
<titleabbrev>{xpack} Settings</titleabbrev>
++++
include::{asciidoc-dir}/../../shared/settings.asciidoc[]
include::ccr-settings.asciidoc[]
include::license-settings.asciidoc[]
include::ml-settings.asciidoc[]
include::sql-settings.asciidoc[]
include::notification-settings.asciidoc[]

View File

@ -1,13 +1,10 @@
[role="xpack"] [role="xpack"]
[[license-settings]] [[license-settings]]
=== {xpack} License Settings === License settings
++++
<titleabbrev>License Settings</titleabbrev>
++++
You can configure this licensing setting in the `elasticsearch.yml` file. You can configure this licensing setting in the `elasticsearch.yml` file.
For more information, see For more information, see
{xpack-ref}/license-management.html[{xpack} License Management]. {stack-ov}/license-management.html[License management].
`xpack.license.self_generated.type`:: `xpack.license.self_generated.type`::
Set to `basic` (default) to enable basic {xpack} features. + Set to `basic` (default) to enable basic {xpack} features. +

View File

@ -1,8 +1,8 @@
[role="xpack"] [role="xpack"]
[[notification-settings]] [[notification-settings]]
=== {watcher} Settings in Elasticsearch === {watcher} settings in Elasticsearch
++++ ++++
<titleabbrev>{watcher} Settings</titleabbrev> <titleabbrev>{watcher} settings</titleabbrev>
++++ ++++
You configure {watcher} settings to set up {watcher} and send notifications via You configure {watcher} settings to set up {watcher} and send notifications via

View File

@ -1,8 +1,8 @@
[role="xpack"] [role="xpack"]
[[sql-settings]] [[sql-settings]]
=== SQL Access Settings in Elasticsearch === SQL access settings in Elasticsearch
++++ ++++
<titleabbrev>SQL Access Settings</titleabbrev> <titleabbrev>SQL access settings</titleabbrev>
++++ ++++
SQL Access is enabled by default. You can configure SQL Access is enabled by default. You can configure

View File

@ -49,6 +49,20 @@ include::setup/secure-settings.asciidoc[]
include::setup/logging-config.asciidoc[] include::setup/logging-config.asciidoc[]
include::settings/audit-settings.asciidoc[]
include::settings/ccr-settings.asciidoc[]
include::settings/license-settings.asciidoc[]
include::settings/ml-settings.asciidoc[]
include::settings/security-settings.asciidoc[]
include::settings/sql-settings.asciidoc[]
include::settings/notification-settings.asciidoc[]
include::setup/important-settings.asciidoc[] include::setup/important-settings.asciidoc[]
include::setup/sysconfig.asciidoc[] include::setup/sysconfig.asciidoc[]

View File

@ -7,7 +7,7 @@ monitoring, reporting, machine learning, and many other capabilities. By default
when you install {es}, {xpack} is installed. when you install {es}, {xpack} is installed.
If you want to try all of the {xpack} features, you can 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 {stack-ov}/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 trial period, you can purchase a subscription to keep using the full
functionality of the {xpack} components. For more information, see functionality of the {xpack} components. For more information, see
https://www.elastic.co/subscriptions. https://www.elastic.co/subscriptions.
@ -15,6 +15,4 @@ https://www.elastic.co/subscriptions.
* <<configuring-monitoring>> * <<configuring-monitoring>>
* <<configuring-security>> * <<configuring-security>>
* <<setup-xpack-client>> * <<setup-xpack-client>>
* <<settings-xpack>>
* <<bootstrap-checks-xpack>> * <<bootstrap-checks-xpack>>

View File

@ -153,11 +153,6 @@ include::authentication/configuring-saml-realm.asciidoc[]
include::authentication/configuring-kerberos-realm.asciidoc[] include::authentication/configuring-kerberos-realm.asciidoc[]
:edit_url: :edit_url:
include::fips-140-compliance.asciidoc[] include::fips-140-compliance.asciidoc[]
:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/settings/security-settings.asciidoc
include::{es-repo-dir}/settings/security-settings.asciidoc[]
:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/security/reference/files.asciidoc :edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/security/reference/files.asciidoc
include::{es-repo-dir}/security/reference/files.asciidoc[] include::{es-repo-dir}/security/reference/files.asciidoc[]
:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/settings/audit-settings.asciidoc
include::{es-repo-dir}/settings/audit-settings.asciidoc[]