Merge branch 'main' into renovate/main-apm

elastic · Jan 10, 2025 · 809f75c · 809f75c
2 parents 0254a9d + baf79bc
commit 809f75c
Show file tree

Hide file tree

Showing 329 changed files with 3,377 additions and 10,553 deletions.
diff --git a/.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml b/.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml
@@ -37,4 +37,4 @@ steps:
     retry:
       automatic:
         - exit_status: '-1'
-          limit: 1
+          limit: 1
diff --git a/oas_docs/package-lock.json b/oas_docs/package-lock.json
diff --git a/oas_docs/package.json b/oas_docs/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "bump-cli": "^2.8.4",
-    "@redocly/cli": "^1.26.0"
+    "@redocly/cli": "^1.27.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/package.json b/package.json
@@ -114,7 +114,7 @@
     "@elastic/charts": "68.0.4",
     "@elastic/datemath": "5.0.3",
     "@elastic/ebt": "^1.1.1",
-    "@elastic/ecs": "^8.11.1",
+    "@elastic/ecs": "^8.11.5",
     "@elastic/elasticsearch": "^8.16.0",
     "@elastic/ems-client": "8.6.2",
     "@elastic/eui": "98.2.1-borealis.2",
@@ -1160,7 +1160,7 @@
     "icalendar": "0.7.1",
     "immer": "^9.0.21",
     "inquirer": "^7.3.3",
-    "io-ts": "^2.0.5",
+    "io-ts": "^2.2.22",
     "ipaddr.js": "2.0.0",
     "isbinaryfile": "4.0.2",
     "joi": "^17.13.3",
@@ -1527,7 +1527,7 @@
     "@octokit/rest": "^17.11.2",
     "@parcel/watcher": "^2.1.0",
     "@playwright/test": "1.49.0",
-    "@redocly/cli": "^1.26.0",
+    "@redocly/cli": "^1.27.0",
     "@statoscope/webpack-plugin": "^5.28.2",
     "@storybook/addon-a11y": "^6.5.16",
     "@storybook/addon-actions": "^6.5.16",

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
@@ -15,7 +15,7 @@ pageLoadAssetSize:
   cloudExperiments: 109746
   cloudFullStory: 18493
   cloudLinks: 55984
-  cloudSecurityPosture: 19109
+  cloudSecurityPosture: 19270
   console: 46091
   contentManagement: 16254
   controls: 60000

diff --git a/packages/kbn-scout/src/config/serverless/serverless.base.config.ts b/packages/kbn-scout/src/config/serverless/serverless.base.config.ts
@@ -12,10 +12,12 @@ import { format as formatUrl } from 'url';
 import Fs from 'fs';
 
 import { CA_CERT_PATH, kibanaDevServiceAccount } from '@kbn/dev-utils';
-import { defineDockerServersConfig, getDockerFileMountPath } from '@kbn/test';
+import {
+  fleetPackageRegistryDockerImage,
+  defineDockerServersConfig,
+  getDockerFileMountPath,
+} from '@kbn/test';
 import { MOCK_IDP_REALM_NAME } from '@kbn/mock-idp-utils';
-
-import { dockerImage } from '@kbn/test-suites-xpack/fleet_api_integration/config.base';
 import { REPO_ROOT } from '@kbn/repo-info';
 import { ScoutServerConfig } from '../../types';
 import { SAML_IDP_PLUGIN_PATH, SERVERLESS_IDP_METADATA_PATH, JWKS_PATH } from '../constants';
@@ -55,7 +57,7 @@ export const defaultConfig: ScoutServerConfig = {
   dockerServers: defineDockerServersConfig({
     registry: {
       enabled: !!dockerRegistryPort,
-      image: dockerImage,
+      image: fleetPackageRegistryDockerImage,
       portInContainer: 8080,
       port: dockerRegistryPort,
       args: dockerArgs,

diff --git a/packages/kbn-scout/src/config/stateful/base.config.ts b/packages/kbn-scout/src/config/stateful/base.config.ts
@@ -17,12 +17,9 @@ import {
   MOCK_IDP_ATTRIBUTE_EMAIL,
   MOCK_IDP_ATTRIBUTE_NAME,
 } from '@kbn/mock-idp-utils';
-import { defineDockerServersConfig } from '@kbn/test';
+import { fleetPackageRegistryDockerImage, defineDockerServersConfig } from '@kbn/test';
 import path from 'path';
-
 import { MOCK_IDP_REALM_NAME } from '@kbn/mock-idp-utils';
-
-import { dockerImage } from '@kbn/test-suites-xpack/fleet_api_integration/config.base';
 import { REPO_ROOT } from '@kbn/repo-info';
 import { STATEFUL_ROLES_ROOT_PATH } from '@kbn/es';
 import type { ScoutServerConfig } from '../../types';
@@ -66,7 +63,7 @@ export const defaultConfig: ScoutServerConfig = {
   dockerServers: defineDockerServersConfig({
     registry: {
       enabled: !!dockerRegistryPort,
-      image: dockerImage,
+      image: fleetPackageRegistryDockerImage,
       portInContainer: 8080,
       port: dockerRegistryPort,
       args: dockerArgs,

diff --git a/packages/kbn-scout/tsconfig.json b/packages/kbn-scout/tsconfig.json
@@ -25,7 +25,6 @@
     "@kbn/es-archiver",
     "@kbn/dev-utils",
     "@kbn/mock-idp-utils",
-    "@kbn/test-suites-xpack",
     "@kbn/test-subj-selector",
     "@kbn/scout-info",
     "@kbn/scout-reporting"

diff --git a/packages/kbn-test/index.ts b/packages/kbn-test/index.ts
@@ -78,3 +78,10 @@ export * from './src/kbn_client';
 export * from './src/find_test_plugin_paths';
 
 export { getDockerFileMountPath } from '@kbn/es';
+
+// Docker image to use for Fleet API integration tests.
+// This image comes from the latest successful build of https://buildkite.com/elastic/kibana-package-registry-promote
+// which is promoted after acceptance tests succeed against docker.elastic.co/package-registry/distribution:lite
+export const fleetPackageRegistryDockerImage =
+  process.env.FLEET_PACKAGE_REGISTRY_DOCKER_IMAGE ||
+  'docker.elastic.co/kibana-ci/package-registry-distribution:lite';
diff --git a/src/core/packages/chrome/browser-internal/src/ui/header/header_help_menu.tsx b/src/core/packages/chrome/browser-internal/src/ui/header/header_help_menu.tsx
@@ -21,8 +21,9 @@ import {
   EuiPopover,
   EuiPopoverTitle,
   EuiSpacer,
-  EuiTitle,
-  EuiHorizontalRule,
+  EuiPopoverFooter,
+  withEuiTheme,
+  WithEuiThemeProps,
 } from '@elastic/eui';
 
 import type { InternalApplicationStart } from '@kbn/core-application-browser-internal';
@@ -33,6 +34,7 @@ import type {
 import type { ChromeHelpMenuLink } from '@kbn/core-chrome-browser/src';
 import type { DocLinksStart } from '@kbn/core-doc-links-browser';
 
+import { css } from '@emotion/react';
 import { HeaderExtension } from './header_extension';
 import { isModifiedOrPrevented } from './nav_link';
 
@@ -68,7 +70,6 @@ const buildDefaultContentLinks = ({
       defaultMessage: 'Open an issue in GitHub',
     }),
     href: docLinks.links.kibana.createGithubIssue,
-    iconType: 'logoGithub',
   },
 ];
 
@@ -92,10 +93,10 @@ interface State {
   defaultContentLinks: ChromeHelpMenuLink[];
 }
 
-export class HeaderHelpMenu extends Component<Props, State> {
+class HelpMenu extends Component<Props & WithEuiThemeProps, State> {
   private subscription?: Subscription;
 
-  constructor(props: Props) {
+  constructor(props: Props & WithEuiThemeProps) {
     super(props);
 
     this.state = {
@@ -136,12 +137,16 @@ export class HeaderHelpMenu extends Component<Props, State> {
   }
 
   public render() {
-    const { kibanaVersion } = this.props;
+    const { kibanaVersion, theme } = this.props;
 
     const defaultContent = this.renderDefaultContent();
     const globalCustomContent = this.renderGlobalCustomContent();
     const customContent = this.renderCustomContent();
 
+    const euiThemePadding = css`
+      padding: ${theme.euiTheme.size.s};
+    `;
+
     const button = (
       <EuiHeaderSectionItemButton
         aria-expanded={this.state.isOpen}
@@ -196,7 +201,7 @@ export class HeaderHelpMenu extends Component<Props, State> {
           {defaultContent}
           {customContent && (
             <>
-              <EuiHorizontalRule margin="m" />
+              <EuiPopoverFooter css={euiThemePadding} />
               {customContent}
             </>
           )}
@@ -210,40 +215,37 @@ export class HeaderHelpMenu extends Component<Props, State> {
 
     return (
       <Fragment>
-        {defaultContentLinks.map(
-          ({ href, title, iconType, onClick: _onClick, dataTestSubj }, i) => {
-            const isLast = i === defaultContentLinks.length - 1;
-
-            if (href && _onClick) {
-              throw new Error(
-                'Only one of `href` and `onClick` should be provided for the help menu link.'
-              );
-            }
-
-            const hrefProps = href ? { href, target: '_blank' } : {};
-            const onClick = () => {
-              if (!_onClick) return;
-              _onClick();
-              this.closeMenu();
-            };
-
-            return (
-              <Fragment key={i}>
-                <EuiButtonEmpty
-                  {...hrefProps}
-                  onClick={onClick}
-                  size="s"
-                  flush="left"
-                  iconType={iconType}
-                  data-test-subj={dataTestSubj}
-                >
-                  {title}
-                </EuiButtonEmpty>
-                {!isLast && <EuiSpacer size="xs" />}
-              </Fragment>
+        {defaultContentLinks.map(({ href, title, onClick: _onClick, dataTestSubj }, i) => {
+          const isLast = i === defaultContentLinks.length - 1;
+
+          if (href && _onClick) {
+            throw new Error(
+              'Only one of `href` and `onClick` should be provided for the help menu link.'
             );
           }
-        )}
+
+          const hrefProps = href ? { href, target: '_blank' } : {};
+          const onClick = () => {
+            if (!_onClick) return;
+            _onClick();
+            this.closeMenu();
+          };
+
+          return (
+            <Fragment key={i}>
+              <EuiButtonEmpty
+                {...hrefProps}
+                onClick={onClick}
+                size="s"
+                flush="left"
+                data-test-subj={dataTestSubj}
+              >
+                {title}
+              </EuiButtonEmpty>
+              {!isLast && <EuiSpacer size="xs" />}
+            </Fragment>
+          );
+        })}
       </Fragment>
     );
   }
@@ -333,10 +335,9 @@ export class HeaderHelpMenu extends Component<Props, State> {
 
     return (
       <>
-        <EuiTitle size="xxs">
+        <EuiPopoverTitle>
           <h3>{appName}</h3>
-        </EuiTitle>
-        <EuiSpacer size="s" />
+        </EuiPopoverTitle>
         {customLinks}
         {content && (
           <>
@@ -402,3 +403,5 @@ const createCustomLink = (
     </Fragment>
   );
 };
+
+export const HeaderHelpMenu = withEuiTheme(HelpMenu);
diff --git a/src/core/packages/chrome/browser/src/nav_controls.ts b/src/core/packages/chrome/browser/src/nav_controls.ts
@@ -20,7 +20,6 @@ export interface ChromeNavControl {
 export interface ChromeHelpMenuLink {
   title: string;
   href?: string;
-  iconType?: string;
   onClick?: () => void;
   dataTestSubj?: string;
 }

diff --git a/src/core/packages/elasticsearch/server-internal/src/is_scripting_enabled.test.ts b/src/core/packages/elasticsearch/server-internal/src/is_scripting_enabled.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { isRetryableEsClientErrorMock } from './is_scripting_enabled.test.mocks';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { isInlineScriptingEnabled } from './is_scripting_enabled';