From fd2037014506c557bd74c9349bb2ff81cd496a88 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Tue, 1 May 2018 17:04:16 -0700 Subject: [PATCH] [DOCS] Adds new installation package details (#29590) --- docs/reference/setup/install.asciidoc | 3 +-- docs/reference/setup/install/deb.asciidoc | 8 +++++++- docs/reference/setup/install/license.asciidoc | 6 ++++++ docs/reference/setup/install/rpm.asciidoc | 6 ++++++ docs/reference/setup/install/windows.asciidoc | 6 ++++++ docs/reference/setup/install/zip-targz.asciidoc | 10 ++++++++++ docs/reference/setup/install/zip-windows.asciidoc | 6 ++++++ 7 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 docs/reference/setup/install/license.asciidoc diff --git a/docs/reference/setup/install.asciidoc b/docs/reference/setup/install.asciidoc index 49709ba1d6d..44c806be195 100644 --- a/docs/reference/setup/install.asciidoc +++ b/docs/reference/setup/install.asciidoc @@ -38,8 +38,7 @@ Elasticsearch on Windows. MSIs may be downloaded from the Elasticsearch website. `docker`:: Images are available for running Elasticsearch as Docker containers. They may be -downloaded from the Elastic Docker Registry. The default image ships with -{xpack-ref}/index.html[X-Pack] pre-installed. +downloaded from the Elastic Docker Registry. + {ref}/docker.html[Install {es} with Docker] diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index d055f1251e1..af9d35f3f16 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -2,9 +2,11 @@ === Install Elasticsearch with Debian Package The Debian package for Elasticsearch can be <> -or from our <>. It can be used to install +or from our <>. It can be used to install Elasticsearch on any Debian-based system such as Debian and Ubuntu. +include::license.asciidoc[] + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the link:/downloads/past-releases[Past Releases page]. @@ -125,6 +127,10 @@ sudo dpkg -i elasticsearch-{version}.deb -------------------------------------------- <1> Compares the SHA of the downloaded Debian package and the published checksum, which should output `elasticsearch-{version}.deb: OK`. + +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.deb endif::[] diff --git a/docs/reference/setup/install/license.asciidoc b/docs/reference/setup/install/license.asciidoc new file mode 100644 index 00000000000..0e2701a65a4 --- /dev/null +++ b/docs/reference/setup/install/license.asciidoc @@ -0,0 +1,6 @@ +This package is free to use under the Elastic license. It contains open source +and free commercial features and access to paid commercial features. +{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the +paid commercial features. See the +https://www.elastic.co/subscriptions[Subscriptions] page for information about +Elastic license levels. diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index 730f0433417..a44b0b37d31 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -9,6 +9,8 @@ and Oracle Enterprise. NOTE: RPM install is not supported on distributions with old versions of RPM, such as SLES 11 and CentOS 5. Please see <> instead. +include::license.asciidoc[] + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the link:/downloads/past-releases[Past Releases page]. @@ -110,6 +112,10 @@ sudo rpm --install elasticsearch-{version}.rpm -------------------------------------------- <1> Compares the SHA of the downloaded RPM and the published checksum, which should output `elasticsearch-{version}.rpm: OK`. + +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.rpm endif::[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index 5d79e9669f9..c48ec5de22d 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -10,6 +10,8 @@ the included `elasticsearch.exe` executable. TIP: Elasticsearch has historically been installed on Windows using the <> archive. You can continue using the `.zip` approach if you prefer. +include::license.asciidoc[] + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the @@ -32,6 +34,10 @@ ifeval::["{release-state}"!="unreleased"] Download the `.msi` package for Elasticsearch v{version} from https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.msi +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.msi + endif::[] [[install-msi-gui]] diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 18cf0a6506f..94de390656b 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -5,6 +5,8 @@ Elasticsearch is provided as a `.zip` and as a `.tar.gz` package. These packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. +include::license.asciidoc[] + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the @@ -40,6 +42,10 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.zip: OK`. <2> This directory is known as `$ES_HOME`. +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip + endif::[] @@ -68,6 +74,10 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.tar.gz: OK`. <2> This directory is known as `$ES_HOME`. +Alternatively, you can download the following package, which includes only +Apache 2.0 licensed code: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz + endif::[] ifdef::include-xpack[] diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc index 3ebf4f3d77d..18c1272d25d 100644 --- a/docs/reference/setup/install/zip-windows.asciidoc +++ b/docs/reference/setup/install/zip-windows.asciidoc @@ -9,6 +9,8 @@ TIP: Elasticsearch has historically been installed on Windows using the `.zip` a An <> is available that provides the easiest getting started experience for Windows. You can continue using the `.zip` approach if you prefer. +include::license.asciidoc[] + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the @@ -31,6 +33,10 @@ ifeval::["{release-state}"!="unreleased"] Download the `.zip` archive for Elasticsearch v{version} from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.zip +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip + Unzip it with your favourite unzip tool. This will create a folder called +elasticsearch-{version}+, which we will refer to as `%ES_HOME%`. In a terminal window, `cd` to the `%ES_HOME%` directory, for instance: