Merge branch 'main' into ad-worker-skeleton

Author: e40pud

README.md

@@ -42,19 +42,25 @@ For information about building the documentation, see the README in [elastic/doc
 
 ## Version Compatibility with Elasticsearch
 
-Ideally, you should be running Elasticsearch and Kibana with matching version numbers. If your Elasticsearch has an older version number or a newer _major_ number than Kibana, then Kibana will fail to run. If Elasticsearch has a newer minor or patch number than Kibana, then the Kibana Server will log a warning.
+### Elasticsearch & Kibana Compatibility
+
+The recommended configuration is to run Elasticsearch and Kibana using the same version number. If you encounter issues on mismatched versions, you will first be asked to upgrade before support or troubleshooting can begin.
+
+- __Major Versions:__ Must strictly match (with exceptions for `prevmajor.last`)
+- __Kibana Patch Ahead:__ Kibana can run on a newer patch version than Elasticsearch (e.g. Elasticsearch 9.4.0 with Kibana 9.4.2) to allow easier Kibana-only patching.
+- __Kibana Minor Behind:__ Kibana can run using an older minor version than Elasticsearch (e.g. Kibana 9.3.x with Elasticsearch 9.4.x) to simplify rolling upgrades.
 
 _Note: The version numbers below are only examples, meant to illustrate the relationships between different types of version numbers._
 
-| Situation                 | Example Kibana version     | Example ES version | Outcome |
-| ------------------------- | -------------------------- |------------------- | ------- |
-| Versions are the same.    | 7.15.1                     | 7.15.1             | 💚 OK      |
-| ES patch number is newer. | 7.15.__0__                 | 7.15.__1__         | ⚠️ Logged warning      |
-| ES minor number is newer. | 7.__14__.2                 | 7.__15__.0         | ⚠️ Logged warning      |
-| ES major number is newer. | __7__.15.1                 | __8__.0.0          | 🚫 Fatal error      |
-| ES patch number is older. | 7.15.__1__                 | 7.15.__0__         | ⚠️ Logged warning      |
-| ES minor number is older. | 7.__15__.1                 | 7.__14__.2         | 🚫 Fatal error      |
-| ES major number is older. | __8__.0.0                  | __7__.15.1         | 🚫 Fatal error      |
+| Situation                 | Example Kibana version    | Example ES version | Outcome |
+| ------------------------- | ------------------------- |------------------- | ------- |
+| Versions are the same.    | 9.4.1                     | 9.4.1              | OK      |
+| ES patch number is newer. | 9.4.__0__                 | 9.4.__1__          | Logged warning   |
+| ES minor number is newer. | 9.__3__.2                 | 9.__4__.0          | Logged warning   |
+| ES major number is newer. | __8__.14.1                | __9__.0.0          | Fatal error      |
+| ES patch number is older. | 9.4.__1__                 | 9.4.__0__          | Logged warning   |
+| ES minor number is older. | 9.__4__.1                 | 9.__3__.2          | Fatal error      |
+| ES major number is older. | __9__.0.0                 | __8__.19.1         | Fatal error      |
 
 ## Questions? Problems? Suggestions?
 

fleet_packages.json

@@ -63,4 +63,4 @@
     "version": "1.0.13",
     "allowSyncToPrerelease": true
   }
-]
+]

oas_docs/output/kibana.serverless.yaml

@@ -47,10 +47,10 @@ allowBuilds:
 # deprecated `$@elastic/esql` override syntax). Must match `@elastic/esql` in
 # package.json; the renovate `esql-js` group bumps them together.
 catalog:
-  '@elastic/esql-grammar': '4.21.1'
-  '@elastic/esql-promql-grammar': '4.21.1'
-  '@elastic/esql-types': '4.21.1'
-  '@elastic/pretty-printer': '4.21.1'
+  '@elastic/esql-grammar': '4.22.0'
+  '@elastic/esql-promql-grammar': '4.22.0'
+  '@elastic/esql-types': '4.22.0'
+  '@elastic/pretty-printer': '4.22.0'
 overrides:
   # Generated from package.json#resolutions by `kbn bootstrap` — edit
   # resolutions, not this block (yarn keys are mapped: `**/a` -> `a`, `a/b` -> `a>b`).

oas_docs/output/kibana.yaml

@@ -180,6 +180,9 @@ kibana_vars=(
     server.securityResponseHeaders.strictTransportSecurity
     server.securityResponseHeaders.xContentTypeOptions
     server.securityResponseHeaders.crossOriginOpenerPolicy
+    server.selfHttp.target
+    server.selfHttp.ssl.verificationMode
+    server.selfHttp.ssl.certificateAuthorities
     server.shutdownTimeout
     server.socketTimeout
     server.ssl.cert

pnpm-lock.yaml

@@ -51,7 +51,7 @@ export async function runDockerGenerator(
    */
   if (flags.baseImage === 'wolfi')
     baseImageName =
-      'docker.elastic.co/wolfi/chainguard-base:latest@sha256:ed06bcb85d26381eeccfe3a1be9cf6bade8603536791a68f9dea5aabe7655fc6';
+      'docker.elastic.co/wolfi/chainguard-base:latest@sha256:a6f1b7fa63adf228802cb89b804b40f1d77a3d88d694c9a3a84c1e289fd5c71f';
 
   let imageFlavor = '';
   if (flags.baseImage === 'wolfi' && !flags.serverless && !flags.cloud) imageFlavor += `-wolfi`;
@@ -61,7 +61,7 @@ export async function runDockerGenerator(
   if (flags.fips) {
     imageFlavor += '-fips';
     baseImageName =
-      'docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:571fb83b1cee35d55b250649f03a92fec19ffbda89feb2e92cd9b3d97a980011';
+      'docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:8300c6a397b8049a92967f92d4bb6dd404449937638d48f666859059244256ac';
   }
 
   // General docker var config

pnpm-workspace.yaml

@@ -1188,6 +1188,55 @@ describe('Both modes', () => {
       });
     });
 
+    describe('Hover-only lists', () => {
+      /**
+       * GIVEN a primary item has hover `popoverSections` and an href
+       * WHEN I hover it, click it, and stay hovered
+       * THEN the popover must not reopen on the click's focus
+       * AND hovering again after leaving still opens it
+       */
+      it('should not reopen the hover popover after clicking the parent while still hovering', async () => {
+        const recentsNav = {
+          primaryItems: [
+            {
+              id: 'dashboards',
+              label: 'Dashboards',
+              iconType: 'dashboardApp',
+              href: '/dashboards',
+              popoverSections: [
+                {
+                  id: 'recentlyViewed',
+                  label: 'Recently viewed',
+                  items: [{ id: 'dash-1', label: 'One', href: '/dashboards/1' }],
+                },
+              ],
+            },
+          ],
+          footerItems: [],
+        };
+
+        render(<TestComponent items={recentsNav} />);
+
+        const dashboardsLink = screen.getByTestId(primaryItemId('dashboards'));
+
+        await user.hover(dashboardsLink);
+        flushPopoverTimers();
+
+        expect(await screen.findByTestId(popoverId('Dashboards'))).toBeInTheDocument();
+
+        await user.click(dashboardsLink);
+        flushPopoverTimers();
+
+        expect(screen.queryByTestId(popoverId('Dashboards'))).not.toBeInTheDocument();
+
+        await user.unhover(dashboardsLink);
+        await user.hover(dashboardsLink);
+        flushPopoverTimers();
+
+        expect(await screen.findByTestId(popoverId('Dashboards'))).toBeInTheDocument();
+      });
+    });
+
     describe('Hover-only lists in More', () => {
       /**
        * GIVEN an overflow item has hover `popoverSections` but no tree `sections`

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

@@ -65,6 +65,7 @@ export interface PopoverProps {
     ref?: Ref<HTMLElement>;
     onClick?: (e: MouseEvent) => void;
     onKeyDown?: (e: KeyboardEvent) => void;
+    onMouseDown?: (e: MouseEvent) => void;
     tabIndex?: number;
     'aria-haspopup'?: boolean | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
     'aria-expanded'?: boolean;
@@ -104,6 +105,9 @@ export const Popover = ({
 
   const popoverRef = useRef<HTMLDivElement | null>(null);
   const triggerRef = useRef<HTMLElement>(null);
+  // Clicking the trigger means navigate, not open the hover menu. Keep hover
+  // closed until mouseleave so the click's focus cannot reopen it.
+  const suppressHoverRef = useRef(false);
 
   const [isOpenedByClick, setIsOpenedByClick] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
@@ -136,6 +140,9 @@ export const Popover = ({
   }, [clearHoverTimeout, close]);
 
   const handleMouseEnter = useCallback(() => {
+    if (suppressHoverRef.current) {
+      return;
+    }
     if ((!persistent || !isOpenedByClick) && (!isAnyPopoverLocked || isOpen)) {
       clearHoverTimeout();
       if (!isSidePanelOpen) {
@@ -154,13 +161,23 @@ export const Popover = ({
   ]);
 
   const handleMouseLeave = useCallback(() => {
+    suppressHoverRef.current = false;
     if (!persistent || !isOpenedByClick) {
       setHoverTimeout(handleClose, POPOVER_HOVER_DELAY);
     }
   }, [persistent, isOpenedByClick, setHoverTimeout, handleClose]);
 
   const scrollStyles = useScroll(true);
 
+  const handleTriggerMouseDown = useCallback(() => {
+    if (persistent) {
+      return;
+    }
+    suppressHoverRef.current = true;
+    clearHoverTimeout();
+    close();
+  }, [persistent, clearHoverTimeout, close]);
+
   const handleTriggerClick = useCallback(() => {
     if (persistent) {
       if (isOpen && isOpenedByClick) {
@@ -253,6 +270,10 @@ export const Popover = ({
         trigger.props.onClick?.(e);
         handleTriggerClick();
       },
+      onMouseDown: (e: MouseEvent) => {
+        trigger.props.onMouseDown?.(e);
+        handleTriggerMouseDown();
+      },
       onKeyDown: handleTriggerKeyDown,
     });
   }, [
@@ -261,6 +282,7 @@ export const Popover = ({
     isOpen,
     handleTriggerKeyDown,
     handleTriggerClick,
+    handleTriggerMouseDown,
     isSidePanelOpen,
     popoverEnterAndExitInstructionsId,
   ]);