Merge branch 'master' into cypress-siem-jenkins-new-data

elasticmachine · web-flow · commit 775d01924da9 · 2020-02-26T06:16:51.000-05:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -82,12 +82,6 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['src/legacy/core_plugins/vis_type_table/**/*.{js,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: [
         'src/legacy/core_plugins/vis_default_editor/public/components/controls/**/*.{ts,tsx}',
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -556,8 +556,9 @@ function discoverController(
   $scope.opts = {
     // number of records to fetch, then paginate through
     sampleSize: config.get('discover:sampleSize'),
-    timefield:
-      indexPatternsUtils.isDefault($scope.indexPattern) && $scope.indexPattern.timeFieldName,
+    timefield: indexPatternsUtils.isDefault($scope.indexPattern)
+      ? $scope.indexPattern.timeFieldName
+      : undefined,
     savedSearch: savedSearch,
     indexPatternList: $route.current.locals.savedObjects.ip.list,
   };
diff --git a/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx b/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx
@@ -47,14 +47,14 @@ function TableOptions({
         .filter(col => get(col.aggConfig.type.getFormat(col.aggConfig), 'type.id') === 'number')
         .map(({ name }) => ({ value: name, text: name })),
     ],
-    [aggs, stateParams.percentageCol, stateParams.dimensions]
+    [aggs]
   );
 
   const isPerPageValid = stateParams.perPage === '' || stateParams.perPage > 0;
 
   useEffect(() => {
     setValidity(isPerPageValid);
-  }, [isPerPageValid]);
+  }, [isPerPageValid, setValidity]);
 
   useEffect(() => {
     if (
@@ -64,7 +64,7 @@ function TableOptions({
     ) {
       setValue('percentageCol', percentageColumns[0].value);
     }
-  }, [percentageColumns, stateParams.percentageCol]);
+  }, [percentageColumns, stateParams.percentageCol, setValidity, setValue]);
 
   return (
     <EuiPanel paddingSize="s">
diff --git a/test/functional/apps/dashboard/dashboard_filtering.js b/test/functional/apps/dashboard/dashboard_filtering.js
@@ -63,6 +63,10 @@ export default function({ getService, getPageObjects }) {
         await filterBar.addFilter('bytes', 'is', '12345678');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.dashboard.waitForRenderComplete();
+        // first round of requests sometimes times out, refresh all visualizations to fetch again
+        await queryBar.clickQuerySubmitButton();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.dashboard.waitForRenderComplete();
       });
 
       it('filters on pie charts', async () => {
diff --git a/test/functional/services/saved_query_management_component.ts b/test/functional/services/saved_query_management_component.ts
@@ -24,6 +24,7 @@ export function SavedQueryManagementComponentProvider({ getService }: FtrProvide
   const testSubjects = getService('testSubjects');
   const queryBar = getService('queryBar');
   const retry = getService('retry');
+  const config = getService('config');
 
   class SavedQueryManagementComponent {
     public async getCurrentlyLoadedQueryID() {
@@ -177,7 +178,9 @@ export function SavedQueryManagementComponentProvider({ getService }: FtrProvide
 
       await retry.try(async () => {
         await testSubjects.click('saved-query-management-save-button');
-        await testSubjects.existOrFail('saveQueryForm');
+        await testSubjects.existOrFail('saveQueryForm', {
+          timeout: config.get('timeouts.waitForExists'),
+        });
       });
     }
 
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -28,8 +28,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
     await PageObjects.timePicker.setDefaultAbsoluteRange();
   }
 
-  // FLAKY: https://github.com/elastic/kibana/issues/45348
-  describe.skip('security', () => {
+  describe('security', () => {
     before(async () => {
       await esArchiver.load('discover/feature_controls/security');
       await esArchiver.loadIfNeeded('logstash_functional');

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {`
`28`	`28`	`await PageObjects.timePicker.setDefaultAbsoluteRange();`
`29`	`29`	`}`
`30`	`30`
`31`		`- // FLAKY: https://github.com/elastic/kibana/issues/45348`
`32`		`- describe.skip('security', () => {`
	`31`	`+ describe('security', () => {`
`33`	`32`	`before(async () => {`
`34`	`33`	`await esArchiver.load('discover/feature_controls/security');`
`35`	`34`	`await esArchiver.loadIfNeeded('logstash_functional');`