[APM] Make fleet plugin dependency optional (elastic#104967)

* fixing tutorial when fleet plugin is disabled * addressing PR comments
dominiqueclarke · Jul 9, 2021 · d2ce8d5 · d2ce8d5
1 parent 5b207d8
commit d2ce8d5
Show file tree

Hide file tree

Showing 12 changed files with 384 additions and 149 deletions.
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
@@ -7,7 +7,6 @@
     "data",
     "embeddable",
     "features",
-    "fleet",
     "infra",
     "licensing",
     "observability",
@@ -24,11 +23,15 @@
     "security",
     "spaces",
     "taskManager",
-    "usageCollection"
+    "usageCollection",
+    "fleet"
   ],
   "server": true,
   "ui": true,
-  "configPath": ["xpack", "apm"],
+  "configPath": [
+    "xpack",
+    "apm"
+  ],
   "requiredBundles": [
     "fleet",
     "home",
@@ -38,4 +41,4 @@
     "ml",
     "observability"
   ]
-}
+}
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
@@ -74,7 +74,7 @@ export interface ApmPluginStartDeps {
   ml?: MlPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   observability: ObservabilityPublicStart;
-  fleet: FleetStart;
+  fleet?: FleetStart;
 }
 
 export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
@@ -311,20 +311,21 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
   }
   public start(core: CoreStart, plugins: ApmPluginStartDeps) {
     const { fleet } = plugins;
-
-    const agentEnrollmentExtensionData = getApmEnrollmentFlyoutData();
-
-    fleet.registerExtension({
-      package: 'apm',
-      view: 'agent-enrollment-flyout',
-      title: agentEnrollmentExtensionData.title,
-      Component: agentEnrollmentExtensionData.Component,
-    });
-
-    fleet.registerExtension({
-      package: 'apm',
-      view: 'package-detail-assets',
-      Component: LazyApmCustomAssetsExtension,
-    });
+    if (fleet) {
+      const agentEnrollmentExtensionData = getApmEnrollmentFlyoutData();
+
+      fleet.registerExtension({
+        package: 'apm',
+        view: 'agent-enrollment-flyout',
+        title: agentEnrollmentExtensionData.title,
+        Component: agentEnrollmentExtensionData.Component,
+      });
+
+      fleet.registerExtension({
+        package: 'apm',
+        view: 'package-detail-assets',
+        Component: LazyApmCustomAssetsExtension,
+      });
+    }
   }
 }
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx b/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx
@@ -18,6 +18,7 @@ interface Args {
   onPrem: boolean;
   hasFleetPoliciesWithApmIntegration: boolean;
   hasCloudPolicyWithApmIntegration: boolean;
+  isFleetEnabled: boolean;
 }
 
 const policyElasticAgentOnCloudAgent: APIResponseType['fleetAgents'][0] = {
@@ -47,6 +48,7 @@ function Wrapper({
   apmAgent,
   onPrem,
   hasCloudPolicyWithApmIntegration,
+  isFleetEnabled,
 }: Args) {
   const http = ({
     get: () => ({
@@ -56,6 +58,7 @@ function Wrapper({
           ? [policyElasticAgentOnCloudAgent]
           : []),
       ],
+      isFleetEnabled,
       cloudStandaloneSetup: {
         apmServerUrl: 'cloud_url',
         secretToken: 'foo',
@@ -80,6 +83,7 @@ Integration.args = {
   onPrem: true,
   hasFleetPoliciesWithApmIntegration: false,
   hasCloudPolicyWithApmIntegration: false,
+  isFleetEnabled: true,
 };
 
 export default {
@@ -113,5 +117,8 @@ export default {
     hasCloudPolicyWithApmIntegration: {
       control: { type: 'boolean', options: [true, false] },
     },
+    isFleetEnabled: {
+      control: { type: 'boolean', options: [true, false], defaultValue: true },
+    },
   },
 };
diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts b/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts
@@ -41,6 +41,7 @@ describe('getPolicyOptions', () => {
             apmServerUrl: 'cloud_url',
             secretToken: 'cloud_token',
           },
+          isFleetEnabled: true,
         };
         const options = getPolicyOptions({
           isCloudEnabled: true,
@@ -65,6 +66,7 @@ describe('getPolicyOptions', () => {
             apmServerUrl: 'cloud_url',
             secretToken: 'cloud_token',
           },
+          isFleetEnabled: true,
         };
         const options = getPolicyOptions({
           isCloudEnabled: true,
@@ -109,6 +111,7 @@ describe('getPolicyOptions', () => {
             apmServerUrl: 'cloud_url',
             secretToken: 'cloud_token',
           },
+          isFleetEnabled: true,
         };
         const options = getPolicyOptions({
           isCloudEnabled: true,
@@ -151,6 +154,7 @@ describe('getPolicyOptions', () => {
         const data: APIResponseType = {
           fleetAgents: [],
           cloudStandaloneSetup: undefined,
+          isFleetEnabled: true,
         };
         const options = getPolicyOptions({
           isCloudEnabled: true,
@@ -173,6 +177,7 @@ describe('getPolicyOptions', () => {
         const data: APIResponseType = {
           fleetAgents,
           cloudStandaloneSetup: undefined,
+          isFleetEnabled: true,
         };
         const options = getPolicyOptions({
           isCloudEnabled: true,
@@ -213,6 +218,7 @@ describe('getPolicyOptions', () => {
         const data: APIResponseType = {
           fleetAgents: [policyElasticAgentOnCloudAgent, ...fleetAgents],
           cloudStandaloneSetup: undefined,
+          isFleetEnabled: true,
         };
         const options = getPolicyOptions({
           isCloudEnabled: true,
@@ -256,6 +262,7 @@ describe('getPolicyOptions', () => {
       const data: APIResponseType = {
         fleetAgents: [],
         cloudStandaloneSetup: undefined,
+        isFleetEnabled: true,
       };
       const options = getPolicyOptions({
         isCloudEnabled: false,
@@ -278,6 +285,7 @@ describe('getPolicyOptions', () => {
       const data: APIResponseType = {
         fleetAgents,
         cloudStandaloneSetup: undefined,
+        isFleetEnabled: true,
       };
       const options = getPolicyOptions({
         isCloudEnabled: false,