Fix links from waffle map to the logging ui

x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx

@@ -7,6 +7,7 @@
 import { EuiContextMenu, EuiContextMenuPanelDescriptor, EuiPopover } from '@elastic/eui';
 import React from 'react';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib';
+import { getContainerLogsUrl, getHostLogsUrl, getPodLogsUrl } from '../../pages/link_to';
 
 interface Props {
   options: InfraWaffleMapOptions;
@@ -24,15 +25,21 @@ export const NodeContextMenu: React.SFC<Props> = ({
   // TODO: This needs to be change to be dynamic based on the options passed in.
   const nodeType = 'host';
 
+  const nodeLogsUrl = getNodeLogsUrl(nodeType, node);
+
   const panels: EuiContextMenuPanelDescriptor[] = [
     {
       id: 0,
       title: '',
       items: [
-        {
-          name: `View logs for this ${nodeType}`,
-          href: `#/logs?filter=${node.name}`,
-        },
+        ...(nodeLogsUrl
+          ? [
+              {
+                name: `View logs for this ${nodeType}`,
+                href: nodeLogsUrl,
+              },
+            ]
+          : []),
         {
           name: `View APM Traces for this ${nodeType}`,
           href: `/app/apm`,
@@ -52,3 +59,25 @@ export const NodeContextMenu: React.SFC<Props> = ({
     </EuiPopover>
   );
 };
+
+const getNodeLogsUrl = (
+  nodeType: 'host' | 'container' | 'pod',
+  { path }: InfraWaffleMapNode
+): string | undefined => {
+  if (path.length <= 0) {
+    return undefined;
+  }
+
+  const lastPathSegment = path[path.length - 1];
+
+  switch (nodeType) {
+    case 'host':
+      return getHostLogsUrl({ hostname: lastPathSegment.value });
+    case 'container':
+      return getContainerLogsUrl({ containerId: lastPathSegment.value });
+    case 'host':
+      return getPodLogsUrl({ podId: lastPathSegment.value });
+    default:
+      return undefined;
+  }
+};

x-pack/plugins/infra/public/pages/link_to/index.ts

@@ -5,6 +5,6 @@
  */
 
 export { LinkToPage } from './link_to';
-export { RedirectToContainerLogs } from './redirect_to_container_logs';
-export { RedirectToHostLogs } from './redirect_to_host_logs';
-export { RedirectToPodLogs } from './redirect_to_pod_logs';
+export { getContainerLogsUrl, RedirectToContainerLogs } from './redirect_to_container_logs';
+export { getHostLogsUrl, RedirectToHostLogs } from './redirect_to_host_logs';
+export { getPodLogsUrl, RedirectToPodLogs } from './redirect_to_pod_logs';

x-pack/plugins/infra/public/pages/link_to/redirect_to_container_logs.tsx

@@ -33,3 +33,11 @@ export const RedirectToContainerLogs = ({
     }}
   </WithSource>
 );
+
+export const getContainerLogsUrl = ({
+  containerId,
+  time,
+}: {
+  containerId: string;
+  time?: number;
+}) => ['#/link-to/container-logs/', containerId, ...(time ? [`?time=${time}`] : [])].join('');

x-pack/plugins/infra/public/pages/link_to/redirect_to_host_logs.tsx

@@ -33,3 +33,6 @@ export const RedirectToHostLogs = ({
     }}
   </WithSource>
 );
+
+export const getHostLogsUrl = ({ hostname, time }: { hostname: string; time?: number }) =>
+  ['#/link-to/host-logs/', hostname, ...(time ? [`?time=${time}`] : [])].join('');

x-pack/plugins/infra/public/pages/link_to/redirect_to_pod_logs.tsx

@@ -30,3 +30,6 @@ export const RedirectToPodLogs = ({ match, location }: RouteComponentProps<{ pod
     }}
   </WithSource>
 );
+
+export const getPodLogsUrl = ({ podId, time }: { podId: string; time?: number }) =>
+  ['#/link-to/pod-logs/', podId, ...(time ? [`?time=${time}`] : [])].join('');