adding fleet information on APM tutorial

cauemarcondes · Jun 2, 2021 · 66b9351 · 66b9351
1 parent 2f81e72
commit 66b9351
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 41 deletions.
diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts
@@ -27,4 +27,9 @@ export const plugin = (initContext: PluginInitializerContext) => new HomeServerP
 
 export { INSTRUCTION_VARIANT } from '../common/instruction_variant';
 export { TutorialsCategory } from './services/tutorials';
-export type { ArtifactsSchema, TutorialSchema, InstructionSetSchema } from './services/tutorials';
+export type {
+  ArtifactsSchema,
+  TutorialSchema,
+  InstructionSetSchema,
+  InstructionsSchema,
+} from './services/tutorials';
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts b/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts
@@ -102,7 +102,7 @@ const instructionsSchema = schema.object({
   instructionSets: schema.arrayOf(instructionSetSchema),
   params: schema.maybe(schema.arrayOf(paramSchema)),
 });
-export type InstructionsSchema = TypeOf<typeof instructionSchema>;
+export type InstructionsSchema = TypeOf<typeof instructionsSchema>;
 
 const tutorialIdRegExp = /^[a-zA-Z0-9-]+$/;
 export const tutorialSchema = schema.object({

diff --git a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts b/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts
@@ -32,12 +32,9 @@ export function createElasticCloudInstructions(
   const apmServerUrl = cloudSetup?.apm.url;
   const instructionSets = [];
 
-  instructionSets.push(
-    getApmServerInstructionSet({
-      cloudSetup,
-      isApmServerEnabled: !!apmServerUrl,
-    })
-  );
+  if (!apmServerUrl) {
+    instructionSets.push(getApmServerInstructionSet(cloudSetup));
+  }
 
   instructionSets.push(getApmAgentInstructionSet(cloudSetup));
 
@@ -46,41 +43,29 @@ export function createElasticCloudInstructions(
   };
 }
 
-function getApmServerInstructionSet({
-  cloudSetup,
-  isApmServerEnabled,
-}: {
-  cloudSetup?: CloudSetup;
-  isApmServerEnabled: boolean;
-}): InstructionSetSchema {
-  const instructionVariants: InstructionSetSchema['instructionVariants'] = [
-    {
-      id: INSTRUCTION_VARIANT.FLEET,
-      instructions: [{ customComponent: 'apm_fleet' }],
-    },
-  ];
-
-  if (!isApmServerEnabled) {
-    instructionVariants.push({
-      id: INSTRUCTION_VARIANT.ESC,
-      instructions: [
-        {
-          title: 'Enable the APM Server in the ESS console',
-          textPre: i18n.translate('xpack.apm.tutorial.elasticCloud.textPre', {
-            defaultMessage:
-              'To enable the APM Server go to [the Elastic Cloud console](https://cloud.elastic.co/deployments?q={cloudId}) and enable APM in the deployment settings. Once enabled, refresh this page.',
-            values: { cloudId: cloudSetup?.cloudId },
-          }),
-        },
-      ],
-    });
-  }
-
+function getApmServerInstructionSet(
+  cloudSetup?: CloudSetup
+): InstructionSetSchema {
+  const cloudId = cloudSetup?.cloudId;
   return {
     title: i18n.translate('xpack.apm.tutorial.apmServer.title', {
       defaultMessage: 'APM Server',
     }),
-    instructionVariants,
+    instructionVariants: [
+      {
+        id: INSTRUCTION_VARIANT.ESC,
+        instructions: [
+          {
+            title: 'Enable the APM Server in the ESS console',
+            textPre: i18n.translate('xpack.apm.tutorial.elasticCloud.textPre', {
+              defaultMessage:
+                'To enable the APM Server go to [the Elastic Cloud console](https://cloud.elastic.co/deployments?q={cloudId}) and enable APM in the deployment settings. Once enabled, refresh this page.',
+              values: { cloudId },
+            }),
+          },
+        ],
+      },
+    ],
   };
 }
 

diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import {
   INSTRUCTION_VARIANT,
-  TutorialSchema,
+  InstructionsSchema,
 } from '../../../../../../src/plugins/home/server';
 import {
   createDjangoAgentInstructions,
@@ -44,7 +44,7 @@ export function onPremInstructions({
   metricsIndices: string;
   sourcemapIndices: string;
   onboardingIndices: string;
-}): TutorialSchema['onPrem'] {
+}): InstructionsSchema {
   const EDIT_CONFIG = createEditConfig();
   const START_SERVER_UNIX = createStartServerUnix();
   const START_SERVER_UNIX_SYSV = createStartServerUnixSysv();