load prepacked timelines by default

elastic · Jul 13, 2020 · 812756b · 812756b
1 parent b7f294e
commit 812756b
Show file tree

Hide file tree

Showing 26 changed files with 1,420 additions and 284 deletions.
diff --git a/x-pack/plugins/security_solution/common/types/timeline/index.ts b/x-pack/plugins/security_solution/common/types/timeline/index.ts
@@ -11,6 +11,13 @@ import * as runtimeTypes from 'io-ts';
 import { stringEnum, unionWithNullType } from '../../utility_types';
 import { NoteSavedObject, NoteSavedObjectToReturnRuntimeType } from './note';
 import { PinnedEventToReturnSavedObjectRuntimeType, PinnedEventSavedObject } from './pinned_event';
+import {
+  success,
+  // eslint-disable-next-line @typescript-eslint/camelcase
+  success_count,
+} from '../../detection_engine/schemas/common/schemas';
+import { PositiveInteger } from '../../detection_engine/schemas/types';
+import { errorSchema } from '../../detection_engine/schemas/response/error_schema';
 
 /*
  *  ColumnHeader Types
@@ -379,3 +386,15 @@ export type NotesAndPinnedEventsByTimelineId = Record<
   string,
   { notes: NoteSavedObject[]; pinnedEvents: PinnedEventSavedObject[] }
 >;
+
+export const importTimelineResultSchema = runtimeTypes.exact(
+  runtimeTypes.type({
+    success,
+    success_count,
+    timelines_installed: PositiveInteger,
+    timelines_updated: PositiveInteger,
+    errors: runtimeTypes.array(errorSchema),
+  })
+);
+
+export type ImportTimelineResultSchema = runtimeTypes.TypeOf<typeof importTimelineResultSchema>;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
@@ -124,7 +124,12 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
       defaultTimelineCount,
       templateTimelineCount,
     });
-    const { timelineStatus, templateTimelineType, templateTimelineFilter } = useTimelineStatus({
+    const {
+      timelineStatus,
+      templateTimelineType,
+      templateTimelineFilter,
+      installPrepackagedTimelines,
+    } = useTimelineStatus({
       timelineType,
       customTemplateTimelineCount,
       elasticTemplateTimelineCount,
@@ -287,7 +292,13 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
       focusInput();
     }, []);
 
-    useEffect(() => refetch(), [refetch]);
+    useEffect(() => {
+      const fetchData = async () => {
+        await installPrepackagedTimelines();
+        refetch();
+      };
+      fetchData();
+    }, [refetch, installPrepackagedTimelines]);
 
     return !isModal ? (
       <OpenTimeline

diff --git a/...ugins/security_solution/public/timelines/components/open_timeline/use_timeline_status.tsx b/...ugins/security_solution/public/timelines/components/open_timeline/use_timeline_status.tsx
@@ -17,6 +17,7 @@ import {
 
 import * as i18n from './translations';
 import { TemplateTimelineFilter } from './types';
+import { installPrepackedTimelines } from '../../containers/api';
 
 export const useTimelineStatus = ({
   timelineType,
@@ -30,6 +31,7 @@ export const useTimelineStatus = ({
   timelineStatus: TimelineStatusLiteralWithNull;
   templateTimelineType: TemplateTimelineTypeLiteralWithNull;
   templateTimelineFilter: JSX.Element[] | null;
+  installPrepackagedTimelines: () => void;
 } => {
   const [selectedTab, setSelectedTab] = useState<TemplateTimelineTypeLiteralWithNull>(
     TemplateTimelineType.elastic
@@ -101,9 +103,16 @@ export const useTimelineStatus = ({
       : null;
   }, [templateTimelineType, filters, isTemplateFilterEnabled, onFilterClicked]);
 
+  const installPrepackagedTimelines = useCallback(async () => {
+    if (templateTimelineType === TemplateTimelineType.elastic) {
+      await installPrepackedTimelines();
+    }
+  }, [templateTimelineType]);
+
   return {
     timelineStatus,
     templateTimelineType,
     templateTimelineFilter,
+    installPrepackagedTimelines,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
@@ -14,13 +14,16 @@ import {
   TimelineStatus,
   TimelineErrorResponseType,
   TimelineErrorResponse,
+  ImportTimelineResultSchema,
+  importTimelineResultSchema,
 } from '../../../common/types/timeline';
 import { TimelineInput, TimelineType } from '../../graphql/types';
 import {
   TIMELINE_URL,
   TIMELINE_DRAFT_URL,
   TIMELINE_IMPORT_URL,
   TIMELINE_EXPORT_URL,
+  TIMELINE_PREPACKAGED_URL,
 } from '../../../common/constants';
 
 import { KibanaServices } from '../../common/lib/kibana';
@@ -56,6 +59,12 @@ const decodeTimelineErrorResponse = (respTimeline?: TimelineErrorResponse) =>
     fold(throwErrors(createToasterPlainError), identity)
   );
 
+const decodePrepackedTimelineResponse = (respTimeline?: ImportTimelineResultSchema) =>
+  pipe(
+    importTimelineResultSchema.decode(respTimeline),
+    fold(throwErrors(createToasterPlainError), identity)
+  );
+
 const postTimeline = async ({ timeline }: RequestPostTimeline): Promise<TimelineResponse> => {
   const response = await KibanaServices.get().http.post<TimelineResponse>(TIMELINE_URL, {
     method: 'POST',
@@ -200,3 +209,12 @@ export const cleanDraftTimeline = async ({
 
   return decodeTimelineResponse(response);
 };
+
+export const installPrepackedTimelines = async (): Promise<ImportTimelineResultSchema> => {
+  const response = await KibanaServices.get().http.post<ImportTimelineResultSchema>(
+    TIMELINE_PREPACKAGED_URL,
+    {}
+  );
+
+  return decodePrepackedTimelineResponse(response);
+};
diff --git a/...security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/...security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -4,26 +4,30 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { IRouter } from '../../../../../../../../src/core/server';
+
 import { validate } from '../../../../../common/validate';
 import {
   PrePackagedRulesAndTimelinesSchema,
   prePackagedRulesAndTimelinesSchema,
 } from '../../../../../common/detection_engine/schemas/response/prepackaged_rules_schema';
-import { IRouter } from '../../../../../../../../src/core/server';
+import { importTimelineResultSchema } from '../../../../../common/types/timeline';
 import { DETECTION_ENGINE_PREPACKAGED_URL } from '../../../../../common/constants';
+
+import { ConfigType } from '../../../../config';
+import { SetupPlugins } from '../../../../plugin';
+import { buildFrameworkRequest } from '../../../timeline/routes/utils/common';
+import { installPrepackagedTimelines } from '../../../timeline/routes/utils/install_prepacked_timelines';
+
 import { getIndexExists } from '../../index/get_index_exists';
-import { transformError, buildSiemResponse } from '../utils';
 import { getPrepackagedRules } from '../../rules/get_prepackaged_rules';
 import { installPrepackagedRules } from '../../rules/install_prepacked_rules';
 import { updatePrepackagedRules } from '../../rules/update_prepacked_rules';
 import { getRulesToInstall } from '../../rules/get_rules_to_install';
 import { getRulesToUpdate } from '../../rules/get_rules_to_update';
 import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackaged_rules';
-import { ConfigType } from '../../../../config';
-import { SetupPlugins } from '../../../../plugin';
-import { buildFrameworkRequest } from '../../../timeline/routes/utils/common';
-import { importTimelineResultSchema } from '../../../timeline/routes/schemas/import_timelines_schema';
-import { installPrepackagedTimelines } from '../../../timeline/routes/utils/install_prepacked_timelines';
+
+import { transformError, buildSiemResponse } from '../utils';
 
 export const addPrepackedRulesRoute = (
   router: IRouter,

diff --git a/...y_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts b/...y_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
@@ -20,10 +20,8 @@ import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackage
 import { buildFrameworkRequest } from '../../../timeline/routes/utils/common';
 import { ConfigType } from '../../../../config';
 import { SetupPlugins } from '../../../../plugin';
-import {
-  checkTimelinesStatus,
-  checkTimelineStatusRt,
-} from '../../../timeline/routes/utils/install_prepacked_timelines';
+import { checkTimelinesStatus } from '../../../timeline/routes/utils/check_timelines_status';
+import { checkTimelineStatusRt } from '../../../timeline/routes/schemas/check_timelines_status_schema';
 
 export const getPrepackagedRulesStatusRoute = (
   router: IRouter,