Merge branch '7.x' into ua/7.x/stats-component

x-pack/plugins/apm/dev_docs/testing.md

@@ -42,7 +42,7 @@ The API tests are located in `x-pack/test/apm_api_integration/`.
 node scripts/test/e2e [--trial] [--help]
 ```
 
-The E2E tests are located [here](../../ftr_e2e)
+The E2E tests are located [here](../ftr_e2e)
 
 ---
 

x-pack/plugins/security/server/config_deprecations.test.ts

@@ -42,8 +42,8 @@ describe('Config Deprecations', () => {
     expect(migrated).toEqual(defaultConfig);
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Session idle timeout (\\"xpack.security.session.idleTimeout\\") will be set to 1 hour by default in the next major version (8.0).",
-        "Session lifespan (\\"xpack.security.session.lifespan\\") will be set to 30 days by default in the next major version (8.0).",
+        "The session idle timeout will default to 1 hour in 8.0.",
+        "The session lifespan will default to 30 days in 8.0.",
       ]
     `);
   });
@@ -54,7 +54,7 @@ describe('Config Deprecations', () => {
     expect(migrated).toEqual(defaultConfig);
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Session idle timeout (\\"xpack.security.session.idleTimeout\\") will be set to 1 hour by default in the next major version (8.0).",
+        "The session idle timeout will default to 1 hour in 8.0.",
       ]
     `);
   });
@@ -65,7 +65,7 @@ describe('Config Deprecations', () => {
     expect(migrated).toEqual(defaultConfig);
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Session lifespan (\\"xpack.security.session.lifespan\\") will be set to 30 days by default in the next major version (8.0).",
+        "The session lifespan will default to 30 days in 8.0.",
       ]
     `);
   });
@@ -84,7 +84,7 @@ describe('Config Deprecations', () => {
     expect(messages).toMatchInlineSnapshot(`
       Array [
         "Setting \\"xpack.security.sessionTimeout\\" has been replaced by \\"xpack.security.session.idleTimeout\\"",
-        "Session lifespan (\\"xpack.security.session.lifespan\\") will be set to 30 days by default in the next major version (8.0).",
+        "The session lifespan will default to 30 days in 8.0.",
       ]
     `);
   });

x-pack/plugins/security/server/config_deprecations.ts

@@ -162,29 +162,47 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   (settings, fromPath, addDeprecation) => {
     if (settings?.xpack?.security?.session?.idleTimeout === undefined) {
       addDeprecation({
-        message:
-          'Session idle timeout ("xpack.security.session.idleTimeout") will be set to 1 hour by default in the next major version (8.0).',
+        level: 'warning',
+        title: i18n.translate('xpack.security.deprecations.idleTimeoutTitle', {
+          defaultMessage: 'The "xpack.security.session.idleTimeout" default is changing',
+        }),
+        message: i18n.translate('xpack.security.deprecations.idleTimeoutMessage', {
+          defaultMessage: 'The session idle timeout will default to 1 hour in 8.0.',
+        }),
         documentationUrl:
           'https://www.elastic.co/guide/en/kibana/current/xpack-security-session-management.html#session-idle-timeout',
         correctiveActions: {
           manualSteps: [
-            `Use "xpack.security.session.idleTimeout" in your Kibana configuration to change default session idle timeout.`,
-            `To disable session idle timeout, set "xpack.security.session.idleTimeout" to 0.`,
+            i18n.translate('xpack.security.deprecations.idleTimeout.manualStepOneMessage', {
+              defaultMessage: `Set "xpack.security.session.idleTimeout" in your Kibana configuration to override the default session idle timeout.`,
+            }),
+            i18n.translate('xpack.security.deprecations.idleTimeout.manualStepTwoMessage', {
+              defaultMessage: `To disable the session idle timeout, set "xpack.security.session.idleTimeout" to 0.`,
+            }),
           ],
         },
       });
     }
 
     if (settings?.xpack?.security?.session?.lifespan === undefined) {
       addDeprecation({
-        message:
-          'Session lifespan ("xpack.security.session.lifespan") will be set to 30 days by default in the next major version (8.0).',
+        level: 'warning',
+        title: i18n.translate('xpack.security.deprecations.lifespanTitle', {
+          defaultMessage: 'The "xpack.security.session.lifespan" default is changing',
+        }),
+        message: i18n.translate('xpack.security.deprecations.lifespanMessage', {
+          defaultMessage: 'The session lifespan will default to 30 days in 8.0.',
+        }),
         documentationUrl:
           'https://www.elastic.co/guide/en/kibana/current/xpack-security-session-management.html#session-lifespan',
         correctiveActions: {
           manualSteps: [
-            `Use "xpack.security.session.lifespan" in your Kibana configuration to change default session lifespan.`,
-            `To disable session lifespan, set "xpack.security.session.lifespan" to 0.`,
+            i18n.translate('xpack.security.deprecations.lifespan.manualStepOneMessage', {
+              defaultMessage: `Set "xpack.security.session.lifespan" in your Kibana configuration to override the default session lifespan.`,
+            }),
+            i18n.translate('xpack.security.deprecations.lifespan.manualStepTwoMessage', {
+              defaultMessage: `To disable the session lifespan, set "xpack.security.session.lifespan" to 0.`,
+            }),
           ],
         },
       });

x-pack/test/alerting_api_integration/spaces_only/tests/actions/enqueue.ts

@@ -23,7 +23,8 @@ export default function ({ getService }: FtrProviderContext) {
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
-  describe('enqueue', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/111812
+  describe.skip('enqueue', () => {
     const objectRemover = new ObjectRemover(supertest);
 
     before(async () => {