[apm][infra] remove infra dependency from apm (#167531)

## Summary Closes #166834 Moves the following components out of infra plugin so we can remove the apm->infra dependency - `/infra/metrics_explorer` route - (Host|Pod|Container)MetricsTable components - InfraAppId - InfraLocators ### Testing We should focus the testing on the metrics_explorer route which is used by 1. Tables in the Infrastructure section of apm and 2. Infrastructure > Metrics explorer app. No functionality was added so these apps should have the same existing behavior. Easiest way to get these views loaded is by connecting kibana to an edge-oblt cluster, alternatively load service and metrics with a data loader. ### Follow up - (Host|Pod|Container)MetricsTable components are part of the metricsDataAccess plugin contract but should be moved to stateless package --------- Co-authored-by: kibanamachine <[email protected]> Co-authored-by: Jason Rhodes <[email protected]>
elastic · Nov 2, 2023 · f1fa4b0 · f1fa4b0
1 parent 99a0adf
commit f1fa4b0
Show file tree

Hide file tree

Showing 382 changed files with 7,788 additions and 752 deletions.
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -94,6 +94,7 @@ pageLoadAssetSize:
   management: 46112
   maps: 90000
   mapsEms: 26072
+  metricsDataAccess: 60000
   ml: 82187
   monitoring: 80000
   navigation: 37269

diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
@@ -51,6 +51,7 @@
     "xpack.logstash": ["plugins/logstash"],
     "xpack.main": "legacy/plugins/xpack_main",
     "xpack.maps": ["plugins/maps"],
+    "xpack.metricsData": "plugins/metrics_data_access",
     "xpack.ml": [
       "packages/ml/anomaly_utils",
       "packages/ml/data_grid",

diff --git a/x-pack/plugins/apm/kibana.jsonc b/x-pack/plugins/apm/kibana.jsonc
@@ -41,7 +41,6 @@
       "discover",
       "fleet",
       "fieldFormats",
-      "infra",
       "home",
       "ml",
       "security",

diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx
@@ -49,7 +49,6 @@ export const renderApp = ({
     plugins: pluginsSetup,
     data: pluginsStart.data,
     inspector: pluginsStart.inspector,
-    infra: pluginsStart.infra,
     observability: pluginsStart.observability,
     observabilityShared: pluginsStart.observabilityShared,
     observabilityRuleTypeRegistry,

diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.test.tsx b/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.test.tsx
@@ -12,7 +12,7 @@ import { CoreStart } from '@kbn/core/public';
 import { shallow } from 'enzyme';
 
 const KibanaReactContext = createKibanaReactContext({
-  infra: {
+  metricsDataAccess: {
     HostMetricsTable: () => 'Host metrics table',
     ContainerMetricsTable: () => 'Container metrics table',
     PodMetricsTable: () => 'Pods metrics table',

diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.tsx b/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.tsx
@@ -42,10 +42,10 @@ export function useTabs({
   end: string;
 }) {
   const { services } = useKibana<ApmPluginStartDeps>();
-  const { infra } = services;
-  const HostMetricsTable = infra?.HostMetricsTable;
-  const ContainerMetricsTable = infra?.ContainerMetricsTable;
-  const PodMetricsTable = infra?.PodMetricsTable;
+  const { metricsDataAccess } = services;
+  const HostMetricsTable = metricsDataAccess?.HostMetricsTable;
+  const ContainerMetricsTable = metricsDataAccess?.ContainerMetricsTable;
+  const PodMetricsTable = metricsDataAccess?.PodMetricsTable;
 
   const timerange = useMemo(
     () => ({
@@ -91,23 +91,32 @@ export function useTabs({
     <>
       <EuiSpacer />
       {ContainerMetricsTable &&
-        ContainerMetricsTable({ timerange, filterClauseDsl: containersFilter })}
+        ContainerMetricsTable({
+          timerange,
+          filterClauseDsl: containersFilter,
+        })}
     </>
   );
 
   const podMetricsTable = (
     <>
       <EuiSpacer />
       {PodMetricsTable &&
-        PodMetricsTable({ timerange, filterClauseDsl: podsFilter })}
+        PodMetricsTable({
+          timerange,
+          filterClauseDsl: podsFilter,
+        })}
     </>
   );
 
   const hostMetricsTable = (
     <>
       <EuiSpacer />
       {HostMetricsTable &&
-        HostMetricsTable({ timerange, filterClauseDsl: hostsFilter })}
+        HostMetricsTable({
+          timerange,
+          filterClauseDsl: hostsFilter,
+        })}
     </>
   );
 

diff --git a/...nts/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx b/...nts/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx
@@ -19,6 +19,10 @@ import {
   AllDatasetsLocatorParams,
   ALL_DATASETS_LOCATOR_ID,
 } from '@kbn/deeplinks-observability/locators';
+import {
+  NODE_LOGS_LOCATOR_ID,
+  NodeLogsLocatorParams,
+} from '@kbn/logs-shared-plugin/common';
 import { isJavaAgentName } from '../../../../../../common/agent_name';
 import { SERVICE_NODE_NAME } from '../../../../../../common/es_fields/apm';
 import { useApmPluginContext } from '../../../../../context/apm_plugin/use_apm_plugin_context';
@@ -44,7 +48,7 @@ export function InstanceActionsMenu({
   kuery,
   onClose,
 }: Props) {
-  const { core, infra, share } = useApmPluginContext();
+  const { core, share } = useApmPluginContext();
   const { data, status } = useInstanceDetailsFetcher({
     serviceName,
     serviceNodeName,
@@ -59,6 +63,8 @@ export function InstanceActionsMenu({
   const allDatasetsLocator = share.url.locators.get<AllDatasetsLocatorParams>(
     ALL_DATASETS_LOCATOR_ID
   )!;
+  const nodeLogsLocator =
+    share.url.locators.get<NodeLogsLocatorParams>(NODE_LOGS_LOCATOR_ID)!;
 
   if (isPending(status)) {
     return (
@@ -97,8 +103,8 @@ export function InstanceActionsMenu({
     basePath: core.http.basePath,
     onFilterByInstanceClick: handleFilterByInstanceClick,
     metricsHref,
-    infraLocators: infra?.locators,
     allDatasetsLocator,
+    nodeLogsLocator,
   });
 
   return (

diff --git a/.../service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts b/.../service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts
@@ -8,9 +8,9 @@
 import { i18n } from '@kbn/i18n';
 import { IBasePath } from '@kbn/core/public';
 import moment from 'moment';
-import type { InfraLocators } from '@kbn/infra-plugin/common/locators';
 import type { LocatorPublic } from '@kbn/share-plugin/public';
 import { AllDatasetsLocatorParams } from '@kbn/deeplinks-observability/locators';
+import { NodeLogsLocatorParams } from '@kbn/logs-shared-plugin/common';
 import { getNodeLogsHref } from '../../../../shared/links/observability_logs_link';
 import { APIReturnType } from '../../../../../services/rest/create_call_apm_api';
 import { getInfraHref } from '../../../../shared/links/infra_link';
@@ -41,37 +41,36 @@ export function getMenuSections({
   basePath,
   onFilterByInstanceClick,
   metricsHref,
-  infraLocators,
   allDatasetsLocator,
+  nodeLogsLocator,
 }: {
   instanceDetails: InstaceDetails;
   basePath: IBasePath;
   onFilterByInstanceClick: () => void;
   metricsHref: string;
-  infraLocators?: InfraLocators;
   allDatasetsLocator: LocatorPublic<AllDatasetsLocatorParams>;
+  nodeLogsLocator: LocatorPublic<NodeLogsLocatorParams>;
 }) {
   const podId = instanceDetails.kubernetes?.pod?.uid;
   const containerId = instanceDetails.container?.id;
   const time = instanceDetails['@timestamp']
     ? new Date(instanceDetails['@timestamp']).valueOf()
     : undefined;
   const infraMetricsQuery = getInfraMetricsQuery(instanceDetails['@timestamp']);
-  const infraNodeLocator = infraLocators?.nodeLogsLocator;
 
   const podLogsHref = getNodeLogsHref(
     'pod',
     podId!,
     time,
     allDatasetsLocator,
-    infraNodeLocator
+    nodeLogsLocator
   );
   const containerLogsHref = getNodeLogsHref(
     'container',
     containerId!,
     time,
     allDatasetsLocator,
-    infraNodeLocator
+    nodeLogsLocator
   );
 
   const podActions: Action[] = [
@@ -96,7 +95,7 @@ export function getMenuSections({
         path: `/link-to/pod-detail/${podId}`,
         query: infraMetricsQuery,
       }),
-      condition: !!podId && !!infraLocators,
+      condition: !!podId,
     },
   ];
 
@@ -122,7 +121,7 @@ export function getMenuSections({
         path: `/link-to/container-detail/${containerId}`,
         query: infraMetricsQuery,
       }),
-      condition: !!containerId && !!infraLocators,
+      condition: !!containerId,
     },
   ];
 

diff --git a/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx b/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx
@@ -9,7 +9,7 @@ import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
 import { IBasePath } from '@kbn/core/public';
 import React from 'react';
 import url from 'url';
-import { InfraAppId } from '@kbn/infra-plugin/public';
+import { InfraAppId } from '@kbn/observability-shared-plugin/public/infra';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { fromQuery } from './url_helpers';
 

diff --git a/x-pack/plugins/apm/public/components/shared/links/observability_logs_link.ts b/x-pack/plugins/apm/public/components/shared/links/observability_logs_link.ts
@@ -6,9 +6,9 @@
  */
 
 import type {
-  NodeLogsLocator,
-  LogsLocator,
-} from '@kbn/infra-plugin/common/locators';
+  LogsLocatorParams,
+  NodeLogsLocatorParams,
+} from '@kbn/logs-shared-plugin/common';
 import { AllDatasetsLocatorParams } from '@kbn/deeplinks-observability/locators';
 import { LocatorPublic } from '@kbn/share-plugin/common';
 import moment from 'moment';
@@ -27,7 +27,7 @@ export const getNodeLogsHref = (
   id: string,
   time: number | undefined,
   allDatasetsLocator: LocatorPublic<AllDatasetsLocatorParams>,
-  infraNodeLocator?: NodeLogsLocator
+  infraNodeLocator?: LocatorPublic<NodeLogsLocatorParams>
 ): string => {
   if (infraNodeLocator)
     return infraNodeLocator?.getRedirectUrl({
@@ -53,7 +53,7 @@ export const getTraceLogsHref = (
   traceId: string,
   time: number | undefined,
   allDatasetsLocator: LocatorPublic<AllDatasetsLocatorParams>,
-  infraLogsLocator?: LogsLocator
+  infraLogsLocator: LocatorPublic<LogsLocatorParams>
 ): string => {
   const query = `trace.id:"${traceId}" OR (not trace.id:* AND "${traceId}")`;
 

diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts
@@ -7,6 +7,11 @@
 
 import { createMemoryHistory } from 'history';
 import { IBasePath } from '@kbn/core/public';
+import { LocatorPublic } from '@kbn/share-plugin/common';
+import {
+  LogsLocatorParams,
+  NodeLogsLocatorParams,
+} from '@kbn/logs-shared-plugin/common';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
 import { getSections } from './sections';
 import {
@@ -24,12 +29,12 @@ const apmRouter = {
     `some-basepath/app/apm${apmRouterBase.link(...args)}`,
 } as ApmRouter;
 
-const infraLocators = infraLocatorsMock;
 const { allDatasetsLocator } = observabilityLogExplorerLocatorsMock;
+const { nodeLogsLocator, logsLocator } = infraLocatorsMock;
 
 const expectInfraLocatorsToBeCalled = () => {
-  expect(infraLocators.nodeLogsLocator.getRedirectUrl).toBeCalledTimes(3);
-  expect(infraLocators.logsLocator.getRedirectUrl).toBeCalledTimes(1);
+  expect(nodeLogsLocator.getRedirectUrl).toBeCalledTimes(3);
+  expect(logsLocator.getRedirectUrl).toBeCalledTimes(1);
 };
 
 describe('Transaction action menu', () => {
@@ -64,8 +69,10 @@ describe('Transaction action menu', () => {
         basePath,
         location,
         apmRouter,
-        infraLocators,
         allDatasetsLocator,
+        logsLocator: logsLocator as unknown as LocatorPublic<LogsLocatorParams>,
+        nodeLogsLocator:
+          nodeLogsLocator as unknown as LocatorPublic<NodeLogsLocatorParams>,
         infraLinksAvailable: false,
         rangeFrom: 'now-24h',
         rangeTo: 'now',
@@ -130,7 +137,9 @@ describe('Transaction action menu', () => {
         basePath,
         location,
         apmRouter,
-        infraLocators,
+        logsLocator: logsLocator as unknown as LocatorPublic<LogsLocatorParams>,
+        nodeLogsLocator:
+          nodeLogsLocator as unknown as LocatorPublic<NodeLogsLocatorParams>,
         allDatasetsLocator,
         infraLinksAvailable: true,
         rangeFrom: 'now-24h',
@@ -215,7 +224,9 @@ describe('Transaction action menu', () => {
         basePath,
         location,
         apmRouter,
-        infraLocators,
+        logsLocator: logsLocator as unknown as LocatorPublic<LogsLocatorParams>,
+        nodeLogsLocator:
+          nodeLogsLocator as unknown as LocatorPublic<NodeLogsLocatorParams>,
         allDatasetsLocator,
         infraLinksAvailable: true,
         rangeFrom: 'now-24h',

diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts b/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts
@@ -11,7 +11,10 @@ import { IBasePath } from '@kbn/core/public';
 import { isEmpty, pickBy } from 'lodash';
 import moment from 'moment';
 import url from 'url';
-import type { InfraLocators } from '@kbn/infra-plugin/common/locators';
+import {
+  LogsLocatorParams,
+  NodeLogsLocatorParams,
+} from '@kbn/logs-shared-plugin/common';
 import { LocatorPublic } from '@kbn/share-plugin/common';
 import { AllDatasetsLocatorParams } from '@kbn/deeplinks-observability/locators';
 import type { ProfilingLocators } from '@kbn/observability-shared-plugin/public';
@@ -44,32 +47,33 @@ export const getSections = ({
   basePath,
   location,
   apmRouter,
-  infraLocators,
   infraLinksAvailable,
   profilingLocators,
   rangeFrom,
   rangeTo,
   environment,
   allDatasetsLocator,
+  logsLocator,
+  nodeLogsLocator,
 }: {
   transaction?: Transaction;
   basePath: IBasePath;
   location: Location;
   apmRouter: ApmRouter;
-  infraLocators?: InfraLocators;
   infraLinksAvailable: boolean;
   profilingLocators?: ProfilingLocators;
   rangeFrom: string;
   rangeTo: string;
   environment: Environment;
   allDatasetsLocator: LocatorPublic<AllDatasetsLocatorParams>;
+  logsLocator: LocatorPublic<LogsLocatorParams>;
+  nodeLogsLocator: LocatorPublic<NodeLogsLocatorParams>;
 }) => {
   if (!transaction) return [];
 
   const hostName = transaction.host?.hostname;
   const podId = transaction.kubernetes?.pod?.uid;
   const containerId = transaction.container?.id;
-  const { nodeLogsLocator, logsLocator } = infraLocators ?? {};
 
   const time = Math.round(transaction.timestamp.us / 1000);
   const infraMetricsQuery = getInfraMetricsQuery(transaction);