feat(investigation): Add eventTypes filter on the API

packages/kbn-investigation-shared/src/rest_specs/get_events.ts

@@ -8,7 +8,7 @@
  */
 
 import { z } from '@kbn/zod';
-import { eventResponseSchema } from './event';
+import { eventTypeSchema, eventSchema } from '../schema';
 
 const getEventsParamsSchema = z
   .object({
@@ -17,12 +17,24 @@ const getEventsParamsSchema = z
         rangeFrom: z.string(),
         rangeTo: z.string(),
         filter: z.string(),
+        eventTypes: z.string().transform((val, ctx) => {
+          const eventTypes = val.split(',');
+          const hasInvalidType = eventTypes.some((eventType) => !eventTypeSchema.parse(eventType));
+          if (hasInvalidType) {
+            ctx.addIssue({
+              code: z.ZodIssueCode.custom,
+              message: 'Invalid event type',
+            });
+            return z.NEVER;
+          }
+          return eventTypes;
+        }),
       })
       .partial(),
   })
   .partial();
 
-const getEventsResponseSchema = z.array(eventResponseSchema);
+const getEventsResponseSchema = z.array(eventSchema);
 
 type GetEventsParams = z.infer<typeof getEventsParamsSchema.shape.query>;
 type GetEventsResponse = z.output<typeof getEventsResponseSchema>;

packages/kbn-investigation-shared/src/rest_specs/index.ts

@@ -25,7 +25,6 @@ export type * from './investigation_note';
 export type * from './update';
 export type * from './update_item';
 export type * from './update_note';
-export type * from './event';
 export type * from './get_events';
 export type * from './entity';
 export type * from './get_entities';
@@ -48,7 +47,6 @@ export * from './investigation_note';
 export * from './update';
 export * from './update_item';
 export * from './update_note';
-export * from './event';
 export * from './get_events';
 export * from './entity';
 export * from './get_entities';

packages/kbn-investigation-shared/src/schema/event.ts

@@ -17,8 +17,15 @@ const eventTypeSchema = z.union([
   z.literal('anomaly'),
 ]);
 
+const sourceSchema = z.record(z.string(), z.any());
+
 const annotationEventSchema = z.object({
   eventType: z.literal('annotation'),
+  id: z.string(),
+  title: z.string(),
+  description: z.string(),
+  timestamp: z.number(),
+  source: sourceSchema.optional(),
   annotationType: z.string().optional(),
 });
 
@@ -31,21 +38,19 @@ const alertStatusSchema = z.union([
 
 const alertEventSchema = z.object({
   eventType: z.literal('alert'),
+  id: z.string(),
+  title: z.string(),
+  description: z.string(),
+  timestamp: z.number(),
+  source: sourceSchema.optional(),
   alertStatus: alertStatusSchema,
 });
 
-const sourceSchema = z.record(z.string(), z.any());
+const eventSchema = z.discriminatedUnion('eventType', [annotationEventSchema, alertEventSchema]);
+
+type EventResponse = z.output<typeof eventSchema>;
+type AlertEventResponse = z.output<typeof alertEventSchema>;
+type AnnotationEventResponse = z.output<typeof annotationEventSchema>;
 
-const eventSchema = z.intersection(
-  z.object({
-    id: z.string(),
-    title: z.string(),
-    description: z.string(),
-    timestamp: z.number(),
-    eventType: eventTypeSchema,
-    source: sourceSchema.optional(),
-  }),
-  z.discriminatedUnion('eventType', [annotationEventSchema, alertEventSchema])
-);
-
-export { eventSchema };
+export type { EventResponse, AlertEventResponse, AnnotationEventResponse };
+export { eventSchema, eventTypeSchema, alertEventSchema, annotationEventSchema };

x-pack/plugins/observability_solution/investigate_app/public/hooks/query_key_factory.ts

@@ -12,8 +12,12 @@ export const investigationKeys = {
   userProfiles: (profileIds: Set<string>) =>
     [...investigationKeys.all, 'userProfiles', ...profileIds] as const,
   tags: () => [...investigationKeys.all, 'tags'] as const,
-  events: (rangeFrom?: string, rangeTo?: string, filter?: string) =>
-    [...investigationKeys.all, 'events', rangeFrom, rangeTo, filter] as const,
+  events: (params: {
+    rangeFrom?: string;
+    rangeTo?: string;
+    filter?: string;
+    eventTypes?: string[];
+  }) => [...investigationKeys.all, 'events', params] as const,
   stats: () => [...investigationKeys.all, 'stats'] as const,
   lists: () => [...investigationKeys.all, 'list'] as const,
   list: (params: { page: number; perPage: number; search?: string; filter?: string }) =>

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_add_investigation_note.ts

@@ -11,8 +11,9 @@ import {
   CreateInvestigationNoteParams,
   CreateInvestigationNoteResponse,
 } from '@kbn/investigation-shared';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useKibana } from './use_kibana';
+import { investigationKeys } from './query_key_factory';
 
 type ServerError = IHttpFetchError<ResponseErrorBody>;
 
@@ -23,6 +24,7 @@ export function useAddInvestigationNote() {
       notifications: { toasts },
     },
   } = useKibana();
+  const queryClient = useQueryClient();
 
   return useMutation<
     CreateInvestigationNoteResponse,
@@ -39,7 +41,12 @@ export function useAddInvestigationNote() {
       );
     },
     {
-      onSuccess: (response, {}) => {
+      onSuccess: (_, { investigationId }) => {
+        queryClient.invalidateQueries({
+          queryKey: investigationKeys.detailNotes(investigationId),
+          exact: false,
+        });
+
         toasts.addSuccess(
           i18n.translate('xpack.investigateApp.addInvestigationNote.successMessage', {
             defaultMessage: 'Note saved',

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_delete_investigation_note.ts

@@ -6,13 +6,15 @@
  */
 
 import { IHttpFetchError, ResponseErrorBody } from '@kbn/core/public';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { i18n } from '@kbn/i18n';
 import { useKibana } from './use_kibana';
+import { investigationKeys } from './query_key_factory';
 
 type ServerError = IHttpFetchError<ResponseErrorBody>;
 
 export function useDeleteInvestigationNote() {
+  const queryClient = useQueryClient();
   const {
     core: {
       http,
@@ -34,7 +36,12 @@ export function useDeleteInvestigationNote() {
       );
     },
     {
-      onSuccess: (response, {}) => {
+      onSuccess: (response, { investigationId }) => {
+        queryClient.invalidateQueries({
+          queryKey: investigationKeys.detailNotes(investigationId),
+          exact: false,
+        });
+
         toasts.addSuccess(
           i18n.translate('xpack.investigateApp.useDeleteInvestigationNote.successMessage', {
             defaultMessage: 'Note deleted',

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_fetch_alert.tsx

@@ -44,6 +44,7 @@ export function useFetchAlert({ investigation }: UseFetchAlertParams): UseFetchA
       });
     },
     staleTime: 60 * 1000,
+    retry: false,
     refetchOnWindowFocus: false,
     onError: (error: Error) => {
       toasts.addError(error, {

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_fetch_all_investigation_stats.ts

@@ -51,8 +51,7 @@ export function useFetchAllInvestigationStats(): Response {
       };
     },
     retry: false,
-    cacheTime: 600 * 1000, // 10 minutes
-    staleTime: 0,
+    staleTime: 15 * 1000,
     onError: (error: Error) => {
       toasts.addError(error, {
         title: i18n.translate('xpack.investigateApp.useFetchAllInvestigationStats.errorTitle', {

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_fetch_all_investigation_tags.ts

@@ -35,8 +35,7 @@ export function useFetchAllInvestigationTags(): Response {
         signal,
       });
     },
-    cacheTime: 600 * 1000, // 10_minutes
-    staleTime: 0,
+    staleTime: 15 * 1000,
     refetchOnWindowFocus: false,
     retry: false,
     onError: (error: Error) => {

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_fetch_entities.ts

@@ -50,9 +50,7 @@ export function useFetchEntities({
       });
     },
     refetchOnWindowFocus: false,
-    onError: (error: Error) => {
-      // ignore error
-    },
+    retry: false,
     enabled: Boolean(investigationId && (serviceName || hostName || containerId)),
   });
 

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_fetch_events.ts

@@ -6,16 +6,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { useQuery } from '@tanstack/react-query';
 import { GetEventsResponse } from '@kbn/investigation-shared';
+import { useQuery } from '@tanstack/react-query';
+import { isArray } from 'lodash';
 import { investigationKeys } from './query_key_factory';
 import { useKibana } from './use_kibana';
 
 export interface Response {
-  isInitialLoading: boolean;
   isLoading: boolean;
-  isRefetching: boolean;
-  isSuccess: boolean;
   isError: boolean;
   data?: GetEventsResponse;
 }
@@ -24,10 +22,12 @@ export function useFetchEvents({
   rangeFrom,
   rangeTo,
   filter,
+  eventTypes,
 }: {
   rangeFrom?: string;
   rangeTo?: string;
   filter?: string;
+  eventTypes?: string[];
 }): Response {
   const {
     core: {
@@ -36,21 +36,20 @@ export function useFetchEvents({
     },
   } = useKibana();
 
-  const { isInitialLoading, isLoading, isError, isSuccess, isRefetching, data } = useQuery({
-    queryKey: investigationKeys.events(rangeFrom, rangeTo, filter),
+  const { isLoading, isError, data } = useQuery({
+    queryKey: investigationKeys.events({ rangeFrom, rangeTo, filter, eventTypes }),
     queryFn: async ({ signal }) => {
-      return await http.get<GetEventsResponse>(`/api/observability/events`, {
+      return http.get<GetEventsResponse>(`/api/observability/events`, {
         query: {
           rangeFrom,
           rangeTo,
           filter,
+          ...(isArray(eventTypes) && eventTypes.length > 0 && { eventTypes: eventTypes.join(',') }),
         },
         version: '2023-10-31',
         signal,
       });
     },
-    cacheTime: 600 * 1000, // 10_minutes
-    staleTime: 0,
     refetchOnWindowFocus: false,
     retry: false,
     onError: (error: Error) => {
@@ -64,10 +63,7 @@ export function useFetchEvents({
 
   return {
     data,
-    isInitialLoading,
     isLoading,
-    isRefetching,
-    isSuccess,
     isError,
   };
 }

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_fetch_investigation_list.ts

@@ -64,8 +64,6 @@ export function useFetchInvestigationList({
     retry: false,
     refetchInterval: 60 * 1000,
     refetchOnWindowFocus: false,
-    cacheTime: 600 * 1000, // 10 minutes
-    staleTime: 0,
     onError: (error: Error) => {
       toasts.addError(error, {
         title: i18n.translate('xpack.investigateApp.useFetchInvestigationList.errorTitle', {

x-pack/plugins/observability_solution/investigate_app/public/hooks/use_update_investigation_note.ts

@@ -39,12 +39,16 @@ export function useUpdateInvestigationNote() {
     },
     {
       onSuccess: (response, { investigationId }) => {
+        queryClient.invalidateQueries({
+          queryKey: investigationKeys.detailNotes(investigationId),
+          exact: false,
+        });
+
         toasts.addSuccess(
           i18n.translate('xpack.investigateApp.useUpdateInvestigationNote.successMessage', {
             defaultMessage: 'Note updated',
           })
         );
-        queryClient.invalidateQueries({ queryKey: investigationKeys.detailNotes(investigationId) });
       },
       onError: (error, {}, context) => {
         toasts.addError(