From 49c175afe039784a31f7a136b02ea087899b1567 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Wed, 27 Jun 2018 11:12:58 -0700 Subject: [PATCH] [DOCS] Clarified X-Pack features in trial (#20271) --- docs/index.asciidoc | 2 -- docs/management/managing-licenses.asciidoc | 8 ++++++- docs/setup/setup-xkb.asciidoc | 27 ---------------------- 3 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 docs/setup/setup-xkb.asciidoc diff --git a/docs/index.asciidoc b/docs/index.asciidoc index 38d99f798afc..408d33180b41 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -24,8 +24,6 @@ include::introduction.asciidoc[] include::setup.asciidoc[] -include::setup/setup-xkb.asciidoc[] - include::monitoring/monitoring-xkib.asciidoc[] include::security/securing-kibana.asciidoc[] diff --git a/docs/management/managing-licenses.asciidoc b/docs/management/managing-licenses.asciidoc index 289e12da838a..7ecd243599e2 100644 --- a/docs/management/managing-licenses.asciidoc +++ b/docs/management/managing-licenses.asciidoc @@ -13,7 +13,13 @@ image::images/management-license.png[] The 30-day trial enables you to try out the full set of https://www.elastic.co/subscriptions[Platinum features], including security, machine learning, alerting, graph capabilities, -and more. +and more. For example, the following pages are added to the side navigation: + +* **Machine Learning** +* **Graph** + +The **Management** page gains options related to configuring security, managing +{ls} pipelines, and using {watcher}. At the end of the trial period, your license reverts to a Basic license. To continue using the Platinum features, diff --git a/docs/setup/setup-xkb.asciidoc b/docs/setup/setup-xkb.asciidoc deleted file mode 100644 index 75ac801955c7..000000000000 --- a/docs/setup/setup-xkb.asciidoc +++ /dev/null @@ -1,27 +0,0 @@ -[role="xpack"] -[[setup-xpack-kb]] -== Set Up {xpack} - -{xpack} is an Elastic Stack extension that provides security, alerting, -monitoring, reporting, machine learning, graph, and many other capabilities. By -default, when you install {kib}, {xpack} is installed. - -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. - -{xpack} adds the following pages to the side navigation: - -* **APM** -* **Machine Learning** -* **Graph** -* **Monitoring** - -The **Management** page gains options related to configuring security. The -**Dev Tools** page gains a Search Profiler and a Grok Debugger. Where these and -other {xpack} features are mentioned in this documentation, we've added an icon -to clearly indicate that what you're reading pertains to features available only -in {xpack}. -