[Infra] Disable infra plugin in serverless projects

config/serverless.oblt.yml

@@ -3,6 +3,7 @@
 ## Disable plugins
 enterpriseSearch.enabled: false
 xpack.cloudSecurityPosture.enabled: false
+xpack.infra.enabled: false
 xpack.securitySolution.enabled: false
 xpack.uptime.enabled: false
 xpack.legacy_uptime.enabled: false

config/serverless.security.yml

@@ -3,6 +3,7 @@
 ## Disable plugins
 enterpriseSearch.enabled: false
 xpack.apm.enabled: false
+xpack.infra.enabled: false
 xpack.observability.enabled: false
 xpack.uptime.enabled: false
 xpack.legacy_uptime.enabled: false

x-pack/plugins/apm/kibana.jsonc

@@ -15,7 +15,6 @@
       "controls",
       "embeddable",
       "features",
-      "infra",
       "logsShared",
       "inspector",
       "licensing",
@@ -41,6 +40,7 @@
       "discover",
       "fleet",
       "fieldFormats",
+      "infra",
       "home",
       "ml",
       "security",
@@ -49,7 +49,7 @@
       "usageCollection",
       "customIntegrations", // Move this to requiredPlugins after completely migrating from the Tutorials Home App
       "licenseManagement",
-      "profiling",
+      "profiling"
     ],
     "requiredBundles": [
       "advancedSettings",

x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx

@@ -40,10 +40,7 @@ export function InstanceActionsMenu({
   kuery,
   onClose,
 }: Props) {
-  const {
-    core,
-    infra: { locators },
-  } = useApmPluginContext();
+  const { core, infra } = useApmPluginContext();
   const { data, status } = useInstanceDetailsFetcher({
     serviceName,
     serviceNodeName,
@@ -92,7 +89,7 @@ export function InstanceActionsMenu({
     basePath: core.http.basePath,
     onFilterByInstanceClick: handleFilterByInstanceClick,
     metricsHref,
-    infraLocators: locators,
+    infraLocators: infra?.locators,
   });
 
   return (

x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts

@@ -52,67 +52,71 @@ export function getMenuSections({
     ? new Date(instanceDetails['@timestamp']).valueOf()
     : undefined;
   const infraMetricsQuery = getInfraMetricsQuery(instanceDetails['@timestamp']);
-  const infraNodeLocator = infraLocators.nodeLogsLocator;
+  const infraNodeLocator = infraLocators?.nodeLogsLocator;
 
-  const podActions: Action[] = [
-    {
-      key: 'podLogs',
-      label: i18n.translate(
-        'xpack.apm.serviceOverview.instancesTable.actionMenus.podLogs',
-        { defaultMessage: 'Pod logs' }
-      ),
-      href: infraNodeLocator.getRedirectUrl({
-        nodeId: podId!,
-        nodeType: 'pod',
-        time,
-      }),
-      condition: !!podId,
-    },
-    {
-      key: 'podMetrics',
-      label: i18n.translate(
-        'xpack.apm.serviceOverview.instancesTable.actionMenus.podMetrics',
-        { defaultMessage: 'Pod metrics' }
-      ),
-      href: getInfraHref({
-        app: 'metrics',
-        basePath,
-        path: `/link-to/pod-detail/${podId}`,
-        query: infraMetricsQuery,
-      }),
-      condition: !!podId,
-    },
-  ];
+  const podActions: Action[] = infraNodeLocator
+    ? [
+        {
+          key: 'podLogs',
+          label: i18n.translate(
+            'xpack.apm.serviceOverview.instancesTable.actionMenus.podLogs',
+            { defaultMessage: 'Pod logs' }
+          ),
+          href: infraNodeLocator?.getRedirectUrl({
+            nodeId: podId!,
+            nodeType: 'pod',
+            time,
+          }),
+          condition: !!podId,
+        },
+        {
+          key: 'podMetrics',
+          label: i18n.translate(
+            'xpack.apm.serviceOverview.instancesTable.actionMenus.podMetrics',
+            { defaultMessage: 'Pod metrics' }
+          ),
+          href: getInfraHref({
+            app: 'metrics',
+            basePath,
+            path: `/link-to/pod-detail/${podId}`,
+            query: infraMetricsQuery,
+          }),
+          condition: !!podId,
+        },
+      ]
+    : [];
 
-  const containerActions: Action[] = [
-    {
-      key: 'containerLogs',
-      label: i18n.translate(
-        'xpack.apm.serviceOverview.instancesTable.actionMenus.containerLogs',
-        { defaultMessage: 'Container logs' }
-      ),
-      href: infraNodeLocator.getRedirectUrl({
-        nodeId: containerId!,
-        nodeType: 'container',
-        time,
-      }),
-      condition: !!containerId,
-    },
-    {
-      key: 'containerMetrics',
-      label: i18n.translate(
-        'xpack.apm.serviceOverview.instancesTable.actionMenus.containerMetrics',
-        { defaultMessage: 'Container metrics' }
-      ),
-      href: getInfraHref({
-        app: 'metrics',
-        basePath,
-        path: `/link-to/container-detail/${containerId}`,
-        query: infraMetricsQuery,
-      }),
-      condition: !!containerId,
-    },
-  ];
+  const containerActions: Action[] = infraNodeLocator
+    ? [
+        {
+          key: 'containerLogs',
+          label: i18n.translate(
+            'xpack.apm.serviceOverview.instancesTable.actionMenus.containerLogs',
+            { defaultMessage: 'Container logs' }
+          ),
+          href: infraNodeLocator?.getRedirectUrl({
+            nodeId: containerId!,
+            nodeType: 'container',
+            time,
+          }),
+          condition: !!containerId,
+        },
+        {
+          key: 'containerMetrics',
+          label: i18n.translate(
+            'xpack.apm.serviceOverview.instancesTable.actionMenus.containerMetrics',
+            { defaultMessage: 'Container metrics' }
+          ),
+          href: getInfraHref({
+            app: 'metrics',
+            basePath,
+            path: `/link-to/container-detail/${containerId}`,
+            query: infraMetricsQuery,
+          }),
+          condition: !!containerId,
+        },
+      ]
+    : [];
 
   const apmActions: Action[] = [
     {