Merge branch 'master' of https://github.com/elastic/kibana into fix_alerting_security

igoristic · igoristic · commit b8a62c67bbcf · 2020-07-15T21:14:38.000-04:00
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js
@@ -30,7 +30,8 @@ export default function ({ getService, getPageObjects }) {
   const browser = getService('browser');
   const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
 
-  describe('dashboard filter bar', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/71987
+  describe.skip('dashboard filter bar', () => {
     before(async () => {
       await esArchiver.load('dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -28,7 +28,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const security = getService('security');
   const PageObjects = getPageObjects(['visualize', 'visualBuilder', 'timePicker', 'visChart']);
 
-  describe('visual builder', function describeIndexTests() {
+  // FLAKY: https://github.com/elastic/kibana/issues/71979
+  describe.skip('visual builder', function describeIndexTests() {
     this.tags('includeFirefox');
     beforeEach(async () => {
       await security.testUser.setRoles([
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
@@ -262,7 +262,7 @@ function getBaseTemplate(
         index: {
           // ILM Policy must be added here, for now point to the default global ILM policy name
           lifecycle: {
-            name: `${type}-default`,
+            name: type,
           },
           // What should be our default for the compression?
           codec: 'best_compression',
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_source_settings.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/__snapshots__/mvt_single_layer_source_settings.test.tsx.snap
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_source_settings.tsx
@@ -133,7 +133,7 @@ export class MVTSingleLayerSourceSettings extends Component<Props, State> {
           label={i18n.translate(
             'xpack.maps.source.MVTSingleLayerVectorSourceEditor.layerNameMessage',
             {
-              defaultMessage: 'Tile layer',
+              defaultMessage: 'Source layer',
             }
           )}
         >
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.test.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.test.tsx
@@ -84,7 +84,7 @@ describe('getImmutableSourceProperties', () => {
     const source = new MVTSingleLayerVectorSource(descriptor);
     const properties = await source.getImmutableProperties();
     expect(properties).toEqual([
-      { label: 'Data source', value: '.pbf vector tiles' },
+      { label: 'Data source', value: 'Vector tiles' },
       { label: 'Url', value: 'https://example.com/{x}/{y}/{z}.pbf' },
     ]);
   });
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
@@ -32,7 +32,7 @@ import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_proper
 export const sourceTitle = i18n.translate(
   'xpack.maps.source.MVTSingleLayerVectorSource.sourceTitle',
   {
-    defaultMessage: '.pbf vector tiles',
+    defaultMessage: 'Vector tiles',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/common/utils/test_utils.ts b/x-pack/plugins/security_solution/public/common/utils/test_utils.ts
diff --git a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/form.test.tsx b/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/form.test.tsx
@@ -7,7 +7,6 @@ import React, { FormEvent } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
-import { waitForUpdates } from '../../../common/utils/test_utils';
 import { TestProviders } from '../../../common/mock';
 import { ValueListsForm } from './form';
 import { useImportList } from '../../../shared_imports';
@@ -30,10 +29,6 @@ const mockSelectFile: <P>(container: ReactWrapper<P>, file: File) => Promise<voi
       fileChange(([file] as unknown) as FormEvent);
     }
   });
-  await waitForUpdates(container);
-  expect(
-    container.find('button[data-test-subj="value-lists-form-import-action"]').prop('disabled')
-  ).not.toEqual(true);
 };
 
 describe('ValueListsForm', () => {
@@ -68,7 +63,6 @@ describe('ValueListsForm', () => {
     await mockSelectFile(container, mockFile);
 
     container.find('button[data-test-subj="value-lists-form-import-action"]').simulate('click');
-    await waitForUpdates(container);
 
     expect(mockImportList).toHaveBeenCalledWith(expect.objectContaining({ file: mockFile }));
   });
@@ -80,12 +74,11 @@ describe('ValueListsForm', () => {
     }));
 
     const onError = jest.fn();
-    const container = mount(
+    mount(
       <TestProviders>
         <ValueListsForm onError={onError} onSuccess={jest.fn()} />
       </TestProviders>
     );
-    await waitForUpdates(container);
 
     expect(onError).toHaveBeenCalledWith('whoops');
   });
@@ -97,12 +90,11 @@ describe('ValueListsForm', () => {
     }));
 
     const onSuccess = jest.fn();
-    const container = mount(
+    mount(
       <TestProviders>
         <ValueListsForm onSuccess={onSuccess} onError={jest.fn()} />
       </TestProviders>
     );
-    await waitForUpdates(container);
 
     expect(onSuccess).toHaveBeenCalledWith({ mockResult: true });
   });
diff --git a/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx b/x-pack/plugins/security_solution/public/detections/components/value_lists_management_modal/modal.test.tsx
@@ -9,10 +9,8 @@ import { mount } from 'enzyme';
 
 import { TestProviders } from '../../../common/mock';
 import { ValueListsModal } from './modal';
-import { waitForUpdates } from '../../../common/utils/test_utils';
 
-// TODO: These are occasionally timing out
-describe.skip('ValueListsModal', () => {
+describe('ValueListsModal', () => {
   it('renders nothing if showModal is false', () => {
     const container = mount(
       <TestProviders>
@@ -21,20 +19,21 @@ describe.skip('ValueListsModal', () => {
     );
 
     expect(container.find('EuiModal')).toHaveLength(0);
+    container.unmount();
   });
 
-  it('renders modal if showModal is true', async () => {
+  it('renders modal if showModal is true', () => {
     const container = mount(
       <TestProviders>
         <ValueListsModal showModal={true} onClose={jest.fn()} />
       </TestProviders>
     );
-    await waitForUpdates(container);
 
     expect(container.find('EuiModal')).toHaveLength(1);
+    container.unmount();
   });
 
-  it('calls onClose when modal is closed', async () => {
+  it('calls onClose when modal is closed', () => {
     const onClose = jest.fn();
     const container = mount(
       <TestProviders>
@@ -44,21 +43,19 @@ describe.skip('ValueListsModal', () => {
 
     container.find('button[data-test-subj="value-lists-modal-close-action"]').simulate('click');
 
-    await waitForUpdates(container);
-
     expect(onClose).toHaveBeenCalled();
+    container.unmount();
   });
 
-  it('renders ValueListsForm and ValueListsTable', async () => {
+  it('renders ValueListsForm and ValueListsTable', () => {
     const container = mount(
       <TestProviders>
         <ValueListsModal showModal={true} onClose={jest.fn()} />
       </TestProviders>
     );
 
-    await waitForUpdates(container);
-
     expect(container.find('ValueListsForm')).toHaveLength(1);
     expect(container.find('ValueListsTable')).toHaveLength(1);
+    container.unmount();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx b/x-pack/plugins/security_solution/public/overview/pages/overview.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 
 import '../../common/mock/match_media';
-import { waitForUpdates } from '../../common/utils/test_utils';
 import { TestProviders } from '../../common/mock';
 import { useWithSource } from '../../common/containers/source';
 import {
@@ -65,31 +64,29 @@ describe('Overview', () => {
         mockuseMessagesStorage.mockImplementation(() => endpointNoticeMessage(false));
       });
 
-      it('renders the Setup Instructions text', async () => {
+      it('renders the Setup Instructions text', () => {
         const wrapper = mount(
           <TestProviders>
             <MemoryRouter>
               <Overview />
             </MemoryRouter>
           </TestProviders>
         );
-        await waitForUpdates(wrapper);
         expect(wrapper.find('[data-test-subj="empty-page"]').exists()).toBe(true);
       });
 
-      it('does not show Endpoint get ready button when ingest is not enabled', async () => {
+      it('does not show Endpoint get ready button when ingest is not enabled', () => {
         const wrapper = mount(
           <TestProviders>
             <MemoryRouter>
               <Overview />
             </MemoryRouter>
           </TestProviders>
         );
-        await waitForUpdates(wrapper);
         expect(wrapper.find('[data-test-subj="empty-page-secondary-action"]').exists()).toBe(false);
       });
 
-      it('shows Endpoint get ready button when ingest is enabled', async () => {
+      it('shows Endpoint get ready button when ingest is enabled', () => {
         (useIngestEnabledCheck as jest.Mock).mockReturnValue({ allEnabled: true });
         const wrapper = mount(
           <TestProviders>
@@ -98,12 +95,11 @@ describe('Overview', () => {
             </MemoryRouter>
           </TestProviders>
         );
-        await waitForUpdates(wrapper);
         expect(wrapper.find('[data-test-subj="empty-page-secondary-action"]').exists()).toBe(true);
       });
     });
 
-    it('it DOES NOT render the Getting started text when an index is available', async () => {
+    it('it DOES NOT render the Getting started text when an index is available', () => {
       (useWithSource as jest.Mock).mockReturnValue({
         indicesExist: true,
         indexPattern: {},
@@ -120,12 +116,12 @@ describe('Overview', () => {
           </MemoryRouter>
         </TestProviders>
       );
-      await waitForUpdates(wrapper);
 
       expect(wrapper.find('[data-test-subj="empty-page"]').exists()).toBe(false);
+      wrapper.unmount();
     });
 
-    test('it DOES render the Endpoint banner when the endpoint index is NOT available AND storage is NOT set', async () => {
+    test('it DOES render the Endpoint banner when the endpoint index is NOT available AND storage is NOT set', () => {
       (useWithSource as jest.Mock).mockReturnValueOnce({
         indicesExist: true,
         indexPattern: {},
@@ -147,12 +143,12 @@ describe('Overview', () => {
           </MemoryRouter>
         </TestProviders>
       );
-      await waitForUpdates(wrapper);
 
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(true);
+      wrapper.unmount();
     });
 
-    test('it does NOT render the Endpoint banner when the endpoint index is NOT available but storage is set', async () => {
+    test('it does NOT render the Endpoint banner when the endpoint index is NOT available but storage is set', () => {
       (useWithSource as jest.Mock).mockReturnValueOnce({
         indicesExist: true,
         indexPattern: {},
@@ -174,12 +170,12 @@ describe('Overview', () => {
           </MemoryRouter>
         </TestProviders>
       );
-      await waitForUpdates(wrapper);
 
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(false);
+      wrapper.unmount();
     });
 
-    test('it does NOT render the Endpoint banner when the endpoint index is available AND storage is set', async () => {
+    test('it does NOT render the Endpoint banner when the endpoint index is available AND storage is set', () => {
       (useWithSource as jest.Mock).mockReturnValue({
         indicesExist: true,
         indexPattern: {},
@@ -196,12 +192,12 @@ describe('Overview', () => {
           </MemoryRouter>
         </TestProviders>
       );
-      await waitForUpdates(wrapper);
 
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(false);
+      wrapper.unmount();
     });
 
-    test('it does NOT render the Endpoint banner when an index IS available but storage is NOT set', async () => {
+    test('it does NOT render the Endpoint banner when an index IS available but storage is NOT set', () => {
       (useWithSource as jest.Mock).mockReturnValue({
         indicesExist: true,
         indexPattern: {},
@@ -219,9 +215,10 @@ describe('Overview', () => {
         </TestProviders>
       );
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(false);
+      wrapper.unmount();
     });
 
-    test('it does NOT render the Endpoint banner when Ingest is NOT available', async () => {
+    test('it does NOT render the Endpoint banner when Ingest is NOT available', () => {
       (useWithSource as jest.Mock).mockReturnValue({
         indicesExist: true,
         indexPattern: {},
@@ -238,9 +235,9 @@ describe('Overview', () => {
           </MemoryRouter>
         </TestProviders>
       );
-      await waitForUpdates(wrapper);
 
       expect(wrapper.find('[data-test-subj="endpoint-prompt-banner"]').exists()).toBe(false);
+      wrapper.unmount();
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filter_events_with_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filter_events_with_list.ts
@@ -32,6 +32,7 @@ export const filterEventsAgainstList = async ({
   buildRuleMessage,
 }: FilterEventsAgainstList): Promise<SignalSearchResponse> => {
   try {
+    logger.debug(buildRuleMessage(`exceptionsList: ${JSON.stringify(exceptionsList, null, 2)}`));
     if (exceptionsList == null || exceptionsList.length === 0) {
       logger.debug(buildRuleMessage('about to return original search result'));
       return eventSearchResult;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ export class MVTSingleLayerSourceSettings extends Component<Props, State> {`
`133`	`133`	`label={i18n.translate(`
`134`	`134`	`'xpack.maps.source.MVTSingleLayerVectorSourceEditor.layerNameMessage',`
`135`	`135`	`{`
`136`		`- defaultMessage: 'Tile layer',`
	`136`	`+ defaultMessage: 'Source layer',`
`137`	`137`	`}`
`138`	`138`	`)}`
`139`	`139`	`>`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import { ITooltipProperty, TooltipProperty } from '../../tooltips/tooltip_proper`
`32`	`32`	`export const sourceTitle = i18n.translate(`
`33`	`33`	`'xpack.maps.source.MVTSingleLayerVectorSource.sourceTitle',`
`34`	`34`	`{`
`35`		`- defaultMessage: '.pbf vector tiles',`
	`35`	`+ defaultMessage: 'Vector tiles',`
`36`	`36`	`}`
`37`	`37`	`);`
`38`	`38`