continued cleanup

elastic · Sep 14, 2021 · ef26e9c · ef26e9c
1 parent cdf65c2
commit ef26e9c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 16 deletions.
diff --git a/x-pack/plugins/timelines/server/plugin.ts b/x-pack/plugins/timelines/server/plugin.ts
@@ -39,7 +39,6 @@ export class TimelinesPlugin
     defineRoutes(router);
 
     // Register search strategy
-    // Need to pass in security.audit.asScoped
     core.getStartServices().then(([_, depsStart]) => {
       const TimelineSearchStrategy = timelineSearchStrategyProvider(
         depsStart.data,

diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/factory/events/all/index.ts
@@ -27,11 +27,7 @@ export const timelineEventsAll: TimelineFactory<TimelineEventsQueries.all> = {
       throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
     }
     const { fieldRequested, ...queryOptions } = cloneDeep(options);
-    console.log('HHHHHHHEEEEERE 7');
-
     queryOptions.fields = buildFieldsRequest(fieldRequested, queryOptions.excludeEcsData);
-    console.log('HHHHHHHEEEEERE 8');
-
     return buildTimelineEventsAllQuery({ ...queryOptions, authFilter });
   },
   parse: async (

diff --git a/...gins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts b/...gins/timelines/server/search_strategy/timeline/factory/events/all/query.events_all.dsl.ts
@@ -50,7 +50,6 @@ export const buildTimelineEventsAllQuery = ({
 
   const filters = [...filterClause, ...getTimerangeFilter(timerange), { match_all: {} }];
   const filter = authFilter != null ? [...filters, authFilter] : filters;
-  console.log('HHHHHHHEEEEERE 10');
 
   const getSortField = (sortFields: TimelineRequestSortField[]) =>
     sortFields.map((item) => {
@@ -62,7 +61,6 @@ export const buildTimelineEventsAllQuery = ({
         },
       };
     });
-  console.log('HHHHHHHEEEEERE 11');
 
   const dslQuery = {
     allowNoIndices: true,

diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
@@ -138,25 +138,18 @@ const timelineAlertsSearchStrategy = <T extends TimelineFactoryQueryTypes>({
       },
     });
 
-  console.log({ HERE: auditLogger });
-
   return from(getAuthFilter()).pipe(
     mergeMap(({ filter }) => {
-      console.log('HHHHHHHEEEEERE 6');
-
       const dsl = queryFactory.buildDsl({ ...requestWithAlertsIndices, authFilter: filter });
-      console.log('I AM HERE -----------------------------');
       return es.search({ ...requestWithAlertsIndices, params: dsl }, options, deps);
     }),
     map((response) => {
-      console.log({ RESPONSE: response });
       const rawResponse = shimHitsTotal(response.rawResponse, options);
 
       // Do we have to loop over each hit? Yes.
       // ecs auditLogger requires that we log each alert independently
       if (auditLogger != null) {
         rawResponse.hits?.hits?.forEach((hit) => {
-          console.log({ hittt: JSON.stringify(hit) });
           auditLogger.log(
             alertAuditEvent({
               action: AlertAuditAction.FIND,
@@ -174,7 +167,6 @@ const timelineAlertsSearchStrategy = <T extends TimelineFactoryQueryTypes>({
     }),
     mergeMap((esSearchRes) => queryFactory.parse(requestWithAlertsIndices, esSearchRes)),
     catchError((err) => {
-      console.log({ err: JSON.stringify(err), auditLogger });
       // check if auth error, if yes, write to ecs logger
       if (auditLogger != null && err?.output?.statusCode === 403) {
         auditLogger.log(

diff --git a/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts b/x-pack/test/timeline/security_and_spaces/tests/trial/events.ts
@@ -112,7 +112,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
   });
 
-  describe.only('Timeline - Events', () => {
+  describe('Timeline - Events', () => {
     const logFilePath = Path.resolve(__dirname, '../../../common/fixtures/audit/audit.log');
     const logFile = new FileWrapper(logFilePath);
     const retry = getService('retry');