Merge branch 'master' into rebuild_nested_fields_structure

elastic · Apr 12, 2021 · 9bc1ea6 · 9bc1ea6
2 parents f60a165 + 5f16bcc
commit 9bc1ea6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/docs/user/monitoring/kibana-alerts.asciidoc b/docs/user/monitoring/kibana-alerts.asciidoc
@@ -84,7 +84,7 @@ by running checks on a schedule time of 1 minute with a re-notify interval of 6
 This alert is triggered if a large (primary) shard size is found on any of the 
 specified index patterns. The trigger condition is met if an index's shard size is 
 55gb or higher in the last 5 minutes. The alert is grouped across all indices that match 
-the default patter of `*` by running checks on a schedule time of 1 minute with a re-notify 
+the default pattern of `*` by running checks on a schedule time of 1 minute with a re-notify 
 interval of 12 hours.
 
 [discrete]

diff --git a/...re/server/saved_objects/migrationsv2/integration_tests/migration_7.7.2_xpack_100k.test.ts b/...re/server/saved_objects/migrationsv2/integration_tests/migration_7.7.2_xpack_100k.test.ts
@@ -26,7 +26,8 @@ async function removeLogFile() {
   await asyncUnlink(logFilePath).catch(() => void 0);
 }
 
-describe('migration from 7.7.2-xpack with 100k objects', () => {
+// FAILING: https://github.com/elastic/kibana/pull/96788
+describe.skip('migration from 7.7.2-xpack with 100k objects', () => {
   let esServer: kbnTestServer.TestElasticsearchUtils;
   let root: Root;
   let coreStart: InternalCoreStart;

diff --git a/test/functional/apps/discover/_discover.ts b/test/functional/apps/discover/_discover.ts
@@ -182,7 +182,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
     });
 
-    describe('query #2, which has an empty time range', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/89550
+    describe.skip('query #2, which has an empty time range', () => {
       const fromTime = 'Jun 11, 1999 @ 09:22:11.000';
       const toTime = 'Jun 12, 1999 @ 11:21:04.000';