[Logs+] Replace Monitoring usages of link-to routes

x-pack/plugins/monitoring/public/components/logs/logs.js

@@ -6,6 +6,7 @@
  */
 
 import React, { PureComponent } from 'react';
+import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
 import { upperFirst } from 'lodash';
 import { Legacy } from '../../legacy_shims';
 import { EuiBasicTable, EuiTitle, EuiSpacer, EuiText, EuiCallOut, EuiLink } from '@elastic/eui';
@@ -110,8 +111,6 @@ const clusterColumns = [
 ];
 
 function getLogsUiLink(clusterUuid, nodeId, indexUuid) {
-  const base = `${Legacy.shims.getBasePath()}/app/logs/link-to/${INFRA_SOURCE_ID}/logs`;
-
   const params = [];
   if (clusterUuid) {
     params.push(`elasticsearch.cluster.uuid:${clusterUuid}`);
@@ -123,11 +122,12 @@ function getLogsUiLink(clusterUuid, nodeId, indexUuid) {
     params.push(`elasticsearch.index.name:${indexUuid}`);
   }
 
-  if (params.length === 0) {
-    return base;
-  }
+  const base = Legacy.shims.infra.locators.logsLocator.getRedirectUrl({
+    logView: { logViewId: INFRA_SOURCE_ID, type: 'log-view-reference' },
+    ...(params.length ? { filter: params.join(' and ') } : {}),
+  });
 
-  return `${base}?filter=${params.join(' and ')}`;
+  return base;
 }
 
 export class Logs extends PureComponent {
@@ -158,7 +158,7 @@ export class Logs extends PureComponent {
   }
 
   renderCallout() {
-    const uiCapabilities = Legacy.shims.capabilities;
+    const { capabilities: uiCapabilities, infra, kibanaServices } = Legacy.shims;
     const show = uiCapabilities.logs && uiCapabilities.logs.show;
     const {
       logs: { enabled },
@@ -170,15 +170,15 @@ export class Logs extends PureComponent {
       return null;
     }
 
-    return (
+    return infra ? (
       <EuiCallOut
         size="m"
         title={i18n.translate('xpack.monitoring.logs.listing.calloutTitle', {
           defaultMessage: 'Want to see more log entries?',
         })}
         iconType="logsApp"
       >
-        <p>
+        <RedirectAppLinks coreStart={kibanaServices}>
           <FormattedMessage
             id="xpack.monitoring.logs.listing.linkText"
             defaultMessage="Visit {link} to dive deeper."
@@ -192,9 +192,9 @@ export class Logs extends PureComponent {
               ),
             }}
           />
-        </p>
+        </RedirectAppLinks>
       </EuiCallOut>
-    );
+    ) : null;
   }
 
   render() {

x-pack/plugins/monitoring/public/components/logs/logs.test.js

@@ -14,6 +14,13 @@ jest.mock('../../legacy_shims', () => ({
     shims: {
       getBasePath: () => '',
       capabilities: { logs: { show: true } },
+      infra: {
+        locators: {
+          logsLocator: {
+            getRedirectUrl: () => '',
+          },
+        },
+      },
     },
   },
 }));

x-pack/plugins/monitoring/public/legacy_shims.ts

@@ -22,6 +22,7 @@ import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-
 import { TypeRegistry } from '@kbn/triggers-actions-ui-plugin/public/application/type_registry';
 import { ActionTypeModel, RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public/types';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import type { InfraClientStartExports } from '@kbn/infra-plugin/public';
 import {
   MonitoringStartPluginDependencies,
   LegacyMonitoringStartPluginDependencies,
@@ -73,6 +74,7 @@ export interface IShims {
   usageCollection: UsageCollectionSetup;
   kibanaServices: CoreStart & { usageCollection: UsageCollectionSetup };
   appMountParameters: AppMountParameters;
+  infra?: InfraClientStartExports;
 }
 
 export class Legacy {
@@ -85,6 +87,7 @@ export class Legacy {
     triggersActionsUi,
     usageCollection,
     appMountParameters,
+    infra,
   }: LegacyMonitoringStartPluginDependencies) {
     this._shims = {
       toastNotifications: core.notifications.toasts,
@@ -143,6 +146,7 @@ export class Legacy {
         usageCollection,
       },
       appMountParameters,
+      infra,
     };
   }
 

x-pack/plugins/monitoring/public/plugin.ts

@@ -108,6 +108,7 @@ export class MonitoringPlugin
           usageCollection: plugins.usageCollection,
           appMountParameters: params,
           dataViews: pluginsStart.dataViews,
+          infra: pluginsStart.infra,
         };
 
         Legacy.init({
@@ -122,6 +123,7 @@ export class MonitoringPlugin
           usageCollection: deps.usageCollection,
           appMountParameters: deps.appMountParameters,
           dataViews: deps.dataViews,
+          infra: deps.infra,
         });
 
         const config = Object.fromEntries(externalConfig);

x-pack/plugins/monitoring/public/types.ts

@@ -15,6 +15,7 @@ export type { MLJobs } from '../server/lib/elasticsearch/get_ml_jobs';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DashboardStart } from '@kbn/dashboard-plugin/public';
 import { FleetStart } from '@kbn/fleet-plugin/public';
+import type { InfraClientStartExports } from '@kbn/infra-plugin/public';
 
 export interface MonitoringStartPluginDependencies {
   navigation: NavigationStart;
@@ -24,6 +25,7 @@ export interface MonitoringStartPluginDependencies {
   dataViews: DataViewsPublicPluginStart;
   dashboard?: DashboardStart;
   fleet?: FleetStart;
+  infra?: InfraClientStartExports;
 }
 
 interface LegacyStartDependencies {

x-pack/plugins/monitoring/tsconfig.json

@@ -40,6 +40,7 @@
     "@kbn/fleet-plugin",
     "@kbn/shared-ux-router",
     "@kbn/observability-shared-plugin",
+    "@kbn/shared-ux-link-redirect-app",
   ],
   "exclude": [
     "target/**/*",