Merge branch 'master' into move-streams-functions-out-of-registry

elastic · Nov 12, 2020 · 900e8c3 · 900e8c3
2 parents 0d30e61 + 4721b32
commit 900e8c3
Show file tree

Hide file tree

Showing 21 changed files with 210 additions and 226 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -26,7 +26,7 @@
 /src/plugins/vis_type_vislib/ @elastic/kibana-app
 /src/plugins/vis_type_xy/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
-/src/plugins/visualizations/ @elastic/kibana-application
+/src/plugins/visualizations/ @elastic/kibana-app
 
 # Application Services
 /examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -123,8 +123,8 @@
 # ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
 /x-pack/plugins/transform/  @elastic/ml-ui
 /x-pack/test/functional/apps/transform/ @elastic/ml-ui
-/x-pack/test/functional/services/transform/ @elastic/ml-ui/
-x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
+/x-pack/test/functional/services/transform/ @elastic/ml-ui
+/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
 /x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
 
 /x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui

diff --git a/docs/settings/ssl-settings.asciidoc b/docs/settings/ssl-settings.asciidoc
diff --git a/test/functional/apps/discover/_doc_navigation.js b/test/functional/apps/discover/_doc_navigation.js
@@ -20,23 +20,19 @@
 import expect from '@kbn/expect';
 
 export default function ({ getService, getPageObjects }) {
-  const log = getService('log');
   const docTable = getService('docTable');
   const filterBar = getService('filterBar');
   const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['common', 'discover', 'timePicker', 'context']);
   const esArchiver = getService('esArchiver');
   const retry = getService('retry');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/78373
-  describe.skip('doc link in discover', function contextSize() {
+  describe('doc link in discover', function contextSize() {
     beforeEach(async function () {
-      log.debug('load kibana index with default index pattern');
-      await esArchiver.loadIfNeeded('discover');
-
       await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('discover');
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
-      await PageObjects.timePicker.setDefaultAbsoluteRange();
       await PageObjects.discover.waitForDocTableLoadingComplete();
     });
 

diff --git a/test/functional/apps/discover/_field_data.js b/test/functional/apps/discover/_field_data.js
@@ -27,8 +27,7 @@ export default function ({ getService, getPageObjects }) {
   const queryBar = getService('queryBar');
   const PageObjects = getPageObjects(['common', 'header', 'discover', 'visualize', 'timePicker']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/78689
-  describe.skip('discover tab', function describeIndexTests() {
+  describe('discover tab', function describeIndexTests() {
     this.tags('includeFirefox');
     before(async function () {
       await esArchiver.loadIfNeeded('logstash_functional');

diff --git a/test/functional/apps/discover/_inspector.js b/test/functional/apps/discover/_inspector.js
@@ -34,8 +34,7 @@ export default function ({ getService, getPageObjects }) {
     return hitsCountStatsRow[STATS_ROW_VALUE_INDEX];
   }
 
-  // FLAKY: https://github.com/elastic/kibana/issues/39842
-  describe.skip('inspect', () => {
+  describe('inspect', () => {
     before(async () => {
       await esArchiver.loadIfNeeded('logstash_functional');
       await esArchiver.load('discover');