From f16d2e565e19f58b0082aff4c4be525147f62303 Mon Sep 17 00:00:00 2001 From: dedemorton Date: Wed, 26 May 2021 17:44:35 -0700 Subject: [PATCH 1/3] Add stack compatibility info to Fleet Server docs --- docs/en/ingest-management/fleet/fleet-server.asciidoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/en/ingest-management/fleet/fleet-server.asciidoc b/docs/en/ingest-management/fleet/fleet-server.asciidoc index b034204fc4..69f475a394 100644 --- a/docs/en/ingest-management/fleet/fleet-server.asciidoc +++ b/docs/en/ingest-management/fleet/fleet-server.asciidoc @@ -42,14 +42,15 @@ details, refer to <>. {fleet-server} is compatible with the following Elastic products: -* {stack} 7.13 or later (our {ess-product}[hosted {ess}] on {ecloud} or +* {stack} 7.13 or later ({ess-product}[hosted {ess}] on {ecloud}, or a self-managed cluster). +** For version compatibility: {es} >= {fleet-server} >= {agent} (except for +bugfix releases) +** {kib} should be on the same minor version as {es}. * {ece} 2.10 or later -//TODO: Confirm that ECE version shown here is correct ^^. - -{fleet-server} is supported on x64 architectures only. +//QUESTION: Should this say 2.9? 2.10 is not available yet. [discrete] [[add-fleet-server]] From f2c6e6134ce173ae0e8b4c10d1ff9a37c2ebef1f Mon Sep 17 00:00:00 2001 From: dedemorton Date: Wed, 26 May 2021 17:56:26 -0700 Subject: [PATCH 2/3] Add ECE requirements --- docs/en/ingest-management/fleet/fleet-server.asciidoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/en/ingest-management/fleet/fleet-server.asciidoc b/docs/en/ingest-management/fleet/fleet-server.asciidoc index 69f475a394..86fd8740d9 100644 --- a/docs/en/ingest-management/fleet/fleet-server.asciidoc +++ b/docs/en/ingest-management/fleet/fleet-server.asciidoc @@ -38,7 +38,7 @@ details, refer to <>. [discrete] [[fleet-server-compatibility]] -== Compatibility +== Compatibility and prerequisites {fleet-server} is compatible with the following Elastic products: @@ -49,6 +49,10 @@ bugfix releases) ** {kib} should be on the same minor version as {es}. * {ece} 2.10 or later +** Requires additional wildcard domains and certificates (which normally only +cover *.cname, not ..cname). This enables us to provide the URL for +{fleet-server} of `https://.fleet.` +** The deployment template must contain a slider for APM & Fleet. //QUESTION: Should this say 2.9? 2.10 is not available yet. From 8b7841c809ece301ef6bdc8011a4cd3f5732b124 Mon Sep 17 00:00:00 2001 From: dedemorton Date: Thu, 27 May 2021 14:36:21 -0700 Subject: [PATCH 3/3] Temporarily comment out ECE 2.10 info --- .../ingest-management/fleet/fleet-server.asciidoc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/en/ingest-management/fleet/fleet-server.asciidoc b/docs/en/ingest-management/fleet/fleet-server.asciidoc index 86fd8740d9..d864ffe46e 100644 --- a/docs/en/ingest-management/fleet/fleet-server.asciidoc +++ b/docs/en/ingest-management/fleet/fleet-server.asciidoc @@ -48,13 +48,12 @@ a self-managed cluster). bugfix releases) ** {kib} should be on the same minor version as {es}. -* {ece} 2.10 or later -** Requires additional wildcard domains and certificates (which normally only -cover *.cname, not ..cname). This enables us to provide the URL for -{fleet-server} of `https://.fleet.` -** The deployment template must contain a slider for APM & Fleet. - -//QUESTION: Should this say 2.9? 2.10 is not available yet. +//TODO: Uncomment this section when ECE 2.10 is available +//* {ece} 2.10 or later +//** Requires additional wildcard domains and certificates (which normally only +//cover *.cname, not ..cname). This enables us to provide the URL for +//{fleet-server} of `https://.fleet.` +//** The deployment template must contain a slider for APM & Fleet. [discrete] [[add-fleet-server]]