From 58dd5b748bf51b3d53db9a025557de767bb6501f Mon Sep 17 00:00:00 2001 From: lcawley Date: Fri, 3 Nov 2017 10:36:03 -0700 Subject: [PATCH] [DOCS] Single-source X-Pack Settings Original commit: elastic/x-pack-elasticsearch@9c0f0b047948156678e2cfbbd26a061c645af1e5 --- docs/en/settings/configuring-xes.asciidoc | 2 +- docs/en/settings/x-pack-settings.asciidoc | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 docs/en/settings/x-pack-settings.asciidoc diff --git a/docs/en/settings/configuring-xes.asciidoc b/docs/en/settings/configuring-xes.asciidoc index 1230e824c07..70783f5b2b9 100644 --- a/docs/en/settings/configuring-xes.asciidoc +++ b/docs/en/settings/configuring-xes.asciidoc @@ -2,7 +2,7 @@ [[settings-xpack]] == Configuring X-Pack -include::x-pack-settings.asciidoc[] +include::{asciidoc-dir}/../../shared/settings.asciidoc[] include::license-settings.asciidoc[] include::ml-settings.asciidoc[] include::monitoring-settings.asciidoc[] diff --git a/docs/en/settings/x-pack-settings.asciidoc b/docs/en/settings/x-pack-settings.asciidoc deleted file mode 100644 index a35f94f4eb1..00000000000 --- a/docs/en/settings/x-pack-settings.asciidoc +++ /dev/null @@ -1,17 +0,0 @@ -You configure settings for X-Pack features in the `elasticsearch.yml`, -`kibana.yml`, and `logstash.yml` configuration files. - -[options="header,footer"] -|======================= -|{xpack} Feature |{es} Settings |{kib} Settings |Logstash Settings -|Development Tools |No |{kibana-ref}/dev-settings-kb.html[Yes] |No -|Graph |No |{kibana-ref}/graph-settings-kb.html[Yes] |No -|Machine learning |{ref}/ml-settings.html[Yes] |{kibana-ref}/ml-settings-kb.html[Yes] |No -|Monitoring |{ref}/monitoring-settings.html[Yes] |{kibana-ref}/monitoring-settings-kb.html[Yes] |{logstash-ref}/settings-xpack.html#monitoring-settings[Yes] -|Reporting |No |{kibana-ref}/reporting-settings-kb.html[Yes] |No -|Security |{ref}/security-settings.html[Yes] |{kibana-ref}/security-settings-kb.html[Yes] |No -|Watcher |{ref}/notification-settings.html[Yes] |No |No -|======================= - -There are also {ref}/license-settings.html[{xpack} license settings] in the -`elasticsearch.yml` file.