Merge branch 'main' into ml-data-drift-func-tests

elastic · Oct 12, 2023 · 5a4a6d4 · 5a4a6d4
2 parents f180ede + bc8f45f
commit 5a4a6d4
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 50 deletions.
diff --git a/docs/management/cases/manage-cases.asciidoc b/docs/management/cases/manage-cases.asciidoc
@@ -90,8 +90,7 @@ cases.
 
 For hosted {kib} on {ess}:
 
-. Add the email addresses to the monitoring email allowlist. Follow the steps in
-{cloud}/ec-watcher.html#ec-watcher-allowlist[Send alerts by email].
+. Add the email domains to the {cloud}/ec-organizations-notifications-domain-allowlist.html[notifications domain allowlist].
 +
 --
 You do not need to take any more steps to configure an email connector or update

diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -830,24 +830,24 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       goGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}go-client-getting-started`,
       httpApis: `${SERVERLESS_ELASTICSEARCH_DOCS}http-apis`,
       httpApiReferences: `${SERVERLESS_ELASTICSEARCH_DOCS}http-apis`,
-      jsApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}nodejs-apis-getting-started`,
-      jsGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}nodejs-apis-getting-started`,
-      phpApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}php-apis-getting-started`,
-      phpGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}php-apis-getting-started`,
-      pythonApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}python-apis-getting-started`,
-      pythonGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}python-apis-getting-started`,
-      pythonReferences: `${SERVERLESS_ELASTICSEARCH_DOCS}python-apis-getting-started`,
-      rubyApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}ruby-apis-getting-started`,
-      rubyGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}ruby-apis-getting-started`,
+      jsApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}nodejs-client-getting-started`,
+      jsGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}nodejs-client-getting-started`,
+      phpApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}php-client-getting-started`,
+      phpGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}php-client-getting-started`,
+      pythonApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}python-client-getting-started`,
+      pythonGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}python-client-getting-started`,
+      pythonReferences: `${SERVERLESS_ELASTICSEARCH_DOCS}python-client-getting-started`,
+      rubyApiReference: `${SERVERLESS_ELASTICSEARCH_DOCS}ruby-client-getting-started`,
+      rubyGettingStarted: `${SERVERLESS_ELASTICSEARCH_DOCS}ruby-client-getting-started`,
     },
     serverlessSearch: {
       integrations: `${SERVERLESS_ELASTICSEARCH_DOCS}ingest-your-data`,
-      integrationsLogstash: `${SERVERLESS_ELASTICSEARCH_DOCS}ingest-data-through-integrations-logstash`,
-      integrationsBeats: `${SERVERLESS_ELASTICSEARCH_DOCS}ingest-data-through-integrations-beats`,
-      integrationsConnectorClient: `${SERVERLESS_ELASTICSEARCH_DOCS}ingest-data-through-integrations-connector-client`,
-      gettingStartedExplore: `${SERVERLESS_ELASTICSEARCH_DOCS}get-started#explore`,
-      gettingStartedIngest: `${SERVERLESS_ELASTICSEARCH_DOCS}get-started#ingest`,
-      gettingStartedSearch: `${SERVERLESS_ELASTICSEARCH_DOCS}get-started#search`,
+      integrationsLogstash: `${SERVERLESS_ELASTICSEARCH_DOCS}ingest-data-through-logstash`,
+      integrationsBeats: `${SERVERLESS_ELASTICSEARCH_DOCS}ingest-data-through-beats`,
+      integrationsConnectorClient: `${SERVERLESS_ELASTICSEARCH_DOCS}ingest-your-data`,
+      gettingStartedExplore: `${SERVERLESS_ELASTICSEARCH_DOCS}get-started`,
+      gettingStartedIngest: `${SERVERLESS_ELASTICSEARCH_DOCS}get-started`,
+      gettingStartedSearch: `${SERVERLESS_ELASTICSEARCH_DOCS}get-started`,
     },
     serverlessSecurity: {
       apiKeyPrivileges: `${SERVERLESS_DOCS}api-keys#restrict-privileges`,

diff --git a/x-pack/examples/alerting_example/public/components/documentation.tsx b/x-pack/examples/alerting_example/public/components/documentation.tsx
@@ -10,10 +10,7 @@ import React from 'react';
 import {
   EuiText,
   EuiPageBody,
-  EuiPageContent_Deprecated as EuiPageContent,
-  EuiPageContentBody_Deprecated as EuiPageContentBody,
-  EuiPageContentHeader_Deprecated as EuiPageContentHeader,
-  EuiPageContentHeaderSection_Deprecated as EuiPageContentHeaderSection,
+  EuiPageSection,
   EuiPageHeader,
   EuiPageHeaderSection,
   EuiTitle,
@@ -34,33 +31,29 @@ export const DocumentationPage = (
         </EuiTitle>
       </EuiPageHeaderSection>
     </EuiPageHeader>
-    <EuiPageContent>
-      <EuiPageContentHeader>
-        <EuiPageContentHeaderSection>
-          <EuiTitle>
-            <h2>Documentation links</h2>
-          </EuiTitle>
-        </EuiPageContentHeaderSection>
-      </EuiPageContentHeader>
-      <EuiPageContentBody>
-        <EuiText>
-          <h2>Plugin Structure</h2>
-          <p>
-            This example solution has both `server` and a `public` plugins. The `server` handles
-            registration of example the RuleTypes, while the `public` handles creation of, and
-            navigation for, these rule types.
-          </p>
-          <EuiCallOut title="Transport Layer Security" iconType="warning" color="warning">
-            If you see a message about needing to enable the Transport Layer Security, start ES with{' '}
-            <code>yarn es snapshot --ssl --license trial</code> and Kibana with{' '}
-            <code>yarn start --run-examples --ssl</code>. If you running chrome on a mac, you may
-            need to type in <code>thisisunsafe</code> if you see the Certificate invalid screen with
-            no way to &lsquo;proceed anyway&rsquo;.
-          </EuiCallOut>
-        </EuiText>
-        <EuiSpacer />
-        <CreateAlert {...deps} />
-      </EuiPageContentBody>
-    </EuiPageContent>
+    <EuiPageSection>
+      <EuiPageHeader>
+        <EuiTitle>
+          <h2>Documentation links</h2>
+        </EuiTitle>
+      </EuiPageHeader>
+      <EuiText>
+        <h2>Plugin Structure</h2>
+        <p>
+          This example solution has both `server` and a `public` plugins. The `server` handles
+          registration of example the RuleTypes, while the `public` handles creation of, and
+          navigation for, these rule types.
+        </p>
+        <EuiCallOut title="Transport Layer Security" iconType="warning" color="warning">
+          If you see a message about needing to enable the Transport Layer Security, start ES with{' '}
+          <code>yarn es snapshot --ssl --license trial</code> and Kibana with{' '}
+          <code>yarn start --run-examples --ssl</code>. If you running chrome on a mac, you may need
+          to type in <code>thisisunsafe</code> if you see the Certificate invalid screen with no way
+          to &lsquo;proceed anyway&rsquo;.
+        </EuiCallOut>
+      </EuiText>
+      <EuiSpacer />
+      <CreateAlert {...deps} />
+    </EuiPageSection>
   </EuiPageBody>
 );
diff --git a/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
@@ -143,7 +143,8 @@ describe('Fleet preconfiguration reset', () => {
         expect(agentPolicies.saved_objects.find((so) => so.id === 'default-policy')).toBeDefined();
       });
 
-      it('Create correct .fleet-policies', async () => {
+      // FLAKY: https://github.com/elastic/kibana/issues/133470
+      it.skip('Create correct .fleet-policies', async () => {
         const res = await kbnServer.coreStart.elasticsearch.client.asInternalUser.search({
           index: AGENT_POLICY_INDEX,
           q: `policy_id:policy-elastic-agent-on-cloud`,