+
+ {i18n.translate(
+ 'xpack.apm.tutorial.apmServer.fleet.apmIntegration.description',
+ {
+ defaultMessage:
+ 'Fleet allows you to centrally manage Elastic Agents running the APM integration. The default option is to install a Fleet Server on a dedicated host. For setups without a dedicated host, we recommend following the instructions to install the standalone APM Server for your operating system by selecting the respective tab above.',
+ }
+ )}
+
+
+ >
}
/>
diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
index ba99b0624c4414..8051ef2a72b6a6 100644
--- a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
+++ b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -64,30 +64,6 @@ export function onPremInstructions({
iconType: 'alert',
},
instructionVariants: [
- // hides fleet section when plugin is disabled
- ...(isFleetPluginEnabled
- ? [
- {
- id: INSTRUCTION_VARIANT.FLEET,
- instructions: [
- {
- title: i18n.translate('xpack.apm.tutorial.fleet.title', {
- defaultMessage: 'Fleet',
- }),
- customComponentName: 'TutorialFleetInstructions',
- },
- ],
- },
- ]
- : []),
- {
- id: INSTRUCTION_VARIANT.OSX,
- instructions: [
- createDownloadServerOsx(),
- EDIT_CONFIG,
- START_SERVER_UNIX,
- ],
- },
{
id: INSTRUCTION_VARIANT.DEB,
instructions: [
@@ -104,10 +80,34 @@ export function onPremInstructions({
START_SERVER_UNIX_SYSV,
],
},
+ {
+ id: INSTRUCTION_VARIANT.OSX,
+ instructions: [
+ createDownloadServerOsx(),
+ EDIT_CONFIG,
+ START_SERVER_UNIX,
+ ],
+ },
{
id: INSTRUCTION_VARIANT.WINDOWS,
instructions: createWindowsServerInstructions(),
},
+ // hides fleet section when plugin is disabled
+ ...(isFleetPluginEnabled
+ ? [
+ {
+ id: INSTRUCTION_VARIANT.FLEET,
+ instructions: [
+ {
+ title: i18n.translate('xpack.apm.tutorial.fleet.title', {
+ defaultMessage: 'Fleet',
+ }),
+ customComponentName: 'TutorialFleetInstructions',
+ },
+ ],
+ },
+ ]
+ : []),
],
statusCheck: {
title: i18n.translate(